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
10,969 Commits 31 Branches 527 Tags 162 MiB
12ed83f88b
Commit Graph

10969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Welsh
12ed83f88b Merge pull request #1326 from ss23/patch-1 
Missing closing <a> tag in installer
 2013-03-23 12:13:39 -07:00
Stephen Shkardoon
f27410c257 Missing closing <a> tag in installer 2013-03-24 00:06:54 +13:00
Ingo Schommer
bfab74ac6e Merge pull request #1321 from silverstripe-rebelalliance/feature/config 
FIX ConfigStaticManifest persisting access level after parsing a static
 2013-03-22 02:25:54 -07:00
Sean Harvey
9f35b13b48 Merge pull request #1322 from ajshort/pulls/class-spec-parsing 
FIX Incorrect parsing of T_STRING values in class spec parsing
 2013-03-21 21:20:35 -07:00
Andrew Short
d3e4863f52 FIX Incorrect parsing of T_STRING values in class spec parsing 
* Due to missing break, the T_STRING case would fall through to array.
* The values were being added to the wrong variable.
* Added missing support for missing null values.
 2013-03-22 14:37:55 +11:00
Hamish Friedlander
47edbfe8fc FIX ConfigStaticManifest persisting access level after parsing a static 2013-03-22 14:26:48 +13:00
Hamish Friedlander
c6eb1924ca Merge pull request #1317 from chillu/pulls/config.php-after-statics 
FIX Load _config.php's after static config manifest
 2013-03-20 16:23:35 -07:00
Ingo Schommer
81a51331d6 IX Load _config.php's after static config manifest 
This allows more sophisticated handling of config alterations
in _config.php. One example is additions to DataObject::$db
based on configuration which requires some processing.

See https://github.com/unclecheese/TranslatableDataObject/blob/master/TranslatableDataObject.php
 2013-03-21 00:16:36 +01:00
Ingo Schommer
63c8441410 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.js
 2013-03-21 00:11:17 +01:00
Ingo Schommer
2787d360c1 FIX "Insert Link" and other TinyMCE loading bugs (fixes #8327) 
Caused by SS loading a URL with html entities (&amp;)
through the Requirements API, which only works when directly
inserted into the HTML template (standard behaviour),
but garbles the URL GET parameters when loaded via the jQuery.ondemand
JavaScript/XHR logic.

It didn't fail the request, just meant that tiny_mce_gzip.php wasn't
getting all the required options from the GET parameters.
And since this newly loaded file contains the same JS globals,
it would override previously loaded (correct) state.
 2013-03-20 17:58:17 +01:00
Ingo Schommer
f7400198d7 Merge pull request #1315 from dhensby/patch-4 
FIX Adding preview method to CsvBulkLoader
 2013-03-20 07:24:52 -07:00
Ingo Schommer
8bedf485d6 Don't fail TinyMCE cleanup if no current instance is set 
Bug has been observed in IE8
 2013-03-20 14:46:28 +01:00
Ingo Schommer
eb9a8d6e6e Require Config.php in core to avoid fatal errors when building manifest 2013-03-20 14:45:43 +01:00
Ingo Schommer
5ad73a549a Fixed TreeDropdownField loading indicators 2013-03-20 14:45:23 +01:00
Ingo Schommer
42b19cb4a5 Merge pull request #1198 from silverstripe-rebelalliance/open8231 
ENHANCEMENT: fixed styling bug with the text in the file upload drop are...
 2013-03-20 14:07:26 +01:00
Ingo Schommer
0a13d29e4a Merge pull request #1214 from silverstripe-rebelalliance/feature/request_handling 
FIX handleAction methods should be protected now
 2013-03-20 13:52:45 +01:00
Daniel Hensby
a03d1e66ca BUG CMS messages touch the bottom of the inputs 
making spacing even: http://screencast.com/t/oYHnG1Bj
 2013-03-20 13:50:10 +01:00
Ingo Schommer
74014650ed Merge pull request #1205 from UndefinedOffset/3.0 
BUG Fixed issue with cms help toggles not functioning correctly
 2013-03-20 05:47:05 -07:00
Ingo Schommer
c3854e9e4c Merge pull request #1274 from simonwelsh/update-conventions 
Update conventions
 2013-03-20 03:56:45 -07:00
Ingo Schommer
61dbafc4e5 Merge pull request #1292 from tractorcow/3.1-validationexception-fixes 
BUG Issue with ValidationException having blank ValidationResult
 2013-03-20 03:55:42 -07:00
Ingo Schommer
72d5f3cf17 Composer contribution fork/upstream docs (fixes #8332) 2013-03-20 11:37:41 +01:00
Ingo Schommer
5b83de4049 Added note about deprecations to 3.1 upgrading guide 2013-03-20 10:28:39 +01:00
Ingo Schommer
06ff9f72b1 Increased recent deprecation warnings from 3.1 to 3.2 
The deprecations are supposed to denote the release where
the functionality will be removed, as opposed to the one where
its deprecated. Having 3.1 as a target for recent changes
in popular methods like Object::add_extension() causes
too many short-term hassles, there's no "grace period".
 2013-03-20 10:00:51 +01:00
Ingo Schommer
2debbd37dc Updated history.js dependency 2013-03-20 00:46:32 +01:00
Ingo Schommer
53c84ee1fe Merge remote-tracking branch 'origin/3.0' into 3.1 2013-03-19 14:04:29 +01:00
Ingo Schommer
52ffb307a7 Fixed ValidationException handling in LeftAndMain 
getResult() isn't always available, and has the same content
as the native Exception->getMessage() anyway
 2013-03-19 14:02:28 +01:00
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
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