Commit Graph

7507 Commits

Author SHA1 Message Date
Sam Minnee
adfdd068e2 Merge branch 'ereg-to-preg' of https://github.com/AngryPHPNerd/sapphire
Conflicts:
	model/fieldtypes/Date.php
2012-03-05 13:54:20 +13:00
Sam Minnee
dd130ddcb1 Merge branch 'file_shortcodes' of https://github.com/halkyon/sapphire 2012-03-05 13:49:46 +13:00
Sean Harvey
686f7b08e4 Merge remote-tracking branch 'upstream/master' into misc_fixes 2012-03-05 13:18:40 +13:00
Sean Harvey
b48d2a628a Merge pull request #206 from textagroup/master
Enhancement to display location of php.ini file when errors exist in install
2012-03-04 12:18:14 -08:00
Kirk Mayo
c211b7c435 Added some simple code to show the location of the loaded php.ini file when php configuration or file permision errors exist 2012-03-04 21:01:12 +13:00
Sean Harvey
8de7b745fc BUGFIX TinyMCE cache shouldn't be shared between projects. Add SCRIPT_NAME when generating a hash for the cache filename 2012-03-03 17:11:43 +13:00
Sean Harvey
b3d977f0e7 Merge remote-tracking branch 'upstream/master' into file_shortcodes 2012-03-03 10:24:06 +13:00
Ingo Schommer
299bf8b9c6 Merge branch 'integration' 2012-03-02 20:53:06 +01:00
Ingo Schommer
b242bfb3da BUGFIX Include GET parameters of current URL in GridField on ajax reloads to retain view state 2012-03-02 20:46:22 +01:00
Ingo Schommer
02e728fa08 BUGFIX Fixed visibility of admin/myprofile for non-admins by moving it to a new CMSProfileController class and overloaded canView() 2012-03-02 20:46:22 +01:00
Ingo Schommer
46628721fe ENHANCEMENT Using chosen.js for group selection in Member->getCMSFields() 2012-03-02 20:46:22 +01:00
Ingo Schommer
8fa266462f ENHANCEMENT Support numeric array values in CheckboxSetField (?Field[]=val1&Field[]=val2 instead of ?Field[val1]=1&Field[val2]=1) 2012-03-02 20:46:22 +01:00
Ingo Schommer
98e1fed746 ENHANCEMENT File::$app_categories to replace switch statement in File->appCategory(), and expose data to other use cases (such as filter drop downs in AssetAdmin) 2012-03-02 20:46:22 +01:00
Ingo Schommer
ef77b709c2 MINOR Fixed field label in Folder->getCMSFields() 2012-03-02 20:46:22 +01:00
Ingo Schommer
e5c4b0a36b ENHANCEMENT Hierarchy->Breadcrumbs() 2012-03-02 20:46:19 +01:00
Ingo Schommer
fda7a6aafe API CHANGE Remove custom File::instance_get(), use a custom DataQuery in case you want to exclude large File.Content fields from the query results 2012-03-02 15:22:11 +01:00
Ingo Schommer
fb3c18d6d2 API CHANGE Remove File->uploadMetadataFields(), use new UploadField instead 2012-03-02 15:21:32 +01:00
Ingo Schommer
4345eaa61b MINOR Sending 'ID' parameter from containing form alongside UploadField uploads, in order to set the correct context in in the controller (in the case of CMSFileAddController, that's the parent folder) 2012-03-02 15:21:12 +01:00
Ingo Schommer
9f5e26d12b ENHANCEMENT Generic search form uses loadPanel() rather than being tied to GridField (requires backend changes, see AssetAdmin), and uses jquery.form to do resets 2012-03-02 15:20:17 +01:00
Ingo Schommer
6d899940a3 MINOR CSS class for GridFieldFilter_Row.ss 2012-03-02 13:42:46 +01:00
Ingo Schommer
3659c63afe MINOR Updated jquery.form.js plugin, and re-added it to standard includes (its handy for clearing out forms, and consistently getting form field values) 2012-03-02 13:42:15 +01:00
Ingo Schommer
c7a301521d MINOR SearchFilter->setName()/setFullName() 2012-03-02 13:41:35 +01:00
Ingo Schommer
9a381d8393 MINOR Accept null values in SearchContext->getResults() 2012-03-02 13:41:25 +01:00
Ingo Schommer
b95abeedc6 Revert "MINOR SSF-53 : add ability to add customised class to GridField table" (introduces duplicate '.ss-gridfield' class in different levels of the DOM hierarchy)
This reverts commit 7bdc3d13fc.
2012-03-02 12:28:45 +01:00
Ingo Schommer
db1854b5fb MINOR Disable UploadField init on readonly or disabled fields 2012-03-02 11:06:40 +01:00
Ingo Schommer
783de154b2 MINOR Declaring JS requirements for AjaxUniqueTextField 2012-03-02 11:06:40 +01:00
Normann Lou
b58b281d8a BUGFIX SSF-53 : remove the disabled status of 'add button' in according with its sitting environment, ie. does it initialed by jQuery UI. If not, simply remove its 'disabled' attribute 2012-03-02 17:45:39 +13:00
Normann Lou
1175c693c5 ENHANCEMENT SSF-53 : add ability to use translated button label for 'Add New' and 'Link Existing' 2012-03-02 17:26:36 +13:00
Normann Lou
45927b98c4 ENHANCEMENT SSF-53: add customised class to Member's GridField in SecurityAdmin 2012-03-02 16:28:47 +13:00
Normann Lou
7bdc3d13fc MINOR SSF-53 : add ability to add customised class to GridField table 2012-03-02 16:27:34 +13:00
Normann Lou
5548c66a49 ENHANCEMENT SSF-53 reordering the components that added to group GridField in CMS so that it appears same as the landing view of SecurityAdmin 2012-03-02 16:03:23 +13:00
Normann Lou
de75798559 BUGFIX SSF-53 Pass through the parameter $itemsPerPage instead of reassign the default value (15) 2012-03-02 15:59:39 +13:00
Ingo Schommer
c4e04899b6 MINOR Added GridFieldTitle to Group->getCMSFields() to allow addition of new records (currently that button is hardcoded in the title component) 2012-03-02 00:29:09 +01:00
Ingo Schommer
424da6abe1 API CHANGE Moved NZGovtPasswordValidator to new 'securityextras' module 2012-03-02 00:28:22 +01:00
jbridson
58ffbe84bc ENHANCEMENT:SSF-106 - added padding to non-sortable <th> on gridfield 2012-03-02 11:46:35 +13:00
Andrew O'Neil
fce5487e59 MINOR: SFF-106 Gridfield changes to make styling easier 2012-03-02 11:06:24 +13:00
Ingo Schommer
0ab43cdcb8 API CHANGE Moved "IP Address restrictions for groups" feature to a new "ipaddress-restriction" module (SSF-53) 2012-03-01 21:36:01 +01:00
Ingo Schommer
3ded12e599 MINOR Removed obsolete "add member" button in SecurityAdmin, now handled through GridField (SSF-53) 2012-03-01 21:36:01 +01:00
Ingo Schommer
aa2e610a20 MINOR Documentation 2012-03-01 21:36:01 +01:00
Ingo Schommer
04698ac295 ENHANCEMENT GridFieldRelationAdd->placeholderText (SSF-53) 2012-03-01 21:35:59 +01:00
Ingo Schommer
3f07b9bffa MINOR Fixed PermissionCheckboxSetField readonly styles (SSF-53) 2012-03-01 21:35:48 +01:00
Ingo Schommer
4bd5333b56 MINOR Editing and relation adding on SecurityAdmin groups (both root and group instances) (SSF-53) 2012-03-01 21:35:48 +01:00
Ingo Schommer
a2afe4e4ad ENHANCEMENT Support multiple search fields in GridFieldRelationAdd, and allowing custom result formatting (SSF-53) 2012-03-01 21:35:45 +01:00
Ingo Schommer
9c95a9ae29 MINOR Removed GridFieldRelationAdd->useAutoSuggestion flag, as the field doesn't work without it (no current ID is being set via JS) (SSF-53) 2012-03-01 17:57:16 +01:00
Ingo Schommer
88039ffb81 MINOR GridFieldRelationAddTest (SSF-53) 2012-03-01 17:57:14 +01:00
Ingo Schommer
d02a68089f MINOR Catching GridField filter submission to enable usage through enter key in addition to clicking on the filter button (SSF-53) 2012-03-01 17:57:06 +01:00
Ingo Schommer
c3f4db1d7d ENHANCEMENT Using new UploadField in ForeignKey scaffolding, replacing deprecated ImageField/FileField classes 2012-03-01 12:00:03 +01:00
Ingo Schommer
23bd11281d MINOR Ensure global CMS behaviour is applied in dialogs and frames like UploadField as well (they only have the .cms class, not .cms-container) 2012-03-01 11:59:28 +01:00
Ingo Schommer
0b0e24b0ec MINOR Fixed UploadField edit forms falsely expanding by default 2012-03-01 11:58:40 +01:00
Ingo Schommer
f8201c48a3 MINOR More generic CSS styles for .cms-file-info: Apply to form.small parent, fixed related UploadField spacing issues 2012-03-01 11:58:16 +01:00