Damian Mooyman
|
09210efbc0
|
Merge remote-tracking branch 'origin/3'
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
|
2015-07-31 15:49:35 +12:00 |
|
Damian Mooyman
|
7ee444e08a
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
|
2015-07-31 11:38:18 +12:00 |
|
Damian Mooyman
|
914d734df0
|
API Disable deprecation notices by default
|
2015-07-16 09:56:47 +12:00 |
|
David Alexander
|
f6d60ca946
|
Update 02_Release_Process.md
Updated: deprecated API's removed only in MAJOR releases.
|
2015-06-19 07:51:16 +12:00 |
|
David Alexander
|
54b0b1fd4e
|
Update 02_Release_Process.md
Typos. Spelling. 404 errors for framework and cms milestones links to github(line 13).
|
2015-06-18 17:26:58 +12:00 |
|
Ingo Schommer
|
7e44cc7c3a
|
Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
|
2014-12-16 11:01:17 +13:00 |
|
Will Rossiter
|
4a846c288c
|
Review and tidy up contributing documentation.
|
2014-12-16 11:01:13 +13:00 |
|
Will Rossiter
|
8e8c5d716d
|
Restructure of the docs markdown source files into more logical taxonomy
|
2014-12-16 11:01:12 +13:00 |
|
Ingo Schommer
|
f2237aff8d
|
Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
|
2014-12-15 17:56:32 +13:00 |
|
Will Rossiter
|
80d4127f43
|
Review and tidy up contributing documentation.
|
2014-12-15 09:12:45 +13:00 |
|
Will Rossiter
|
e9d88dd8ee
|
Restructure of the docs markdown source files into more logical taxonomy.
Rebased on 3.1
|
2014-12-15 09:12:44 +13:00 |
|