tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,244 Commits 29 Branches 513 Tags 147 MiB
Commit Graph

7244 Commits

Author SHA1 Message Date
Ingo Schommer 05d19d9a82 Revert "MINOR Use json_decode() instead of the Services_JSON class if the function exists." - it breaks assumptions around Convert::json2array() only converting the *first* level of an object structure into an array, which in turn fails CMSMainTest and LeftAndMainTest (as well as some UI functionality relying on it). In order to introduce this change we have to fix these issues in a backwards compatible manner. 
This reverts commit 3a006b77ae.
 2011-12-18 20:17:41 +01:00
Ingo Schommer 68a394427d MINOR Fixed usage of FieldSet->insertFirst() in ModelAdmin, no longer present in FieldList 2011-12-18 18:19:28 +01:00
Ingo Schommer 0bfc0bc645 MINOR Cleaning $Content property explicitly for SecurityAdmin->groupimport() iframe 2011-12-18 18:18:44 +01:00
Ingo Schommer 4d28b79c1b MINOR Reduced HTML validation errors in CMS and FieldGroup 2011-12-18 17:00:01 +01:00
Ingo Schommer bc2bb53274 MINOR Fixed drag'n'drop in SecurityAdmin (thanks frankmullenger) 2011-12-18 16:01:36 +01:00
Frank Mullenger 160f712f68 BUGFIX: Update the page title heading on edit page in CMS (fixes #6809) 2011-12-18 15:34:00 +01:00
Frank Mullenger 0a3de455cf MINOR User error was assuming $templateList is always an array when it can also be a string. 2011-12-18 15:34:00 +01:00
Stig Lindqvist f59d11c91e MINOR DataList::sort() can sort by relation name 2011-12-18 04:28:09 +01:00
Stig Lindqvist 20554b1bf9 BUGFIX DataQuery::orderby() don't sort relations DESC 2011-12-18 04:21:00 +01:00
Simon Welsh 04c8e2b762 BUGFIX Generate valid PHP when $includeDebuggingComments is true. 2011-12-17 17:35:26 +13:00
Sam Minnee fece61c90b BUGFIX: Use numeric literal for numeric less-than filter. 2011-12-17 16:42:31 +13:00
Sam Minnee 0bdfc0c515 MINOR: On PHPUnit 3.6, show the output of tests. 2011-12-17 16:42:31 +13:00
Sam Minnee 5a157a6365 API CHANGE: Deprecate SubstringFilter in favour of PartialMatchFilter. 2011-12-17 16:42:30 +13:00
Stig Lindqvist 9bf247cc33 API CHANGE Introduced DataQuery::whereAny() and SQLQuery::whereAny() 2011-12-17 16:42:30 +13:00
Stig Lindqvist 671c8b734d BUGFIX NegationFilter and SubstringFilter did not set the DataModel on apply() 2011-12-17 16:42:30 +13:00
Stig Lindqvist e22eaec204 BUGFIX Restfulserver should use the correct way when sorting SS_Lists 2011-12-17 16:42:30 +13:00
Stig Lindqvist a642a299c5 DOC Update the documentation for the datamodel to describe the SS_List sort, filter and exclude methods 2011-12-17 16:42:30 +13:00
Stig Lindqvist aafdb8e01c API CHANGE All SS_List implementators supports filter, exclude and sort methods 2011-12-17 16:42:29 +13:00
Stig Lindqvist 2306ec94c3 MINOR Updated inline documentation and added visibility keywords to methods for SS_List, DataList and ArrayList 2011-12-17 16:42:29 +13:00
Sam Minnee 60ced3b167 BUGFIX: Added default value for limit on LimitCharacters() to prevent backwards-compat issue (fixes 0c3af805) 2011-12-17 16:41:54 +13:00
Will Rossiter 4d0d5799bb MINOR: merged edlinklater/master into master. Fixes #134 2011-12-17 16:12:21 +13:00
Will Rossiter 01541487ca MINOR: code formatting 2011-12-17 16:06:56 +13:00
= d407f4c613 MINOR: Revert special formatting of preview button, fix Action button icons in IE8 2011-12-17 15:56:34 +13:00
Will Rossiter a04c1410e1 BUGFIX: update admin menu links when current page ID updates. Fixes #6768. 2011-12-17 15:51:02 +13:00
Hamish Friedlander 45c25e93b4 MINOR: Disable PhpSyntaxTest until we decide whether to re-write it or remove it 2011-12-17 15:40:06 +13:00
Hamish Friedlander be9286fbc4 Merge pull request #132 from simonwelsh/namespace-manifest 2011-12-17 15:40:06 +13:00
Sam Minnee 8e58529f39 BUGFIX: Don't throw errors if older modules aren't aware of the DataModel argument. 2011-12-17 15:25:15 +13:00
Mark Stephens 288369f1a9 ENHANCEMENT: Updated the template language documentation, based on work done by mrmorphic. 2011-12-17 15:25:15 +13:00
Sam Minnée 99b2430565 Merge pull request #131 from halkyon/master 
Nice debug formatting for ArrayList and DataList
 2011-12-16 18:05:09 -08:00
Sam Minnée fdb8665a43 Merge pull request #133 from simonwelsh/54_fixes 
MINOR Change error reporting level to explicitly exclude values rather t...
 2011-12-16 18:04:42 -08:00
Simon Welsh 10b09420be MINOR Change error reporting level to explicitly exclude values rather than using XOR. 2011-12-17 14:40:58 +13:00
Ingo Schommer 1d92172931 BUGFIX Returning 'first last' in ViewableData->FirstLast() if item is both at the same time 2011-12-17 02:32:21 +01:00
Simon Welsh da2ac79205 BUGFIX Check for the correct type for $data['namespace'] 2011-12-17 14:32:14 +13:00
Simon Welsh 97f8cc4ab3 BUGFIX Skip NamespacedClassManifestTest on PHP versions before 5.3 2011-12-17 14:26:03 +13:00
Will Rossiter 075cb5d7b9 ENHANCEMENT: keep Cookie::forceExpiry() consistent with Cookie::set() for preventing cookies from not being deleted. Fixes #56 2011-12-17 14:21:09 +13:00
Simon Welsh 3e6a91a07f ENHANCEMENT Allow ClassManifest to handle classes with namespaces, or that extend classes in namspaces or that implement interfaces in namespaces. 2011-12-17 14:03:53 +13:00
Will Rossiter 6977484f99 ENHANCEMENT: scale cms dialog popups based on browser. BUGFIX: #6760 ensure scrolling is supported in cms dialogs 2011-12-17 13:51:10 +13:00
Ingo Schommer e5e7511245 MINOR Patching prototype.js connection closing to avoid JS errors (see pull request #106) 2011-12-17 01:39:56 +01:00
Ingo Schommer d0cbbab513 Merge pull request #62 from howardgrigg/patch-1 
MINOR Correct BreadCrumb include
 2011-12-16 16:27:54 -08:00
Ingo Schommer 3f28582ee8 MINOR Added URLSegmentFilterTest->testReplacements() 2011-12-17 01:13:27 +01:00
Sean Harvey 30f049bd26 ENHANCEMENT ArrayList and DataList now show a nice view of the items inside when using Debug::show() 2011-12-17 12:45:45 +13:00
Ingo Schommer 0c3af80514 BUGFIX Better handling of multibyte strings in LimitCharacters(), removed code duplication by more flexible base implementation at StringField->LimitCharacters() (Merge pull request #121 from edlund/sapphire) 2011-12-17 00:40:13 +01:00
Sam Minnée dd495fb8bf Merge pull request #130 from sminnee/master 
Fixed tests for PHPUnit 3.6
 2011-12-16 15:19:47 -08:00
Sam Minnee 70d40cf4df BUGFIX: Removed use of base "Exception" class in order to avoid failures on PHPUnit 3.6. 2011-12-17 11:51:40 +13:00
Sam Minnée 2271566c6a Merge pull request #129 from markjames/master 
BUGFIX: Fix PHP warnings due to incorrect parenthesis in installer
 2011-12-16 14:35:34 -08:00
Mark James e102d9ddc9 BUGFIX: Corrected use of ENT_QUOTES/UTF8 on htmlentities in installer introduced by r3a7ac9759ab8f98eee0bb15db4618fd0ee146ab6. fixes #6806 2011-12-16 22:27:42 +00:00
Sam Minnée cedced8785 Merge pull request #122 from simonwelsh/patch-1 
MINOR Use json_decode() instead of the Services_JSON class if the functi...
 2011-12-16 14:14:35 -08:00
Ingo Schommer 36dc31d21d Merge pull request #124 from colinburns/patch-2 
Adding in the 'RS' => "Republic of Serbia", into this list of Counties. ...
 2011-12-16 11:25:41 -08:00
Ingo Schommer bad1b88942 MINOR Fixed change detection false positives for TinyMCE in IE, use TinyMCE.isDirty() rather than string comparison 2011-12-15 23:42:19 +01:00
Ingo Schommer bf11a32336 MINOR Fixed button layout height adjustment in CMS, reduced redraw() invocations on cms-edit-form 2011-12-15 23:42:16 +01:00