tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,028 Commits 31 Branches 527 Tags 162 MiB
5a7cde0e10
Commit Graph

16028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Nicola Fontana
fe816076fc BUG Make simplexml_load_file work on shared php-fpm 
PHP #62577 [1] together with PHP #64938 [2] make simplexml_load_file()
fails when the "disable load external entities" flag is set.

As a workaround, manually enable the entity loader in the bootstrap
code. We are loading internal XML files after all, so no security
implications should arise.

[1] https://bugs.php.net/bug.php?id=62577
[2] https://bugs.php.net/bug.php?id=64938

Fix #6174.
 2016-10-31 06:21:04 +01:00
Daniel Hensby
747bd4cac0
FIX filterAny error message now refers to correct method name 2016-10-30 12:04:07 +00:00
Daniel Hensby
3859a1d7e7
Merge branch '3.4' into 3 2016-10-27 16:16:04 +01:00
Daniel Hensby
2a3768266e
Merge branch '3.3' into 3.4 2016-10-27 16:15:43 +01:00
Daniel Hensby
a97ebf93de
Merge branch '3.2' into 3.3 2016-10-27 16:15:10 +01:00
Daniel Hensby
5f4f07a256
Merge branch '3.1' into 3.2 2016-10-27 16:14:01 +01:00
Loz Calver
68866ad31f Merge pull request #6238 from nfauchelle/patch-2 
Remove double quotes so example is not parsed.
 2016-10-27 09:05:36 +01:00
Nick
d1c29d6595 Remove double quotes so example is not parsed. 
[Notice] Undefined variable: map

Since it's using double quotes it tries to process $map, $key and $value
 2016-10-27 09:06:11 +13:00
zauberfisch
c4aed0c081 Added $showSearchForm to ModelAdmin 2016-10-26 11:35:52 +00:00
Matthew Hailwood
7778357b03 Switch Mandrill recommendation to sparkpost. (#6196) 
Now that Mandrill has become a paid part of Campaign Monitor it makes sense for us to recommend the free alternative SparkPost.

The package I've linked to is by the same author as the original Mandrill package.
 2016-10-25 13:26:56 +13:00
Nicola Fontana
4d327f81fd DOCS Specify that the selectors change the scope (#6213) 
Follow up of issue #4015.
 2016-10-21 09:15:27 -07:00
Damian Mooyman
0f8f9f2732 Merge pull request #6199 from jonom/fix-ambiguous-field 
FIX Ambiguous column SQL error
 2016-10-19 17:57:32 +13:00
Jonathon Menz
b0445f72e4 FIX Ambiguous column SQL error 
Specify the table for the field we’re fetching, in case a joined table has a field with the same name
 2016-10-18 21:35:37 -07:00
Daniel Hensby
9a6121c867
Merge branch '3.4' into 3 2016-10-16 22:56:37 +01:00
Daniel Hensby
66e6b016c0 Merge pull request #6181 from jonom/docs-additions 
Docs additions
 2016-10-16 14:17:04 +01:00
Jonathon Menz
d2c0b98bc5 DOCS Clarify nested cache block restrictions 
Fixes #6078
 2016-10-13 14:52:41 -07:00
Jonathon Menz
646d34ec48 DOCS Non-extendable classes 
Closes #6129
 2016-10-13 09:39:46 -07:00
Jonathon Menz
bfdac2b7b6 DOCS Template debugging 2016-10-13 09:39:10 -07:00