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
11,218 Commits 31 Branches 527 Tags 162 MiB
b3db70fcbd
Commit Graph

11218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php
 2013-03-19 13:56:04 +01:00
Ingo Schommer
5cad7fe9e3 Merge pull request #1308 from ss23/patch-10 
BUG SQL Injection in CsvBulkLoader (fixes #6227)
 2013-03-19 05:03:56 -07:00
Ingo Schommer
8538cb9ee2 Removed deprecated YamlFixture->saveIntoDatabase() usage 2013-03-19 12:58:15 +01:00
Ingo Schommer
4f95a07936 Removed deprecated NegationFilter tests, rewrote ExactMatchMultiFilter tests 2013-03-19 12:58:14 +01:00
Ingo Schommer
a44e06992a Fixed deprecated has_extension() usage 2013-03-19 12:58:14 +01:00
Ingo Schommer
0a9f3b75a9 Fixed deprecated usage of <% control %> 2013-03-19 12:58:14 +01:00
Stephen Shkardoon
143317cc86 BUG SQL Injection in CsvBulkLoader (fixes #6227) 
Diff should speak for itself, looks like this will have to be implemented in all supported branches.
 2013-03-20 00:45:05 +13:00
Andrew Short
94f209eb74 Merge branch '3.1' 2013-03-19 22:36:47 +11:00
Andrew Short
b8a51c3792 Merge branch '3.0' into 3.1 2013-03-19 22:27:09 +11:00
Daniel Hensby
0d57f7b19a FIX processAll method respects $preview flag 
The preview flag is now respected more thoroughly to stop writing of related objects
 2013-03-19 11:23:58 +00:00
Daniel Hensby
3020576f08 FIX Adding preview method to CsvBulkLoader 
Currently the CsvBulkLoader doesn't implement the preview method even though it's processor function has the $preview flag.
 2013-03-19 11:05:10 +00:00
Ingo Schommer
b282c9f8f3 Fixed deprecated GD usage 2013-03-19 10:51:39 +01:00
Ingo Schommer
4cd6d00159 Fixed forceExpiry() usage 2013-03-19 10:49:52 +01:00
Ingo Schommer
8629985115 Mark private static deprecation notice for 3.2 
Its too intrusive for 3.1 at the moment
 2013-03-19 10:39:11 +01:00
Ingo Schommer
b416e50bff Fixed deprecations 2013-03-19 10:38:14 +01:00
Simon Welsh
00bcdf39d3 Merge pull request #1305 from ss23/patch-8 
FIX $_COOKIES is not un-magic_quotes'd (fixes #6309)
 2013-03-19 02:35:30 -07:00
Ingo Schommer
3932241844 Removed test for deprecated NegationFilter 2013-03-19 10:13:57 +01:00
Stephen Shkardoon
9ac104b8c7 BUG $_COOKIES is not un-magic_quotes'd 
Added stripslashes_recursively to $_COOKIE (fixes #6309)
 2013-03-19 22:13:07 +13:00
Andrew Short
d36f9d6920 Merge pull request #1304 from simonwelsh/skip-sqlite 
Mark SQLite as an allowed failure until it works again
 2013-03-19 01:47:38 -07:00
Simon Welsh
2afa568d7e Mark SQLite as an allowed failure until it works again 2013-03-19 21:45:02 +13:00
Ingo Schommer
888f32c6d1 Merge pull request #1302 from ajshort/3.1-deprecation-notification 
Update the deprecation notification version to 3.1
 2013-03-19 01:37:14 -07:00
Andrew Short
4836375a1f Update the deprecation notification version to 3.1 2013-03-19 19:33:05 +11:00
Ingo Schommer
3abfc7e25c Merge pull request #1300 from patbolo/ticket/8328 
FIX #8328 Expose previously selected values of TreeMultiSelectField so t...
 2013-03-19 01:27:21 -07:00
Andrew Short
15d325633a Merge pull request #1289 from chillu/pulls/tree-node-limit 
FIX Respect tree node limits, fix search result node display
 2013-03-19 00:45:06 -07:00
Ingo Schommer
dd6f33ab37 FIX Respect tree node limits, fix search result node display 
- Renamed $minNodeCount to more accurate $nodeCountThreshold
- The $minNodeCount attribute wasn't properly respected
during actual querying, so SilverStripe would always traverse
the entire tree (and load all objects into memory),
before then marking nodes as "unexpanded", which prevents
them from actually being rendered.
- Fixes nodes on search results to be expanded by default
- Fixes nodes on search results to correctly ajax-expand
 2013-03-19 00:05:14 +01:00
Ingo Schommer
62753d8612 Merge pull request #1301 from simonwelsh/mysqli-port 
Allow setting the port for mysql and setting it in _ss_environment
 2013-03-18 15:13:25 -07:00
Simon Welsh
7c11118e2b Allow setting the database port in _ss_environment 2013-03-19 10:51:16 +13:00
Simon Welsh
5087b25a65 Allow setting the MySQL database port 2013-03-19 10:50:20 +13:00
Ingo Schommer
2a73b370d0 Merge pull request #1204 from dhensby/unsavedrelationlist-improvements 
BUG UnsavedRelationList aren't checked
 2013-03-18 13:43:41 -07:00
jean
d9f4a362d7 FIX #8328 Expose previously selected values of TreeMultiSelectField so they are not wipped out when selecting more values at an higher level in hierarchy 2013-03-19 08:48:44 +13:00
Ingo Schommer
250834d9d2 Updated browser requirements, dropping IE7 support 
See https://groups.google.com/forum/?fromgroups=#!topic/silverstripe-dev/GahZfDLvb-I
 2013-03-18 14:33:43 +01:00
Ingo Schommer
1afd091fbe Merge pull request #1291 from chillu/pulls/update-pages-list 
Docs - Howto: Customize the Pages List in the CMS
 2013-03-18 05:55:53 -07:00
Ingo Schommer
c7d2d51c6a Docs - Howto: Customize the Pages List in the CMS 2013-03-18 13:55:15 +01:00
Ingo Schommer
b2552f885b Merge pull request #1288 from chillu/pulls/tab-state-overrides 
Tab state overrides
 2013-03-18 04:12:05 -07:00
Andrew Short
4ac9c23702 Merge pull request #1298 from ss23/patch-7 
Fix minor formatting issues
 2013-03-17 18:48:16 -07:00
Stephen Shkardoon
5f08ea3e6a Fix minor formatting issues 
Extra spaces in front of Action.
Removed the out of place text on GridField (is that meant to be a link or what?)
Missing a period on the end of some entries.
 2013-03-18 14:37:26 +13:00
Sean Harvey
df7671acb4 Merge pull request #1297 from silverstripe-rebelalliance/feature/config 
FIX SplFixedArray causes segfaults in old versions of PHP
 2013-03-17 14:27:27 -07:00
Hamish Friedlander
3543a93623 FIX SplFixedArray causes segfaults in old versions of PHP 2013-03-18 10:22:11 +13:00
Ingo Schommer
f4d16d01f8 Adjusted docs to "simple" theme (thanks Nadeeth Lansakara) 2013-03-17 20:58:06 +01:00
Ingo Schommer
79ac63c96d Merge pull request #1296 from ss23/patch-6 
Removed invalid characters
 2013-03-17 12:21:55 -07:00
Stephen Shkardoon
2ead2ba60f Removed invalid characters 
No idea what those characters were meant to be, so I removed them.
 2013-03-16 23:17:02 +13:00
Will Rossiter
50b0da9ba4 Merge pull request #1295 from ss23/patch-5 
Typo "nee" -> "need"
 2013-03-15 23:00:57 -07:00
Stephen Shkardoon
ad5a090847 Typo "nee" -> "need" 
Looks like Silverstripe needs the d.
 2013-03-16 17:15:50 +13:00
Simon Welsh
97df009a41 Correct spelling 2013-03-16 00:06:10 +13:00
Simon Welsh
0cc2aeb827 Update examples to match conventions 2013-03-16 00:06:10 +13:00
Simon Welsh
a772eb1528 Update coding conventions to match SilverStripe practices 2013-03-16 00:06:04 +13:00
Ingo Schommer
e0e481fc46 Removed stray code from HTMLEditorField.js 2013-03-15 12:01:45 +01:00
Andrew Short
bc941c18b6 Merge branch '3.1' 2013-03-15 21:58:37 +11:00
Andrew Short
6ae931df24 Merge branch '3.0' into 3.1 2013-03-15 21:47:23 +11:00
Damian Mooyman
cd27bf71fb BUG Enforced requirement that ValidationException::getResult() is expected to consistently produce a valid ValidationResult object. 2013-03-15 13:56:43 +13:00