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
15,989 Commits 31 Branches 527 Tags 162 MiB
6057df3202
Commit Graph

15989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
6b123fe1c9 Merge pull request #35 from silverstripe-security/patch/3.1/ss-2016-016 
[SS-2016-016] FIX Properly escape backURL for template injection
 2016-11-15 11:11:38 +00:00
Daniel Hensby
8336cb96b9 Merge pull request #29 from silverstripe-security/patch/3.1/SS-2016-010 
[SS-2016-010] Prevent readonly fields loading submitted data
 2016-11-15 11:08:15 +00: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
Damian Mooyman
cc9d17063a
Add tests for FormField submission behaviour 
Fix ReadonlyField casting with empty values
Restore Value() behaviour for TextareaField
 2016-11-15 11:55:48 +13:00
Daniel Hensby
6136cf8502
DOCS Update PHPDoc for SS_HTTPResponse 2016-11-14 19:02:56 +00:00
Daniel Hensby
4440b88730
[SS-2016-010] FIX Form@httpSubmission will no longer load submitted data to disabled or readonly fields 2016-11-14 10:38:16 +00:00
Daniel Hensby
61e4055bdb
[SS-2016-010] FIX Cast FormField values as Text to prevent readonly fields embeding rogue HTML 2016-11-14 10:38:15 +00:00
Daniel Hensby
17097a4d11
[SS-2016-016] FIX Properly escape backURL for template injection 2016-11-10 17:00:03 +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
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
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
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
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
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
4c7ba731be
Merge branch 'open-sausages/pulls/3.4/fix-checkbox-datalist' into 3.4 2016-10-11 20:16:33 +01:00
Damian Mooyman
7368deca8f
BUG Fix issue with SS_List as datasource for dropdown field 
BUG Fix validation issue with CheckboxSetField
Fixes #6166
 2016-10-11 14:58:48 +13:00
Daniel Hensby
5580100ade Merge pull request #6157 from madmatt/patch-2 
Make __call() clearer that a method may be non-public
 2016-10-07 12:40:48 +01:00
Matt Peel
5a2591ec7d Make __call() clearer that a method may be non-public 
Resolves #6151
 2016-10-06 14:01:38 +13:00
Daniel Hensby
420cbadaac Merge pull request #6149 from jonom/sort-fix-2 
FIX Revert natural sort
 2016-10-04 23:43:10 +01:00
Damian Mooyman
17c6580d3a Merge pull request #6138 from dhensby/pulls/3.4/fix-sessions-on-alternate-base-urls 
FIX Absolute alternate_base_url no longer breaks session cookies
 2016-10-05 11:26:27 +13:00