Daniel Hensby
|
602062802e
|
Merge branch '3.4' into 3.5
|
2016-11-23 23:55:31 +00:00 |
|
Daniel Hensby
|
406307c77b
|
Merge branch '3.3' into 3.4
|
2016-11-23 23:29:25 +00:00 |
|
Daniel Hensby
|
b7bb7a46da
|
Merge branch '3.2' into 3.3
|
2016-11-23 22:26:15 +00:00 |
|
Daniel Hensby
|
17eb351f81
|
Merge branch '3.1' into 3.2
|
2016-11-23 21:54:22 +00:00 |
|
Damian Mooyman
|
730512f036
|
Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix
FIX Tests shouldnt set date or time format to null
|
2016-11-24 10:01:42 +13:00 |
|
Damian Mooyman
|
396a47f824
|
Merge pull request #6330 from silverstripe/bugfix-framework-core-manifest-manifest-cache-ds
Replace hard-coded directory separators constant
|
2016-11-24 09:20:43 +13:00 |
|
Christopher Pitt
|
a4167e29fe
|
Replace hard-coded directory separators constant
This removes warnings when building the manifest cache in Windows environments.
|
2016-11-24 08:00:34 +13:00 |
|
Daniel Hensby
|
03b4e6ea32
|
FIX Tests shouldnt set date or time format to null
|
2016-11-23 12:36:53 +00:00 |
|
Damian Mooyman
|
c2287c14ff
|
Merge pull request #6216 from jonom/fix-version-sql
FIX Versioned sort by ID
|
2016-11-17 15:47:44 +13:00 |
|
Jonathon Menz
|
bec5adf09b
|
FIX Versioned sort by ID
Prevent SQL error from a Versioned DataObject with e.g. $default_sort = 'ID DESC'
|
2016-11-16 12:16:33 -08:00 |
|
Damian Mooyman
|
8a0383e5a9
|
Merge pull request #6312 from dhensby/pulls/3.4/httpresponse-phpdoc
DOCS Update PHPDoc for SS_HTTPResponse
|
2016-11-15 13:36:13 +13:00 |
|
Daniel Hensby
|
6136cf8502
|
DOCS Update PHPDoc for SS_HTTPResponse
|
2016-11-14 19:02:56 +00:00 |
|
Dan Hensby
|
fcd3d2478c
|
Added 3.5.0-rc2 changelog
3.5.0-rc2
|
2016-11-10 14:30:07 +00:00 |
|
Daniel Hensby
|
17108ff50c
|
Merge branch '3.4' into 3.5.0
|
2016-11-10 14:23:38 +00:00 |
|
Daniel Hensby
|
f311ef4ca5
|
Merge pull request #6309 from Zauberfisch/modeladmin-showImportForm-2
Added $showSearchForm to ModelAdmin
|
2016-11-10 14:22:49 +00:00 |
|
zauberfisch
|
6697327a98
|
Added $showSearchForm to ModelAdmin
|
2016-11-10 13:50:44 +00:00 |
|
Daniel Hensby
|
d15d80ea2c
|
Merge pull request #6307 from open-sausages/pulls/3.4/fix-aggregrate-error
BUG Fix regression in aggregate column lookup from #6199
|
2016-11-09 22:44:23 +00:00 |
|
Damian Mooyman
|
ebae480c66
|
BUG Fix regression in aggregate column lookup from #6199
|
2016-11-10 11:13:02 +13:00 |
|
Daniel Hensby
|
5a7cde0e10
|
Merge branch '3.4' into 3.5.0
|
2016-11-09 16:14:40 +00:00 |
|
Daniel Hensby
|
d2f6ff4873
|
Merge pull request #6304 from kinglozzer/member-currentuser
FIX: Correct return type for Member::currentUser()
|
2016-11-09 15:59:44 +00:00 |
|
Loz Calver
|
6bf36fbd30
|
FIX: Correct return type for Member::currentUser()
|
2016-11-09 14:20:44 +00:00 |
|
Dan Hensby
|
e1c092e73a
|
Added 3.5.0-rc1 changelog
3.5.0-rc1
|
2016-11-09 11:45:29 +00:00 |
|
Dan Hensby
|
662bc688e5
|
Update translations
|
2016-11-09 11:32:20 +00:00 |
|
Daniel Hensby
|
cfbfe1427c
|
Merge pull request #6302 from jonom/shortcode-parse-extension-points
API Added extension points to ShortcodeParser
|
2016-11-09 11:23:16 +00:00 |
|
Jonathon Menz
|
ffd9938652
|
API ShortcodeParser getter and extension points
|
2016-11-08 11:23:52 -08:00 |
|
Daniel Hensby
|
955e02ab90
|
Merge branch '3.4' into 3
|
2016-11-08 17:03:10 +00:00 |
|
Martijn
|
1ec56a1202
|
Prevent undefined index notices
|
2016-11-07 15:09:35 +00:00 |
|
Daniel Hensby
|
cbd3aa0949
|
Merge pull request #6299 from silverstripe/revert-6237-modeladmin-showImportForm
Revert "Added $showSearchForm to ModelAdmin"
|
2016-11-07 13:42:55 +00:00 |
|
Daniel Hensby
|
27206c9240
|
Revert "Added $showSearchForm to ModelAdmin"
|
2016-11-07 13:42:47 +00:00 |
|
Daniel Hensby
|
250a4672fb
|
Merge pull request #6237 from Zauberfisch/modeladmin-showImportForm
Added $showSearchForm to ModelAdmin
|
2016-11-07 13:42:34 +00:00 |
|
Daniel Hensby
|
d5402d9dce
|
Merge pull request #6186 from ntd/pr5
BUG Use simplexml_load_string instead of simplexml_load_file
|
2016-11-07 12:16:32 +00:00 |
|
Damian Mooyman
|
df1354238a
|
Merge pull request #6276 from dhensby/pulls/3.4/versioned-phpdoc
DOCS Fix up some PHPDoc on Versioned
|
2016-11-07 08:56:46 +13:00 |
|
Daniel Hensby
|
683bde6d82
|
Merge pull request #3535 from manja/3.1
|
2016-11-03 14:40:39 +00:00 |
|
Daniel Hensby
|
0a835c6fe7
|
Merge branch '3.4' into 3
|
2016-11-03 13:27:31 +00:00 |
|
Daniel Hensby
|
5f99c4aa5f
|
Merge branch '3.3' into 3.4
|
2016-11-03 13:27:11 +00:00 |
|
Daniel Hensby
|
fad53ae33e
|
Merge branch '3.2' into 3.3
|
2016-11-03 13:26:30 +00:00 |
|
Daniel Hensby
|
6eebf07a8e
|
Merge branch '3.1' into 3.2
|
2016-11-03 13:20:11 +00:00 |
|
Daniel Hensby
|
c914dde7d1
|
Update travis build to use target branch as core release
|
2016-11-03 13:17:41 +00:00 |
|
Damian Mooyman
|
91f51a6783
|
Merge branch '3.4' into pulls/3.4/versioned-phpdoc
|
2016-11-03 17:41:02 +13:00 |
|
Damian Mooyman
|
182c9fb70f
|
Merge pull request #6282 from sminnee/fix-32
FIX: Ensure that builds use the 3.2 dependencies.
|
2016-11-03 17:40:30 +13:00 |
|
Sam Minnee
|
edfe514540
|
FIX: Ensure that builds use the 3.4 dependencies.
This fix does it in a way that doesn’t need manual maintenance
per-branch
|
2016-11-03 16:38:38 +13:00 |
|
Damian Mooyman
|
a633b01c7c
|
Merge pull request #6283 from sminnee/fix-34-builds
FIX: Ensure that builds use the 3.4 dependencies.
|
2016-11-03 16:28:44 +13:00 |
|
Sam Minnee
|
135a64761f
|
FIX: Ensure that builds use the 3.4 dependencies.
This fix does it in a way that doesn’t need manual maintenance
per-branch
|
2016-11-03 14:56:51 +13:00 |
|
Daniel Hensby
|
567b125fbc
|
DOCS Fix up some PHPDoc on Versioned
|
2016-11-02 14:08:35 +00:00 |
|
Damian Mooyman
|
3bad5fcd9b
|
Merge pull request #6269 from dhensby/pulls/3/inherited-default-records
FIX default_records are no longer inherited to child classes
|
2016-11-02 13:29:39 +13:00 |
|
Daniel Hensby
|
c61d61d003
|
FIX default_records are no longer inherited to child classes
|
2016-11-01 20:58:03 +00:00 |
|
Jono Menz
|
fdfd0c4fc3
|
DOCS Remove duped content (#6214)
D.R.Y.
|
2016-11-01 17:56:32 +13:00 |
|
Damian Mooyman
|
2a9138aa14
|
Merge pull request #6264 from dhensby/pulls/3.4/validation-docblock-fix
DOCS Docblock fixes for ValidationResult
|
2016-11-01 10:38:33 +13:00 |
|
Daniel Hensby
|
0b850e0819
|
DOCS Docblock fixes for ValidationResult
|
2016-10-31 13:33:59 +00:00 |
|
Loz Calver
|
b6bbed8de0
|
Merge pull request #6249 from dhensby/pulls/3.4/fix-error-message
FIX filterAny error message now refers to correct method name
|
2016-10-31 09:02:49 +00:00 |
|