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
8,581 Commits 31 Branches 527 Tags 162 MiB
ce5684c776
Commit Graph

688 Commits

Author SHA1 Message Date
Julian Seidenberg
1e0b843353 ENHANCEMENT: refactoring code for making a link an ajax/history link. Removing the selector that targets .crumb and only applying the selector that turns links with cms-panel-link into ajax enabled links. Adding the cms-panel-link to those links that already have the crumb class. 2012-04-10 18:16:27 +12:00
Jeremy Bridson
54905b077b BUGFIX:fixed width of dropdowns in filter side menu. 2012-04-10 17:40:01 +12:00
Jeremy Bridson
df389716df BUGFIX: SSF-124 - fixed width of column and positioning of show children arrow in ie7 2012-04-10 16:28:25 +12:00
Jeremy Bridson
4a3a6d5128 BUGFIX: SSF-124 - removed styles to fix color of th text. 2012-04-10 13:36:15 +12:00
Julian Seidenberg
9183890148 BUGFIX: SSF-168 fixing Webkit rendering issue that would display elements outside of an absolute positioned layout, breaking the layout in the reportadmin section. The fix is to hide to container that breaks the layout and use js to move the required elements out of the container when the CMS needs them. 2012-04-10 12:41:47 +12:00
Jeremy Bridson
e0b429491c ENHANCEMENT: SSF-124 - styled the pages list view. 2012-04-10 12:22:11 +12:00
Jeremy Bridson
1176d8d100 BUGFIX:consolidated the btn_icons folder with the btn_icon folder in ../sapphire/admin/images 2012-04-10 12:20:13 +12:00
Jeremy Bridson
cb09ff7ba8 BUGFIX:removed reference to compass generated sprite and added direct reference to the png file. 2012-04-10 12:20:12 +12:00
Julian Seidenberg
c57d8a8ed4 MINOR: regenerating compass icons 2012-04-10 12:11:01 +12:00
Ingo Schommer
cf304044b8 Merge branch 'master' into integration 2012-04-10 00:39:29 +02:00
Ingo Schommer
1742b4b742 BUGFIX Fixed loading/saving regressions due to new PJAX logic introduced in e01b0aa3d0 2012-04-10 00:37:14 +02:00
Ingo Schommer
85a898e1d5 MINOR Don't assume existence of cms/ folder in LeftAndMain->CMSVersion() (regression from earlier code) 2012-04-09 23:55:23 +02:00
Jeremy Bridson
e212e8cb25 BUGFIX: fixed a couple of minor bugs - X-scrolling to 9999em on ModelAdmin and padding on active tabs in pages. 2012-04-10 09:02:24 +12:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
 2012-04-09 21:10:08 +02:00
Wolf Vollprecht
3ae0ac7805 ENHANCEMENT: Rightlick submenu styles and ability to add page with pagetype 2012-04-09 21:08:19 +02:00
Ingo Schommer
aebbb10c9f MINOR Skip processing in CMS on empty ajax responses, as they're usually a pseudo redirect (via X-ControllerURL) 2012-04-05 23:00:22 +02:00
Sam Minnee
e01b0aa3d0 ENHANCEMENT PjaxResponseNegotiator for more structured partial ajax refreshes, applied in CMS and GridField. Also fixes issues with history.pushState() and pseudo-redirects on form submissions (e.g. from page/add to page/edit/show/<new-record-id>) 2012-04-05 23:00:22 +02:00
Ingo Schommer
72985b6f42 MINOR Artificially triggering onsubmit event on CMS form buttons rather than calling submitForm() method, in order to give forms like .cms-add-form the option to overload its behaviour 2012-04-05 23:00:22 +02:00
Ingo Schommer
f97804bbe2 MINOR Fixed specificity of .add-form behaviour 2012-04-05 23:00:22 +02:00
Ingo Schommer
a44b67bae2 API CHANGE Moved RequestHandler->isAjax() to SS_HTTPRequest->isAjax() 2012-04-05 23:00:22 +02:00
Jeremy Bridson
206c61fcd5 ENHANCEMENT:SSF-168 - styled report admin gridfield 2012-04-05 15:27:52 +12:00
Jeremy Bridson
a85301b3c7 MINOR:css files regenerating from sass 2012-04-05 15:27:24 +12:00
Jeremy Bridson
6c697e5d05 BUGFIX:SSF-38 - fixed the issue with the size of the popup being to large on-load - added overflow scroll. Altered the header and tabs to match the style of edit profile. 2012-04-05 13:23:56 +12:00
Jeremy Bridson
c1f6f20114 ENHANCEMENT:added logo to header on ss3 install page - plus compass regenerated icon sprites. 2012-04-05 11:18:11 +12:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Ingo Schommer
6517f4496b Merge pull request #273 from ajoneil/sapphire 
---

This allows DataList::create(SiteTree) as equivalent to Object::create(DataList, SiteTree), without
having to have a create() function on DataList.

Required for E_STRICT compliance, as child classes cant override create() if they change the arguments.

DBField::create() is also renamed to DBField::create_field(), as this does not just call the constructor, which all other cases of create() do.

Conflicts:
	tests/model/DateTest.php
	tests/model/DatetimeTest.php
 2012-04-04 16:48:16 +02:00
Ingo Schommer
ac6f9e9987 MINOR Normalize trailing slashes in X-ControllerURL handling to avoid double requests caused by SS_HTTPRequest modifying the original URL (removing trailing slash etc) 2012-04-04 16:47:14 +02:00
Ingo Schommer
c2b741642e MINOR Moved X-ControllerURL handling into global ajax response handlers to avoid code duplication 2012-04-04 16:47:13 +02:00
Ingo Schommer
0414e42bbc MINOR Keep X-ControllerURL canonical by not re-constructing with question mark if there's no GET string (caused duplicate HTML5 pushState requests) 2012-04-04 16:47:13 +02:00
Felipe Skroski
7740bb326a ENHANCEMENT SSF-168 moved print and csv export buttons to the top of the grid 2012-04-04 14:09:52 +12:00
Felipe Skroski
4ffef20b09 ENHANCEMENT: SSF-168 updated print styles to the datagrid 2012-04-04 14:09:52 +12:00
Julian Seidenberg
7f8a682ad7 BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field 2012-04-04 13:46:24 +12:00
Normann Lou
2f3949ac6e MINOR add 'print button' to Member list and data list of ModelAdmin 2012-04-04 10:35:41 +12:00
Jeremy Bridson
cebe2fc093 BUGFIX:removed header from edit profile popup and restyled broken tabs - still needs a proper fix after beta II. 2012-04-03 14:34:42 +12:00
Normann Lou
fac2664e01 MINOR: add 'edit-profile-popup' as extra popup class 2012-04-03 12:50:13 +12:00
Normann Lou
f1e0951483 ENHANCEMENT: allow each dialog pop to have their own extra class. 2012-04-03 12:50:13 +12:00
Sean Harvey
f8a6db8d31 MINOR Temporarily reverted X-ControllerURL push state, as the header doesn't get set 
correctly in LeftAndMain::handleRequest() correctly. This fixes saving
pages until X-ControllerURL has been corrected.
 2012-04-03 11:29:44 +12:00
Julian Seidenberg
5c3c3cb347 BUGFIX: SSF-38 removing the z-index on the TabSet so that the upload button works in the HtmlEditorField insert image lightbox. 2012-04-03 10:31:01 +12:00
Sean Harvey
a2979f0551 BUGFIX Ensure that origLayoutClasses is always an array when considered 
empty, as join() will be called later and causes a JS error on an empty
string.
 2012-04-02 14:29:02 +12:00
Ingo Schommer
6c91aa0ec5 BUGFIX Force referer via "BackURL" POST data in CMS to work around IE problems with sending the base URL as the referer instead of the actual one (#7002) 2012-03-30 16:51:43 +02:00
Ingo Schommer
1091c7b944 BUGFIX Don't replace pushState() if emulated, as it will re-load the new URL via ajax, effectively duplicating every request in IE (#7002) 2012-03-30 16:51:43 +02:00
Ingo Schommer
83adffd7cd MINOR Fixed var names in LeftAndMain.js 2012-03-30 16:51:42 +02:00
Ingo Schommer
e6aa9ae017 BUGFIX Fixed History.js library handling of relative URLs combined with a base URL (was causing infinite loops, e.g. /admin/#/admin/admin/admin/security) (#7002) 2012-03-30 16:51:42 +02:00
Ingo Schommer
f34e58f573 ENHANCEMENT Enabled History.pushState() support in IE via onhashchange fallbacks (#7002) 2012-03-30 16:51:42 +02:00
Ingo Schommer
3f4aba5545 MINOR Avoid breaking IE on CMS ajax responses which don't contain CSS class names (splitting on NULL) (#7002) 2012-03-30 16:51:42 +02:00
Ingo Schommer
c518a19ec2 BUGFIX Replaced logic for checking external URLs in CMS Menu with more stable jQuery Mobile codebase (fixes problems on IE not loading menu entries via ajax) (#7002) 2012-03-30 16:51:42 +02:00
Jeremy Bridson
c0fd9bf97c ENHANCEMENT:SSF-38 - Styled in-content file upload dialog box. Also added fixes for cms-content-header box-shadow. 2012-03-30 14:33:20 +13:00
Ingo Schommer
f0ee711f52 Merge pull request #275 from halkyon/e_strict_support 
First round of fixes for E_STRICT compliance
 2012-03-28 02:42:26 -07:00
Sean Harvey
e097f6e1a8 MINOR Fixes to method arguments in core classes for E_STRICT support. 
API CHANGE Remove abstract static function and just use static functions
in Authenticator (PHP 5.3+ doesn't support abstract static functions)
 2012-03-28 22:41:42 +13:00
Ingo Schommer
2ecfbc49f5 Merge pull request #276 from halkyon/e_deprecated_fixes 
E_DEPRECATED fixes - split() replaced with preg_split()
 2012-03-28 02:31:04 -07:00
Ingo Schommer
cbb0259dd7 Merge branch 'integration-merge27march' 2012-03-27 18:07:21 +02:00
Ingo Schommer
66093f71ac MINOR Fixed one-off button height inconsistencies (fixes #6980) 2012-03-27 17:07:52 +02:00
Ingo Schommer
3ef3a6df99 MINOR Shrinking GridField button column to fit, rather than hardcoding a width for it that depends on the amount and styling of buttons in the table 2012-03-27 17:07:52 +02:00
Ingo Schommer
efc30fd39e MINOR Removed setRightTitle() special case (and too specific styling) from Group->getCMSFields(), implemented title attribute for chosen.js drop downs instead (to be styled with more friendly title popovers) 2012-03-27 17:07:50 +02:00
Normann Lou
7a27832297 BUGFIX fix the field generated by choser with 0 width in an iFrame popup 2012-03-27 17:06:58 +02:00
Normann Lou
a95b11d004 MINOR Updated chosen.js from 0.9.7 to 0.9.8 while still maintaining local fixes 2012-03-27 17:02:19 +02:00
Normann Lou
66f537dc3a BUGFIX: when apply a bugfix patch, there is one missing variable missing, add it. 2012-03-27 17:02:19 +02:00
jbridson
236f2673e1 MINOR:changed the heading 'add pages' to add page trac #7026 2012-03-27 17:02:19 +02:00
jbridson
31d4629cdb BUGFIX:removed the float from the li (checkboxes) in members permissions... fixed layout issues Trac #6958 2012-03-27 17:02:18 +02:00
jbridson
83be1a8b43 BUGFIX:removed unnecessary horizontal line from new members page and replaced cms-help-toggle text with ?icon Trac #6956 2012-03-27 17:02:18 +02:00
jbridson
97aa2c8ba6 BUGFIX:adjusted padding so that content aligns properly on the add page panel Trac #6990 2012-03-27 17:02:18 +02:00
jbridson
6fb95e098d BUGFIX:fixed padding issues with navigation tabs across the CMS 2012-03-27 17:02:18 +02:00
Ingo Schommer
87fbb720a1 MINOR Fixing 1px gap between nav tree and page header 2012-03-27 17:02:18 +02:00
jbridson
064a36e140 BUGFIX:fixed alignment of create and delete buttons across the CMS - Trac #6955 2012-03-27 17:02:17 +02:00
jbridson
43d8c08b28 ENHANCEMENT:added cursor:pointer to arrows in the pages tree (Trac #6930) 2012-03-27 17:02:17 +02:00
jbridson
62ef8a269f ENHANCEMENT:replaced text "Toggle Formatting Help" with a ? icon on edit profile Popup - Trac #6904 2012-03-27 17:02:17 +02:00
jbridson
1a66ecd6ac BUGFIX:fixed styling issues on edit profile dialog popup - Trac #6819 2012-03-27 17:02:14 +02:00
jbridson
304b89f802 MINOR:replaced back button icon with correct icon. 2012-03-27 15:38:36 +02:00
Normann Lou
4c1cb59116 MINOR: fix the bug that ModelAdmin search filter doesn't work when arriving from another section of the CMS. 2012-03-27 15:37:32 +02:00
Sean Harvey
cf014dc56d MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3 
ENHANCEMENT E_DEPRECATED and E_USER_DEPRECATED are now handled as notice level errors in Debug.
 2012-03-27 23:16:52 +13:00
Will Rossiter
c3cae289d3 MINOR: added default flag to SCSS to allow variables to be overridden 2012-03-27 21:35:43 +13:00
Will Rossiter
e9f650a04e MINOR: tighten up tree spacing 2012-03-27 21:35:43 +13:00
Andrew O'Neil
de2832e65f ENHANCEMENT: Allow Object::create() to be called with late static binding. 
This allows DataList::create('SiteTree') as equivalent to Object::create('DataList', 'SiteTree'), without
having to have a create() function on DataList. Required for E_STRICT compliance.
 2012-03-27 17:57:42 +13:00
Ingo Schommer
06a4e1aad6 Merge pull request #268 from sminnee/raise-js-errors 
BUGFIX: Show a correct growl message when ajax returns a JS error rather than HTTP error.
 2012-03-26 06:27:41 -07:00
Sean Harvey
fd7f2eb469 ENHANCEMENT Use of Object::create('GridField') for Roles grid in 
SecurityAdmin, to be consistent with Members and Groups grid
instantiation.
MINOR Removing comments referring to CTF
 2012-03-26 14:51:40 +13:00
Sean Harvey
fca60b786c ENHANCEMENT Addition of ModelAdmin::getExportFields() which allows ModelAdmin classes to customise which fields should be exported. Defaults to the summary fields from the model class definition. 2012-03-25 20:01:43 +13:00
Sam Minnee
f5f655bd7a BUGFIX: Show a correct growl message when ajax returns a JS error rather than HTTP error. 2012-03-24 16:35:18 +13:00
Will Rossiter
06dd79f34c MINOR: remove console.log 2012-03-24 14:22:29 +13:00
Will Rossiter
39742f53e5 BUGFIX: #7036 refresh CMS panel when adding a new file 2012-03-24 14:20:46 +13:00
Sam Minnée
3ef64af761 Merge pull request #260 from simonwelsh/assettablefield 
MINOR Remove unused AssetTableField js file
 2012-03-23 18:08:12 -07:00
Sam Minnée
1b24437fde Merge pull request #262 from halkyon/security_import 
ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, and styling fixes.
 2012-03-23 17:39:46 -07:00
Sean Harvey
ffdf548575 ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into 
Users and Groups tab for context instead of Import tab, and fixing
styling to be close to how it was in SS 2.4.
 2012-03-24 13:20:19 +13:00
Simon Welsh
673dd7d992 MINOR Remove unused AssetTableField js file 2012-03-24 12:36:59 +13:00
Will Rossiter
71f37b993c BUGFIX: #6840 Fix navigation highlights on LeftAndMain 2012-03-24 11:57:29 +13:00
Will Rossiter
ebec3ba1c6 MINOR: fix alignment of cms logo to panel title 2012-03-24 11:57:29 +13:00
Sean Harvey
fea3a4eea0 MINOR Removed useless .DS_Store files 2012-03-20 20:41:10 +13:00
Ingo Schommer
e70c9b7d13 Merge pull request #246 from silverstripe-scienceninjas/trac-6853 
BUGFIX: #6853 Necessary styles required to complement work on same-index...
 2012-03-15 15:40:38 -07:00
Ingo Schommer
e443ec5c9c Merge pull request #244 from sminnee/ipad-fixes 
BUGFIX: Remove stray scrolling and zooming glitches on iPad.
 2012-03-15 03:03:45 -07:00
Sean Harvey
fc9e065e44 BUGFIX Don't show "Import" header if ImportForm isn't available in 
ModelAdmin_Tools template
 2012-03-15 14:18:56 +13:00
Sam Minnee
069d7117d7 BUGFIX: Remove stray scrolling and zooming glitches on iPad. 2012-03-15 14:13:30 +13:00
Ingo Schommer
620b23a23f MINOR Including GET parameters in X-ControllerURL default headers (which fixes e.g. AssetAdmin search persistence) 2012-03-14 16:07:50 +01:00
jbridson
7ff273263a BUGFIX:fixed issues with overflow on model and security admin - made changes more specific. 2012-03-12 23:01:07 +01:00
jbridson
3d26cb7bf9 BUGFIX:SSF-106 - fixed uneven column widths and overflow issues with datagrid in ie7. 2012-03-12 23:01:07 +01:00
Andrew O'Neil
f367db2904 MINOR: Remove table filter from modeladmin search results 2012-03-12 23:01:07 +01:00
Ingo Schommer
2c42ffdba7 MINOR Removed ModelAdmin JS which no longer applies due to rewrite 2012-03-12 17:34:31 +01:00
Ingo Schommer
4fc3aaf939 Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this. 
This reverts commit 69a8659a3d.
 2012-03-12 16:03:13 +01:00
Ingo Schommer
d46a4504f5 MINOR Fixed scope problems caused by separating out getTreeConfig() 2012-03-12 14:44:09 +01:00
Ingo Schommer
bac23bcdb7 BUGFIX Correctly set $BaseCSSClasses on LeftAndMain content container templates, not only on forms. Fixes $('.cms-menu') handling of "current id" updates (fixes #6997) 2012-03-12 14:05:54 +01:00
Ingo Schommer
8f8817b2f9 MINOR Always set X-ControllerURL in CMS responses, in order to fix menu state after Ajax HTTP redirects (e.g. from CMSPageAddController to CMSPageEditController) 2012-03-12 13:41:22 +01:00
Ingo Schommer
51ff4004d1 ENHANCEMENT Allowing ajax responses on CMS form submissions to "break out" of the form element they were triggered through, by looking for existence of ".cms-content" node in response 2012-03-12 13:30:17 +01:00
Ingo Schommer
e5ade1ba12 MINOR Making tree config overrideable 2012-03-12 11:40:08 +01:00
Ingo Schommer
849b26dad4 MINOR Added custom save indicator for constructive buttons (green background on animated gif) 2012-03-12 11:10:25 +01:00
Ingo Schommer
d8a5db4ea7 MINOR Padding for "parent mode" radio buttons on "add page" panel 2012-03-12 10:53:51 +01:00
Ingo Schommer
44515f51b6 MINOR Don't link tree root node in CMS views, its not editable any longer (replaced by more specialised views with CMSSettingsController and SecurityAdmin->EditForm()) 2012-03-12 10:42:07 +01:00
jbridson
7ece1d3e4f BUGFIX:fixed buttons in ie7/ie8 added missing background colour. 2012-03-12 10:01:01 +01:00
jbridson
b0573155ec BUGFIX:SSF-25 - fixed styling of model admin filter in ie7 and ie8 2012-03-12 10:00:47 +01:00
jbridson
99e376d0f5 ENHANCMENT: SSF-25 - fixed a couple of styling issues on the ModelAdmin Filter 2012-03-12 09:59:56 +01:00
Normann Lou
a73c8bcbf0 BUGFIX SSF-53 : apply a patch with fix chosen.js messed the width up if the select element is single select and having initial width as percentage 2012-03-12 09:50:19 +01:00
jbridson
97386413d6 BUGFIX:SSF-106 - removed border that appeared after click in ie7 and ie8 2012-03-12 09:36:57 +01:00
jbridson
4bea5949d1 BUGFIX:SSF-106 fixed overlapping edit and delete button on datagrid in ie7. 2012-03-12 09:36:41 +01:00
Normann Lou
18adfb0cff BUGFIX SSF-53 : avoid to use ":submit" pseudo class in a jQuery selector 2012-03-12 09:36:09 +01:00
jbridson
4a6116b562 MINOR:fixed use of $grid_x/y variables and documented 'magic' numbers 2012-03-12 09:35:38 +01:00
Normann Lou
aed91931a7 MINOR SSF-53 : code convention, use "-" instead of "_" for html class property value 2012-03-12 09:35:25 +01:00
Sam Minnee
d63efeb4a5 Revert "MINOR: Remove 2px margin from create button in New Member area" 
This reverts commit a5666d6d98.

Conflicts:

	admin/css/screen.css
 2012-03-12 12:06:43 +13:00
Sam Minnee
d94048c1a6 BUGFIX: Fixed back redirectBack() call in GroupImportForm::doImport (#6969) 2012-03-10 14:56:49 +13:00
Sam Minnée
603a984ad4 Merge pull request #236 from silverstripe-big-o/pull/SSF-25 
SSF-25: ModelAdmin
 2012-03-09 15:23:20 -08:00
Ingo Schommer
9e6d70be64 MINOR Moved LeftAndMain->doAdd() and AddForm() to subclasses where they're actually used (no possible through a combination of architectural and UI changes) 2012-03-10 00:04:51 +01:00
Ingo Schommer
bf6317d534 MINOR Removed unrelated styles from .cms-panel-padded class (which should just do what it says) 2012-03-09 22:26:00 +01:00
Ingo Schommer
67a032ce17 MINOR Fixed button loading indicator (fixes #6876) 2012-03-09 22:05:06 +01:00
Ingo Schommer
549ebec53b MINOR Fixed preview link ($CurrentPage stopped working at some point..) (fixes #6940) 2012-03-09 21:48:28 +01:00
Ingo Schommer
dd517c49ba ENHANCEMENT Allowing to override importer instances in ModelAdmin (fixes #2982) 2012-03-09 15:33:24 +01:00
Ingo Schommer
115ea86b0c MINOR Added support for preselected tabs in $('.ss-ui-tabs-nav') 2012-03-09 15:16:00 +01:00
Ingo Schommer
e12a3a4ab7 API CHANGE ModelAdmin uses GridField, DataList and new layout. Removed ModelAdmin_CollectionController, ModelAdmin_RecordController and related functionality. 
API CHANGE Removed ModelAdmin->ResultColumns()/ColumnSelectionField, selection of own fields no longer possible through the UI, to be replaced by a more generic GridField component
 2012-03-09 15:15:58 +01:00
Ingo Schommer
64db811d65 BUGFIX Convert pages from DataList to ArrayList in CMSBatchActionHandler to avoid problems on merge() 2012-03-09 09:28:20 +01:00
Sam Minnee
039ba665d4 Merge branch 'button_fixes' of https://github.com/ohararyan/sapphire into ohararyan-button_fixes 
Conflicts:
	admin/css/screen.css
 2012-03-09 17:51:41 +13:00
Sam Minnée
bad7c1a0d7 Merge pull request #232 from robert-h-curry/mysite-_config-apostrophes 
MINOR: Fix typographical errors.
 2012-03-08 20:49:32 -08:00
Ryan O'Hara
fb17f169d9 MINOR: Remove invalid changes to input.hasDatepicker 2012-03-09 17:08:26 +13:00
Ryan O'Hara
a5666d6d98 MINOR: Remove 2px margin from create button in New Member area 2012-03-09 17:03:48 +13:00
Robert Curry
d34dca675a MINOR: Fix typographical errors. 2012-03-09 17:00:25 +13:00
Sam Minnee
f51515b62a Merge branch 'master' of https://github.com/adrexia/sapphire into adrexia-master 
Conflicts:
	admin/css/screen.css
 2012-03-09 16:56:43 +13:00
Saophalkun Ponlu
c6d7301fab BUGFIX: Change to a page url segment doesn't get saved properly caused by 'disabled' attribute on the field, which is added by url segment suggestion function (ticket #6842) 2012-03-09 16:11:32 +13:00
Naomi Guyer
f048b7edf0 BUG FIX: Support for gradients in editor in IE9 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 15:04:26 +13:00
Sam Minnee
a071456837 Merge branch 'master' of github.com:silverstripe/sapphire 
Conflicts:
	tests/forms/gridfield/GridFieldDetailFormTest.php
	tests/forms/gridfield/GridFieldPopupFormsTest.yml
 2012-03-09 14:37:32 +13:00
Naomi Guyer
b7f5f91759 BUG FIX: Open new window for "Help" in CMS nav 
Signed-off-by: Naomi Guyer <adrexia@gmail.com>
 2012-03-09 14:07:12 +13:00
Russell Michell
5b4f83a567 BUGFIX: #6853 Necessary styles required to complement work on same-indexed commit in cms project 2012-03-09 13:20:27 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Sean Harvey
c59c717d78 API CHANGE Removed CustomRequiredFields, please use custom validation instead 
BUGFIX Ensure validators still used in ModelAdmin forms
 2012-03-09 12:45:18 +13:00
Sean Harvey
9f3344b355 API CHANGE Removed built-in behaviour.js client-side form validation. 
This is no longer supported. Please use custom client-side validation instead. (see 3.0.0 changelog
for more information)
 2012-03-09 12:19:57 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration' 
Conflicts:
	forms/gridfield/GridField.php
 2012-03-08 20:25:21 +01:00
Ingo Schommer
08c3e7edf3 MINOR More flexible form detection in LeftAndMain.Tree.js 2012-03-08 18:22:30 +01:00
Ingo Schommer
b836bce521 MINOR Fixed double form submit (in some cases button click events aren't cancelled despite returning FALSE) 2012-03-08 18:22:30 +01:00
Ingo Schommer
c117ef58cf API CHANGE Removed LeftAndMain->RootForm(), concept no longer applies in 3.0 UI. Use EmptyForm() or EditForm() 2012-03-08 18:22:30 +01:00
Ingo Schommer
174cf08c75 MINOR Removing special TinyMCE case in LeftAndMain->doAdd(), feature has been removed 2012-03-08 18:22:30 +01:00
Ingo Schommer
ee2b220780 MINOR Supporting X-ControllerURL in form submits 2012-03-08 18:22:30 +01:00
Ingo Schommer
9517763ec6 MINOR Fixed PHP notice in ModelAdmin 2012-03-08 15:18:11 +01:00
Normann Lou
5e92c69c0a BUGFIX SSF-25 : remove CreateForm, using the GridField 'Add New" action, instead 2012-03-08 20:29:19 +13:00
Normann Lou
2ea7c8d136 ENHANCEMENT SSF-25 : remove GridField filter component for search result in ModelAdmin 2012-03-08 20:29:19 +13:00
Normann Lou
d24c2ef1ed FEATURE SSF-25 : change to use GridField for showing searched results in stead of TableListField 2012-03-08 20:29:18 +13:00
jbridson
72101c254a MINOR:SSF-106 - fixed position of pagination on datagrid. 2012-03-08 17:21:26 +13:00
jbridson
3870ba4d0a MINOR:SSF-53 - changed height of icon on back button in users detail view. 2012-03-08 16:40:05 +13:00