2382 Commits

Author	SHA1	Message	Date
Damian Mooyman	66ef857cdf	Manual merge of #5412 into master	2016-05-18 17:42:13 +12:00
Damian Mooyman	303f695751	Merge 3.3 into 3 ... # Conflicts: # admin/javascript/LeftAndMain.EditForm.js	2016-05-18 17:29:30 +12:00
Damian Mooyman	829f59e443	BUG Fix link dialog box layout in CMS	2016-05-17 12:04:03 +12:00
Scott Hutchinson	9ba362065e	Fix loading icon bug on IE	2016-05-14 14:09:50 +12:00
Patrick Nelson	693408330b	FIX for #5410 to help focus errors occurring on tabs within GridField controlled DataObjects (et al). ... Tidy up Entwine logic for selecting tabs containing errors	2016-05-13 16:12:32 -07:00
Damian Mooyman	19daf8f974	Update translations	2016-05-12 15:37:09 +12:00
Hamish Friedlander	a61d0a2f0b	FIX Persistant Loading... indicator when no campaigns yet in admin	2016-05-12 13:32:38 +12:00
Ingo Schommer	0838770798	Consistent React event method naming ... Use "on<event>" for props, same as React's own event naming: https://facebook.github.io/react/docs/forms.html#interactive-props Use "handle<event>" to delineate internal handlers	2016-05-11 18:08:23 +12:00
Paul Clarke	c1204bc614	build js/css	2016-05-11 16:33:11 +12:00
Paul Clarke	746c4f7548	Vertically centre title only in breadcrumb ... Fixes #5508	2016-05-11 16:32:49 +12:00
Paul Clarke	25fead8afc	Reorder Campaigns in lefthand menu	2016-05-11 16:31:02 +12:00
Ingo Schommer	a736d9e08b	Merge pull request #5510 from open-sausages/pulls/4.0/5495-security-header-fix ... Markup and styles for back button outside of new toolbar	2016-05-11 16:07:17 +12:00
Damian Mooyman	f13e44a265	Merge 3 into master ... # Conflicts: # admin/javascript/LeftAndMain.Tree.js # admin/javascript/lang/cs.js # admin/javascript/lang/de.js # admin/javascript/lang/en.js # admin/javascript/lang/eo.js # admin/javascript/lang/es.js # admin/javascript/lang/fa_IR.js # admin/javascript/lang/fi.js # admin/javascript/lang/fr.js # admin/javascript/lang/id.js # admin/javascript/lang/id_ID.js # admin/javascript/lang/it.js # admin/javascript/lang/ja.js # admin/javascript/lang/lt.js # admin/javascript/lang/mi.js # admin/javascript/lang/nb.js # admin/javascript/lang/nl.js # admin/javascript/lang/pl.js # admin/javascript/lang/ro.js # admin/javascript/lang/ru.js # admin/javascript/lang/sk.js # admin/javascript/lang/sl.js # admin/javascript/lang/sr.js # admin/javascript/lang/sr@latin.js # admin/javascript/lang/sr_RS.js # admin/javascript/lang/sr_RS@latin.js # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/en.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # admin/javascript/lang/sv.js # admin/javascript/lang/zh.js # css/GridField.css # forms/gridfield/GridFieldExportButton.php # javascript/GridField.js # javascript/lang/ar.js # javascript/lang/cs.js # javascript/lang/de.js # javascript/lang/en.js # javascript/lang/en_GB.js # javascript/lang/eo.js # javascript/lang/es.js # javascript/lang/fi.js # javascript/lang/fr.js # javascript/lang/id.js # javascript/lang/id_ID.js # javascript/lang/it.js # javascript/lang/ja.js # javascript/lang/lt.js # javascript/lang/mi.js # javascript/lang/nb.js # javascript/lang/nl.js # javascript/lang/pl.js # javascript/lang/ru.js # javascript/lang/sk.js # javascript/lang/sl.js # javascript/lang/sr.js # javascript/lang/sr@latin.js # javascript/lang/sr_RS.js # javascript/lang/sr_RS@latin.js # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fi.js # javascript/lang/src/fr.js # javascript/lang/src/id.js # javascript/lang/src/id_ID.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr@latin.js # javascript/lang/src/sr_RS.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js # javascript/lang/sv.js # javascript/lang/zh.js # scss/GridField.scss # tests/model/ManyManyListTest.php # tests/model/SQLQueryTest.php	2016-05-11 15:19:35 +12:00
Paul Clarke	7093224db3	Markup and styles for back button outside of new toolbar ... Adjust height of north bar to match rest of CMS plus minor positioning fixes.	2016-05-11 14:39:47 +12:00
Damian Mooyman	4f06a43986	Merge 3.3 into 3 ... # Conflicts: # admin/javascript/lang/src/cs.js # admin/javascript/lang/src/de.js # admin/javascript/lang/src/en.js # admin/javascript/lang/src/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fi.js # admin/javascript/lang/src/fr.js # admin/javascript/lang/src/id.js # admin/javascript/lang/src/id_ID.js # admin/javascript/lang/src/it.js # admin/javascript/lang/src/ja.js # admin/javascript/lang/src/lt.js # admin/javascript/lang/src/mi.js # admin/javascript/lang/src/nb.js # admin/javascript/lang/src/nl.js # admin/javascript/lang/src/pl.js # admin/javascript/lang/src/ro.js # admin/javascript/lang/src/ru.js # admin/javascript/lang/src/sk.js # admin/javascript/lang/src/sl.js # admin/javascript/lang/src/sr.js # admin/javascript/lang/src/sr@latin.js # admin/javascript/lang/src/sr_RS.js # admin/javascript/lang/src/sr_RS@latin.js # admin/javascript/lang/src/sv.js # admin/javascript/lang/src/zh.js # javascript/lang/fr.js # javascript/lang/src/ar.js # javascript/lang/src/cs.js # javascript/lang/src/de.js # javascript/lang/src/en.js # javascript/lang/src/eo.js # javascript/lang/src/es.js # javascript/lang/src/fi.js # javascript/lang/src/fr.js # javascript/lang/src/id.js # javascript/lang/src/id_ID.js # javascript/lang/src/it.js # javascript/lang/src/ja.js # javascript/lang/src/lt.js # javascript/lang/src/mi.js # javascript/lang/src/nb.js # javascript/lang/src/nl.js # javascript/lang/src/pl.js # javascript/lang/src/ru.js # javascript/lang/src/sk.js # javascript/lang/src/sl.js # javascript/lang/src/sr.js # javascript/lang/src/sr@latin.js # javascript/lang/src/sr_RS.js # javascript/lang/src/sr_RS@latin.js # javascript/lang/src/sv.js # javascript/lang/src/zh.js # lang/it.yml	2016-05-11 14:06:23 +12:00
Damian Mooyman	f4c2a89d5a	Update translations	2016-05-11 11:05:57 +12:00
Damian Mooyman	c27cb2dae7	Update translations	2016-05-11 11:05:37 +12:00
Damian Mooyman	60644a5be8	Update translations	2016-05-11 10:58:25 +12:00
Paul Clarke	1f4bdb2d8f	Remove the small space above menu to align with content area	2016-05-10 22:22:49 +12:00
Paul Clarke	79d1a0542d	Spacing above forms and of labels and middle column within forms	2016-05-10 22:20:00 +12:00
Paul Clarke	f64de9b667	Move accordion item up slightly	2016-05-10 22:20:00 +12:00
Paul Clarke	25f118657e	Slight adjustment to make sure icons don't effect text	2016-05-10 22:20:00 +12:00
Paul Clarke	f0d6f6b04e	Remove verdana (ui-widget) overrides	2016-05-10 22:19:31 +12:00
Paul Clarke	e0a7c4fb47	Move the back arrow back slightly for visual alignment	2016-05-10 22:19:31 +12:00
Damian Mooyman	7f03b88e5e	API Add empty campaign layout	2016-05-10 17:34:32 +12:00
Paul Clarke	0321d0868e	Added btn--icon-xl for use within assetAdmin	2016-05-10 16:34:13 +12:00
Paul Clarke	100deada75	Updated markup on Campaign edit and add screen to use newer patterns. ... Moved role=group up a level as it broke layout.	2016-05-10 16:33:21 +12:00
Paul Clarke	75faa0de9f	Reduce spacing between buttons, fix for large icons	2016-05-10 16:27:26 +12:00
Paul Clarke	d8a13233e6	Removed menu line-height overrides ... Now that bootstrap is in line-height isn’t needed here	2016-05-10 16:27:26 +12:00
Paul Clarke	e16d3ec963	Added space to top of assetAdmin sort	2016-05-10 16:27:26 +12:00
Paul Clarke	26b84ab488	Update spacing to be consistent throughout ... Uses bootstrap $gutters rather than $spacer even though they are based of the same value. Improves alignment of a few things but mostly unnoticeable.	2016-05-10 16:27:26 +12:00
Damian Mooyman	9588f0c999	Remove redux from breadcrumbs and fix breadcrumbs lazy loading	2016-05-10 15:34:54 +12:00
Ingo Schommer	c9e7d4fb81	Unnest breadcrumbs	2016-05-10 13:34:45 +12:00
Damian Mooyman	3edbfd944e	API Implement breadcrumbs via controllable state	2016-05-10 13:34:34 +12:00
Ingo Schommer	d9f0914e4f	Use props.extraClass on TextField holder ... This should be separated out to a common FormField class, but for now we're only using TextField. Can be solved properly at the same time as switching form fields to react-bootstrap. Required for readonly field value alignment in the "campaigns" edit form.	2016-05-10 10:45:12 +12:00
Daniel Hensby	1fcf3a1315	Merge pull request #5485 from open-sausages/pulls/4.0/grid-field-tmp-loading-indicator ... Simple GridField ReactJS loading indication	2016-05-09 16:21:44 +01:00
Ingo Schommer	2610010d52	Load form data back into obj after save() (fixes #5484)	2016-05-09 22:55:43 +12:00
Ingo Schommer	eab90bc82e	Simple GridField ReactJS loading indication ... Better than no feedback at all while campaigns are loading. Not using spinner.gif because a loading animation is already presented when the section is loaded (via PJAX). Not translating the "Loading..." text because its temporary.	2016-05-09 22:35:51 +12:00
Ingo Schommer	984d7c1cf6	Don't use Object.freeze on functions (fixes #5473) ... We're not using it for any other props passed to ReactJS components, so there's no reason to do it here. Props are immutable by convention. While it would be nice to enforce this, its too common to pass through function objects which aren't supported by IE's Object.freeze(). IE isn't following the spec on how to handle Object.freeze(function() {}). See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/freeze#Notes > In ES6, a non-object argument will be treated as if it was a frozen ordinary object, simply return it. MS docs on https://msdn.microsoft.com/en-us/subscriptions/downloads/ff806186(v=vs.94).aspx > If the object argument is not an object, a TypeError exception is thrown.	2016-05-09 21:19:43 +12:00
Damian Mooyman	8b94dd83df	API Add CSRF to Campaign delete	2016-05-09 17:33:10 +12:00
Damian Mooyman	79a76c52c5	Merge pull request #5476 from open-sausages/pulls/4.0/5355-checkboxes-bootstrap-conflict ... Checkbox layout, including settings tab bugs. Fixes #5355	2016-05-09 16:31:15 +12:00
Hamish Friedlander	b2786c228b	FIX add_i18n_javascript calls not being updated after JS move ... This fixes alert / confirm boxes that were popping up without text (for example silverstripe-cms/issues/1476), although ideally we wouldn't show empty dialog boxes on this sort of error - we'd have some default, or a way to detect the issue.	2016-05-09 15:41:24 +12:00
Paul Clarke	142fcb2a27	Checkbox layout, including settings tab bugs. Fixes #5355	2016-05-09 15:09:23 +12:00
Paul Clarke	c5d0d0bb99	Build	2016-05-09 12:53:02 +12:00
Paul Clarke	f1ea820ab1	Steps styles fix	2016-05-09 12:52:02 +12:00
Paul Clarke	83d70c4414	Fixes font used for add page steps and alignment	2016-05-09 12:51:35 +12:00
Paul Clarke	261ca9378e	Fixes campaign thumbnail left alignment issue	2016-05-09 12:51:35 +12:00
Paul Clarke	2681b81d29	Swapped a few btn classes for updated ones	2016-05-09 12:36:14 +12:00
Daniel Hensby	459fb4ec80	Merge pull request #5465 from frankmullenger/4917-renaming ... MINOR: Renaming classes with 'Html' camel cased.	2016-05-07 10:30:57 +01:00
Ingo Schommer	0b295137c2	Fix unguarded JS check in LeftAndMain.Preview.js	2016-05-06 14:42:20 +12:00
Frank Mullenger	b4cd617ee3	FIX: Renaming to HTMLEditorConfig. ... FIX: Renaming to HTMLEditorField*. FIX: Renaming to HTMLEditorSanitiser*.	2016-05-06 14:16:34 +12:00
Ingo Schommer	c251fab9af	Fixed more SCSSLint errors, disabled some files ... The mixins and compasscompat will probably be replaced in time, and install.scss is quite low priority to fix (same treatment as legacy/* styles)	2016-05-06 08:02:38 +12:00
Daniel Hensby	840cd4f877	Update translations	2016-05-05 12:46:38 +01:00
Daniel Hensby	d1751e3310	Merge remote-tracking branch '3.2.4' into 3.3.2	2016-05-05 12:33:21 +01:00
Daniel Hensby	cf29b2c146	Merge remote-tracking branch '3.1.19' into 3.2.4	2016-05-05 11:17:45 +01:00
Paul Clarke	e81e99fb0d	improved variable comments	2016-05-05 18:52:42 +12:00
Paul Clarke	b87d0a3e3c	removed path to framework in framework variables, added to assetAdmin	2016-05-05 18:26:27 +12:00
Paul Clarke	22f26d10a8	moved assetadmin variables into framework	2016-05-05 17:19:05 +12:00
Daniel Hensby	e8cfe1cc72	Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19	2016-05-05 01:01:37 +01:00
Daniel Hensby	47c3165aa3	Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19	2016-05-05 01:01:15 +01:00
Daniel Hensby	457931d664	Merge branch '3.3' into 3	2016-05-04 23:32:10 +01:00
Damian Mooyman	8b1146be9a	API Implement campaign item edit button	2016-05-05 10:24:08 +12:00
Daniel Hensby	32f0a637b4	Merge branch '3.2' into 3.3	2016-05-04 23:17:36 +01:00
Daniel Hensby	0884683c6b	Merge branch '3.1' into 3.2	2016-05-04 23:15:43 +01:00
Paul	e04fb5b986	Fixes missing actions on responsive gridfield, cleanup indentation (#5446)	2016-05-04 20:21:11 +12:00
Paul	4b8e98b351	fix for scss linting issues in new scss (#5448)	2016-05-04 20:14:56 +12:00
Damian Mooyman	f88d708ee9	BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton ... Based on https://github.com/silverstripe/silverstripe-framework/pull/5426 Fixes #5267	2016-05-03 17:45:46 +12:00
Ingo Schommer	3abd2f7119	Updated dist files	2016-05-03 16:17:36 +12:00
Paul Clarke	cd9a5dbbe9	created placeholder ListGroup.js, not currently used	2016-05-03 16:17:36 +12:00
Paul Clarke	7895e21d51	hide campaign links for alpha1	2016-05-03 16:17:36 +12:00
Paul Clarke	c7eca59a8a	Refactored class names, split out campaign specific elements, hide campaign links	2016-05-03 16:17:28 +12:00
Paul Clarke	6d1a14de9c	delete unused file, swap class for bootstrap list-group-item-heading class	2016-05-03 16:04:48 +12:00
Paul Clarke	4e67a913d6	Move label style out of component, remove legacy overrides	2016-05-03 16:04:48 +12:00
Paul Clarke	22617cd9b2	Improves readability slightly	2016-05-03 16:04:48 +12:00
Paul Clarke	bcbb0fcc5c	rename class for better reusability and refactor	2016-05-03 16:04:47 +12:00
Paul Clarke	5b2d910aeb	Form action styles update ... Doesn’t conform to BEM. Need to update places btn-success is being used and replace with btn-primary, but the differences shouldn’t be too noticeable.	2016-05-03 16:04:47 +12:00
Paul Clarke	3be4e80711	Restructure accordion so list items are in their own component ... Accordion styles to get more BEM	2016-05-03 16:04:42 +12:00
Paul	a7f5ef7b95	Removed More Options action and popover from template (#5435)	2016-05-03 15:30:41 +12:00
Damian Mooyman	6948267c41	API LeftAndMain::menu_title can be overridden (#5423)	2016-05-02 20:57:43 +12:00
Damian Mooyman	a38eb8b784	Fix incorrect logic check	2016-05-02 18:15:39 +12:00
Paul Clarke	1506f83ef5	focus adjustments to items so selected item isn't blury	2016-05-02 15:27:12 +12:00
Damian Mooyman	72fcfbf4bc	API Campaign preview for images	2016-05-02 15:27:12 +12:00
Damian Mooyman	4be5e7c961	API Implement basic preview behaviour	2016-05-02 15:27:12 +12:00
Damian Mooyman	e7cd864ebc	Merge branch 'master'	2016-05-02 10:38:08 +12:00
Paul	9238bc5778	Added class to actions cell to reduce space (#5404)	2016-05-02 08:53:53 +12:00
Damian Mooyman	8d2f063f0c	Fix eslint errors (#5411)	2016-05-02 08:51:31 +12:00
Paul	2e056dd98b	media query to use mixin (#5402)	2016-05-02 08:50:29 +12:00
Damian Mooyman	d52db0ba34	Merge 3 into master ... # Conflicts: # .travis.yml # admin/css/ie7.css # admin/css/ie7.css.map # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/javascript/LeftAndMain.js # admin/scss/_style.scss # admin/scss/_uitheme.scss # control/HTTPRequest.php # core/Object.php # css/AssetUploadField.css # css/AssetUploadField.css.map # css/ConfirmedPasswordField.css.map # css/Form.css.map # css/GridField.css.map # css/TreeDropdownField.css.map # css/UploadField.css # css/UploadField.css.map # css/debug.css.map # dev/Debug.php # docs/en/00_Getting_Started/00_Server_Requirements.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Extend_CMS_Interface.md # filesystem/File.php # filesystem/Folder.php # filesystem/GD.php # filesystem/Upload.php # forms/ToggleField.php # forms/Validator.php # javascript/lang/en_GB.js # javascript/lang/fr.js # javascript/lang/src/en.js # javascript/lang/src/fr.js # model/Image.php # model/UnsavedRelationList.php # model/Versioned.php # model/connect/MySQLDatabase.php # model/fieldtypes/DBField.php # model/fieldtypes/Enum.php # scss/AssetUploadField.scss # scss/UploadField.scss # templates/email/ChangePasswordEmail.ss # templates/forms/DropdownField.ss # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php # tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php # tests/forms/EnumFieldTest.php # tests/security/MemberTest.php # tests/security/MemberTest.yml # tests/security/SecurityTest.php	2016-04-29 17:50:55 +12:00
Paul Clarke	acb1b46a46	Add back button for smaller screens	2016-04-27 14:09:57 +12:00
Paul	fc8d94d789	Fix for toolbar-south width (#5391)	2016-04-26 17:41:07 +12:00
Ingo Schommer	5d26035a51	Update build artifacts	2016-04-26 15:34:11 +12:00
Paul Clarke	bbf74bdca9	Minor adjustments to align header, removed cancel icon and give space to main actions	2016-04-26 15:32:10 +12:00
David Craig	778ed1257d	Fix campaign section cancel buttons ... - Cancel buttons we submitting forms. - Nothing happened when clicking the DeatilEdit cancel button. Now both cancel button route to the Campaign index view	2016-04-26 15:32:10 +12:00
David Craig	8af1ad09d0	Add loading indicator to save button on scaffolded forms	2016-04-26 15:32:10 +12:00
Ingo Schommer	576e916504	Don't group form buttons by default ... Looks weird with a "save" and "cancel" button for example	2016-04-26 15:32:10 +12:00
Ingo Schommer	b0d4283c17	Allow form action props override in FormBuilder ... Also added bootstrapButtonStyle defaults	2016-04-26 15:32:10 +12:00
Paul Clarke	78a385c16a	Update no-text class to BEM	2016-04-26 15:32:10 +12:00
Paul Clarke	ec99452ce1	Toolbar renaming from north-header and move styles to component	2016-04-26 15:32:10 +12:00
David Craig	0b9a339b79	Make 'form' state key singular rather than plural	2016-04-26 15:32:10 +12:00
David Craig	25f1f992a9	Made FormBuilder.mergeFieldData do deep merge	2016-04-26 15:32:09 +12:00
David Craig	7e7946e50a	Fixed case sensitive naming regressions	2016-04-26 15:32:09 +12:00
Ingo Schommer	c94802ea15	i18n for campaigns section	2016-04-26 15:32:09 +12:00
Ingo Schommer	a615dae3ac	Enforce permissions in campaigns section	2016-04-26 15:32:09 +12:00
David Craig	312bab8a6f	Add back button to Campaign creation view	2016-04-26 15:32:09 +12:00
David Craig	35ad44b8c8	Refactor GridFieldComponent render method ... - Splits render out into logical methods - Fixes missing key props issue for table header palceholder	2016-04-26 15:32:09 +12:00
David Craig	2f7a7c3a5c	Fix GridFieldComponent not rendering all records	2016-04-26 15:32:09 +12:00
Damian Mooyman	b2e8fd96ec	BUG Fix form schema to use correct ID values ... API Implement creation of new changesets endpoint	2016-04-26 15:32:08 +12:00
David Craig	2b8ef99d5e	Add 'Cancel' button to Campaign creation form	2016-04-26 15:32:08 +12:00
David Craig	5cc6171f77	Apply default action props in FormBuilder ... Perviously consumers had to props to FormBuilder for styling common actions like 'save'. The props are now automatically passed to FormActions by the FormBuilder. Consumers can override these defaults via the 'createFn' prop.	2016-04-26 15:32:08 +12:00
David Craig	ae285f3286	Adds route for creating new Campaigns	2016-04-26 15:32:08 +12:00
Ingo Schommer	48d01343c3	Adapt to new naming convention	2016-04-26 15:32:08 +12:00
David Craig	a15a392bd3	Styling updates for the Campaign edit form	2016-04-26 15:32:08 +12:00
David Craig	1ad6730b9e	Add form component styling	2016-04-26 15:32:08 +12:00
David Craig	58036cd156	Add back button to NorthHeader component	2016-04-26 15:32:08 +12:00
David Craig	a8056aedff	Add response handling when editing a Campaign	2016-04-26 15:32:08 +12:00
Damian Mooyman	e2afcd0acb	API Implement back end for saving forms via react	2016-04-26 15:32:08 +12:00
David Craig	7fcdf35438	Add DetailEditForm to Campaign admin ... - Add edit form to campaigns section - Handle form submissions with FormBuilder - Handle form state via Redux - Garbage collect form state - Removes $itemID as a required param for schema requests. Developers should be able to scaffold forms without populating values from an existing record. For example when building a form for creating new records.	2016-04-26 15:32:07 +12:00
scott1702	97e672721d	Add AddToCampaign dialog box functionality	2016-04-26 13:33:06 +12:00
Daniel Hensby	679185514d	Merge 3.3 into 3 ... Conflicts: admin/css/screen.css.map	2016-04-26 00:24:59 +01:00
Daniel Hensby	745faebd81	Merge 3.2 into 3.3 ... Conflicts: .travis.yml	2016-04-26 00:17:09 +01:00
Daniel Hensby	a0812f987a	Merge 3.1 into 3.2 ... Conflicts: admin/javascript/LeftAndMain.js control/HTTPRequest.php docs/en/00_Getting_Started/00_Server_Requirements.md	2016-04-26 00:09:33 +01:00
Damian Mooyman	9a4b93a058	BUG Fix baseurl in IE missing leading / ... Reformat LeftAndMain.js to new indentation standard	2016-04-25 22:31:11 +12:00
Ingo Schommer	21db18e7ef	Correct naming for JS and CSS files in client/ ... Removed some dist/js/*.js files since they're no longer built as individual files. This was a side effect of them living in the toplevel folder of admin/client/src/, which used to have all the legacy/*.js files in there (they do need to be built). Following AirBnB convention: https://github.com/airbnb/javascript#naming--filename-matches-export While it technically allows index.js files, we found them to be bad for dev and debugging in practice: Depending on the used IDE, editor tabs all look the same. Other views like Chrome Dev Tools with sourcemaps rely on path context, and are harder to auto-complete. There's no direct rules for CSS files, but same principles apply here. Also renamed the sections/ folder to containers/, which more clearly communicates the distinction between components/ (shouldn't contain state-dependant, smart components). Renamed state/ files to follow AirBnB naming conventions https://github.com/airbnb/javascript#naming--filename-matches-export https://github.com/airbnb/javascript#naming--camelCase-default-export https://github.com/airbnb/javascript#naming--PascalCase-singleton Leaving the folder name in state/<state-key> lowercase since that's also the key to reducers in the actual state object. References: http://engineering.kapost.com/2016/01/organizing-large-react-applications/ https://github.com/erikras/react-redux-universal-hot-example/tree/master/src https://github.com/RickWong/react-isomorphic-starterkit/tree/master/src https://github.com/react-toolbox/react-toolbox/issues/98 https://github.com/react-bootstrap/react-bootstrap/tree/master/src	2016-04-25 15:43:19 +12:00
Ingo Schommer	c66a45c8b8	Fixed GridField JS test warnings	2016-04-25 14:58:26 +12:00
Daniel Hensby	fde6376996	FIX Admin bloacklisted messages using correct $.inArray check	2016-04-24 08:57:45 +01:00
Damian Mooyman	098f199d67	Merge pull request #5366 from open-sausages/pulls/4.0/fix-asset-admin-icon ... Fix AssetAdmin icon reference	2016-04-22 15:50:14 +12:00
Damian Mooyman	0ed353a3df	Reformat code	2016-04-22 14:05:55 +12:00
Ingo Schommer	8c63ae3d68	Fix AssetAdmin icon reference ... Needs to use namespaced class name (see LeftAndMain->Menu()). Not replacing the old .icon-assetadmin rule since we want the old and new UI to co-exist for a short while. Ideally we'd move these styles to the asset-admin module, but the whole way of referencing image sprites is outdated anyway - so I'd prefer to merge this quick fix and think about SVG icons for menu entries instead.	2016-04-22 13:57:10 +12:00
Damian Mooyman	e463fcce6e	API redux-logger respects ss environment	2016-04-22 13:20:24 +12:00
Ingo Schommer	9331b4095a	Merge pull request #5373 from open-sausages/pulls/4.0/fix-routing-reredux ... BUG Fix routing tests	2016-04-22 13:15:48 +12:00
Damian Mooyman	fa8075367d	BUG Fix routing tests ... BUG Fix issue with top level routes without trailing slashes	2016-04-22 11:16:48 +12:00
David Craig	d376944d48	Fix regression with font-icon styles	2016-04-22 10:43:06 +12:00
Paul Clarke	3a778f23bf	Build and compile	2016-04-21 15:41:30 +12:00
Paul Clarke	01145301fa	Delete unwanted stylesheets and move remainder styles to better location	2016-04-21 15:39:58 +12:00
Paul Clarke	35e062d9f3	Update SilverStripe font icons ... Added new icons Updated license moved location of font styles	2016-04-21 15:39:06 +12:00
Ingo Schommer	3594fa79c7	Include components/label in build	2016-04-21 11:19:30 +12:00
Paul Clarke	95e4415288	Fix for IE, added ability to adjust panel height based on the amount of toolbars	2016-04-21 11:19:30 +12:00
Paul Clarke	35a2e13085	Added modifier for img --fits-space, will need to use js to detect so styles can be adapted	2016-04-21 11:19:30 +12:00
Paul Clarke	9b5430a80c	Use bootstrap mixing text-truncate instead of custom styles	2016-04-21 11:19:29 +12:00
Paul Clarke	02bb158a27	Removed old typography, minor updates and rebase regressions	2016-04-21 11:19:20 +12:00
Paul Clarke	a7e5da8228	Fix for height	2016-04-21 11:03:45 +12:00
Paul Clarke	cc7170d424	improved consistency of toolbars included in preview and other areas of cms	2016-04-21 11:03:45 +12:00
Paul Clarke	6cd5bf2f3f	Preview panel as its own component, file preview styles, no preview message. ... Improved layout reusability Moved layout styles to its own stylesheet Added scrollable panels	2016-04-21 11:03:42 +12:00
Daniel Hensby	a24c8260b1	[SS-2016-004] FIX Store current page IDs as ints	2016-04-20 23:55:59 +01:00
Damian Mooyman	dbd17bd49a	API Remove routing from silverstripe-component ... BUG Fix page routing in subdirectory BUG Fix top level admin sections not causing ajax load	2016-04-21 08:43:03 +12:00
Paul Clarke	978369bd63	Update old cms toolbars and menu to use new variables and heights so everything lines up ... Includes fixes for menu borders and preview border	2016-04-21 08:28:12 +12:00
Paul Clarke	0d1d8c5888	Remove text-decoration on focus for campaign items	2016-04-21 08:24:41 +12:00
Ingo Schommer	19de22f427	API Moved frontend assets into admin/client/ ... admin/javascript => admin/client admin/javascript/src => admin/client/src/legacy (mostly) admin/scss/_variables.scss => admin/client/styles/_variables.scss admin/scss => admin/client/styles/legacy/ admin/css/editor.css => admin/client/dist/css/editor.css admin/css/screen.css => admin/client/dist/css/bundle.css admin/images => admin/client/dist/images admin/images/sprites/src => admin/client/src/sprites admin/images/sprites/dist => admin/client/dist/sprites admin/font => admin/client/dist/font	2016-04-20 21:13:10 +12:00
Ingo Schommer	cb7b2b09a8	Don't generate separate bootstrap.css files ... We only need them in the main.css build file. The bootstrap.scss already includes reboot and grid. We're not using flex (yet), and can be built alongside main.css as well. Reordered includes to ensure they bootstrap reboot gets included early.	2016-04-20 21:13:09 +12:00
Ingo Schommer	32dbd1d2b5	Consolidated style locations	2016-04-20 21:13:08 +12:00
Ingo Schommer	c5a20ab5fc	Restructure main SCSS includes ... Makes more sense to go from generic to specific	2016-04-20 21:13:08 +12:00
Ingo Schommer	55d7e78875	Removed unused "grayscale" theme ... Was never in active use, and has outdated variables	2016-04-20 21:13:08 +12:00
Ingo Schommer	dbf90b5e64	Removed _ieShared.scss ... Already removed usage in 429682e, but forgot to remove the underlying file. Did a sanity check in IE10 on the areas addressed in this stylesheet, and they look fine.	2016-04-20 21:13:08 +12:00
John Milmine	66ed97e08e	fix to grid field loading wrong current page id when using multiple tabs	2016-04-19 21:38:32 +12:00
Paul Clarke	d9519983f8	build js	2016-04-19 15:07:06 +12:00
Paul Clarke	4d9e38c62b	toolbar improvements	2016-04-19 15:01:38 +12:00
Paul Clarke	47ca889567	bugfix for Add campaign button spacing	2016-04-19 14:22:50 +12:00
Ingo Schommer	6ccfbb7c52	Fixed breadcrumbs test	2016-04-19 13:40:57 +12:00
Ingo Schommer	7c126a80b6	Whitespaces fixes in _variables.scss ... No point aligning the values when they're all over the show from commenting and mixed indentation	2016-04-19 13:40:57 +12:00
Ingo Schommer	e939452129	Update build artifacts	2016-04-19 12:15:14 +12:00
Paul Clarke	7f59a7e6f7	Converted grid-field to table markup and SCSS to BEM ... Also added tab index	2016-04-19 12:15:09 +12:00
Ingo Schommer	ca77dd2657	Updated build artifacts	2016-04-19 11:13:57 +12:00
Paul Clarke	cc897d0f85	fix for add page steps and 1px out in southbar	2016-04-19 11:13:56 +12:00
Paul Clarke	82207f82be	Added panel close btn	2016-04-19 11:13:56 +12:00
Paul Clarke	e0fe90b3c8	General CMS typography swap to bootstrap ... Start of using bootstrap variables and typography styles, remove old cms reset in favour of bootstrap reboot	2016-04-19 11:13:53 +12:00
Paul Clarke	74454a7557	CMS layout changes ... Panel adjustments to south and site tree collapsed so that everything aligns. Start of bootstrap tab styles Fix for pages batch action alignment issue	2016-04-19 11:13:53 +12:00
Paul Clarke	6a53fe0fb7	small improvement to success button	2016-04-19 11:13:53 +12:00
Daniel Hensby	3c0f2e8e11	[SS-2015-029] FIX Add CSFR protection to tree reorganise	2016-04-19 00:01:04 +01:00
Ingo Schommer	bf37899045	Removed IE CSS files ... Leftover from https://github.com/silverstripe/silverstripe-framework/pull/5293	2016-04-19 09:16:21 +12:00
Ingo Schommer	b2516ae7d0	Updated build artifacts	2016-04-18 23:45:24 +12:00
Ingo Schommer	75b2c7c360	BEM notation corrections, use Bootstrap vars ... See comments on https://github.com/silverstripe/silverstripe-framework/pull/5317	2016-04-18 23:45:14 +12:00
Ingo Schommer	3c8960d88b	Simplified breadcrumb component ... The "multiline" variation was the only one actually used at the moment. If we need a "singleline" one, we could make a "condensed" variation instead	2016-04-18 23:35:55 +12:00
Paul Clarke	40c98c6047	CSS updates to Campaign Admin ... refactored breadcrumbs to use bootstrap fix border lines on table Layout variables updated for spacing, added toolbar heights Added as part of campaigns as this area needs to use these variables. Added action toolbar for content, swapped values to variables toolbar action spacing Adjustments of breadcrumb variable Move accordion styles to its own component Campaign items, styles for linked items and state badges Small update to class name Class name updates, convert values into variables	2016-04-18 23:35:31 +12:00
Damian Mooyman	68ffa40c69	Use configured SecurityToken	2016-04-18 14:03:53 +12:00
Ingo Schommer	c967e62e97	Updated build artifacts	2016-04-18 14:03:53 +12:00
Ingo Schommer	90e352ca7d	Fix "urlencoded" HTTP header notation ... Misspelling caused data to be sent as binary (browser default?) rather than urlencoded, meaning it doesn't show up in $_POST.	2016-04-18 13:59:18 +12:00
Ingo Schommer	e840ba805e	Use SecurityID in destructive campaign actions ... Using POST rather than PUT because SecurityToken->checkRequest() doesn't accept PUT data (it's only in the request body, not in $_POST and HTTPRequest->requestVars()).	2016-04-18 13:59:18 +12:00
Ingo Schommer	572d8427e0	Implement defaultData on silverstripe-backend	2016-04-18 13:59:18 +12:00
David Craig	ef6a1f33ee	Minor updates and fixes for campaign admin front-end ... - Updated FormActionComponent prop from 'style' to 'bootstrapButtonStyle because 'style' is a built in React prop. - Linted and added missing propTypes to campaign admin List component. - Added missing initial state key to campaign reducer. - Forced REST verb to lowercase in silverstripe-backend to make comparisions more robust.	2016-04-18 13:59:18 +12:00
Paul Clarke	d51e94c035	Added icons to publish and revert buttons	2016-04-18 13:59:18 +12:00
Ingo Schommer	8554b43ccc	Correct campaign badges, "revert" placeholder button	2016-04-18 13:59:18 +12:00
Ingo Schommer	37d3d22fbd	Publish loading indicator	2016-04-18 13:59:18 +12:00
Ingo Schommer	aefc1a5c01	Use keyed redux record store ... It's the recommended approach in Redux docs, and more performant (key-based). It'll also simplify a move to Immutable.js later on. The PHP APIs still return unkeyed data, which is standard REST API behaviour, but for Redux state we transform it to be keyed.	2016-04-18 13:59:18 +12:00
Ingo Schommer	f7237a9936	Fix <FormAction> external and prop definition ... click handler shouldn't be required	2016-04-18 13:59:18 +12:00
Ingo Schommer	107e38b7a7	Campaign publish feature	2016-04-18 13:59:18 +12:00
Ingo Schommer	067c64e07c	Add babel-polyfill for better ES6 support ... See http://babeljs.io/docs/usage/polyfill/	2016-04-18 12:08:35 +12:00
Damian Mooyman	f70cb08229	Improve i18n on campaigns section	2016-04-14 12:23:21 +12:00
Ingo Schommer	5d29d30118	Fixed silverstripe-backend GET use regression ... fetch() doesn't allow a HTTP body for GET, which is fair enough. This means we need to dynamically combine arguments based on HTTP verb.	2016-04-14 12:05:40 +12:00
Damian Mooyman	484680a2d5	Update artifacts	2016-04-14 12:04:50 +12:00
Damian Mooyman	5900893753	API Implement campaign list view	2016-04-14 12:02:59 +12:00
Damian Mooyman	05973cee55	API Add i18n pluralisation	2016-04-14 12:01:42 +12:00
Hamish Friedlander	2983dd58ff	Fix admin area after upgrade to Chosen 1.5	2016-04-14 10:47:15 +12:00
Hamish Friedlander	31247a67bd	API Replace baked-in and modified Chosen 0.9.8 with npm'ed in Chosen 1.5.1	2016-04-14 10:45:39 +12:00
Daniel Hensby	36283b86d5	FIX Stop "success" message showing in CMS ... fixes #5281	2016-04-12 16:14:31 +01:00
Ingo Schommer	6e0ef669be	payloadSchema support in createEndpointFetcher() ... Required for REST URLs which require data to be populated on call. For example, PUT admin/campaigns/set/:id/publish to publish a campaign. At the time when createEndpointFetcher() is called, the ":id" parameter can not be resolved, since the "data" argument is passed in once the returned function is evaluated (since the component using it). Since the whole idea of createEndpointFetcher() is that components shouldn't know about the backend internals, its not the right place to interpolate urls. I'm sending through any payload data in addition to replacing URLs, to keep the API simple for the component. Again, it shouldn't worry about the presence URL interpolation. The trade off here is that data will be submitted both in the payload (in case of a POST, PUT or DELETE request), as well as (optionally) in the URL.	2016-04-12 22:03:43 +12:00
Sam Minnee	8c469899d0	MINOR: Fix linting errors in tests. ... Tests were previously excluded from eslint calls. This leads to messier code inside tests, and potentially errors. Now they all meet the listing rules, and so we don’t need to ignore tests in .eslintignore.	2016-04-12 16:50:06 +12:00
Sam Minnee	b088efc6f9	MINOR: Test for backend.createEndpointFetcher()	2016-04-12 12:15:37 +12:00
Sam Minnee	21a1065329	NEW: Add createEndpointFetcher to backend ... SilverStripeBackend now has a createEndpointFetcher method, described in its docblock in more detail. It’s based the asset-admin code for apiCallerFromEndpoint(). It’s refactored and generalised into framework in order to provide a general-purpose API for tying Javascript components to backend APIs. @todo: tests	2016-04-11 21:43:21 +12:00
Ingo Schommer	429682e626	Remove <IE10 specific workarounds ... We no longer support IE browsers older than IE10	2016-04-11 14:50:00 +12:00
Ingo Schommer	ce8ac58ddb	Fix React DOM warnings about <form> attrs ... "class" is a reserved word in JS, hence React uses "className". "encType" has to be camel cased correctly, see https://facebook.github.io/react/docs/tags-and-attributes.html#html-attributes Also marked less attrs on <form> as required	2016-04-11 09:16:32 +12:00
Sam Minnee	a17c5cb148	NEW: Expose silverstripe-backend for modules to access. ... FIX: Ensure post has correct content-type header. Exporting silverstripe-backend lets other modules (such as asset-admin) use it. In addition, the Content-type header of a post request of URL-encoded data was being set to text/plain by default, which isn’t correct and stopped PHP from interpreting it.	2016-04-08 10:14:24 +12:00
Ingo Schommer	3e575681ae	Updated build artifacts	2016-04-07 23:50:12 +12:00
Ingo Schommer	097d7ee6d3	Removed unnecessary thunk wrapper in actions	2016-04-07 23:50:09 +12:00
Ingo Schommer	f9d5b0db97	More concise breadcrumb generation ... Courtesy of @hafriedlander	2016-04-07 23:32:32 +12:00
Ingo Schommer	2f801f9319	Pass all field attributes via <FormBuilder> ... Also make them immutable via deep-freeze	2016-04-07 23:32:32 +12:00
Ingo Schommer	e7d2e9b0b2	Allow user-defined <Form> attributes	2016-04-07 23:32:32 +12:00
Ingo Schommer	0fe330621c	Only list existing <FormBuilder> data types	2016-04-07 23:32:32 +12:00
Ingo Schommer	3835291cdf	More accurate variable naming ... schema.schema is awkward	2016-04-07 23:32:31 +12:00
Ingo Schommer	ab874a0c8d	Correct state handling in <FormBuilder> component	2016-04-07 23:32:31 +12:00
Ingo Schommer	874146afda	Syntax fix	2016-04-07 23:32:31 +12:00
Ingo Schommer	a1ea239c8f	Enforcing can*() in CampaignAdmin reads	2016-04-07 23:32:31 +12:00
Ingo Schommer	783d45cedd	Added TODO elements to unimplemented CampaignAdmin functionality	2016-04-07 23:32:30 +12:00
scott1702	5c8df9f16e	Updates to FormActionComponent	2016-04-06 10:57:54 +12:00
Ingo Schommer	34d40bed5f	Add ESLint support ... See https://github.com/silverstripe/silverstripe-framework/pull/5108	2016-04-06 10:43:33 +12:00
scott1702	6aa22c38ed	Convert react grid-field from flexbox to table-based	2016-04-06 08:49:47 +12:00
Ingo Schommer	d27e3c2d34	Delete campaign feature	2016-04-06 08:49:47 +12:00
Ingo Schommer	0675f85d32	Use /index suffix for JS import statements ... Otherwise browserify or gulp-sourcemaps doesn't include these in the *.map file, which makes debugging impossible	2016-04-06 08:49:47 +12:00
Damian Mooyman	2cf5fbcfce	Implement readCampaigns() ... Renamed "item/items" urls to "set/sets" to distinguish between change sets and change set items.	2016-04-06 08:49:44 +12:00
scott1702	d1e4c563ce	Move ActionComponent into FormActionComponent	2016-04-06 08:41:11 +12:00
Ingo Schommer	2a5c92e491	Generic state management for React GridField ... Renaming state operations from 'campaign' to 'record'. Implemented API endpoint retrieval of GridField data. Added more mock data into CampaignAdmin (rather than hardcoding in client), to be replaced by CampaignAdmin API endpoint querying the real datamodel. Using more native isomorphic-fetch instead of jQuery.ajax to minimise dependencies and get into a more forward-thinking API. Also catching errors in ReactJS API backend: Emulate jQuery.ajax() behaviour. Might change at a later point if we have a general purpose backend with a promise-based catch() implementation.	2016-04-06 08:41:07 +12:00
Ingo Schommer	47dd7b48af	Relative ES6 module paths ... http://stackoverflow.com/questions/20158401/how-do-i-manage-relative-path-aliasing-in-multiple-grunt-browserify-bundles/23608416#23608416 https://github.com/substack/node-browserify/issues/767 http://stackoverflow.com/questions/28078780/relative-paths-in-package-json https://github.com/npm/npm/issues/1558 http://stackoverflow.com/questions/31624567/webstorm-es6-named-import-getting-cannot-resolve-symbol-error/31631415 http://stackoverflow.com/questions/20158401/how-do-i-manage-relative-path-aliasing-in-multiple-grunt-browserify-bundles/23608416#23608416 https://github.com/vigetlabs/gulp-starter/issues/17#issuecomment-44292681	2016-04-06 08:36:38 +12:00
Ingo Schommer	c70590e50c	Consolidated grid-field component ... Every top-level folder in /components should be a standalone component. This isn't the case for the grid-field-* ones, so they belong into the same folder. See https://github.com/Automattic/wp-calypso/blob/master/docs/components.md merge styles	2016-04-06 08:36:37 +12:00
scott1702	e550363c67	- Add GridfieldActionsComponent ... - Add ability to set desired relative width on gridfield cells	2016-04-06 08:36:37 +12:00
David Craig	ef97e0b52f	Consolidated bundles, sourcemaps and watching ... We don't want a bundle for each section, unnecessary network overhead and too much boilerplate in defining build tooling.	2016-04-06 08:36:34 +12:00
Ingo Schommer	b4e6d498c9	Simplified form schema structure and mocks ... Keyed by URL instead of anonymous object maps which need to be iterated on Removed the 'schema.forms' namespace, unnecessary since all 'schema' items should be forms	2016-04-06 08:35:53 +12:00
Paul Clarke	0ca090a391	Add generic React components ... Includes moving some components from AssetAdmin	2016-04-06 08:35:50 +12:00
Ingo Schommer	b0ba742c1f	Campaign form schema and edit form ... Remove once we have a schema-driven GridField in place. Edit form should be a GridFieldDetailForm, but there's more work to do for schema generation from this component.	2016-04-05 22:43:30 +12:00
David Craig	d0ffa7771c	Client config	2016-04-05 22:43:29 +12:00
scott1702	2abe24f818	GridField and header styles	2016-04-05 22:42:15 +12:00
David Craig	f8c17bed3b	CampaignAdmin and GridField React sections ... Also removes watchify because it wasn't working. Add SilverStripeBackend class used to fetch data from endpoints for the front-end	2016-04-05 22:42:13 +12:00
Ingo Schommer	7337f26d3a	Fix non-standard url encoding in CMS search form ... jQuery uses encodeURIComponent, but also this line here: return s.join( "&" ).replace( r20, "+" ); https://github.com/jquery/jquery/blob/1.7.2/src/ajax.js#L797 This breaks when passing the result through $.path.addSearchParams(), which in turn uses jQuery.param - any '%20' would've been wrongly encoded as '+' by jQuery.serialise(), which in turn gets rightly encoded as '%2B' by jQuery.param(). This had the effect of breaking CMS searches with spaces in them.	2016-04-05 22:30:50 +12:00
Damian Mooyman	5a86f4232e	BUG Fix error when using search bar	2016-04-05 17:10:21 +12:00
Damian Mooyman	3c2b53157e	API Update Versioned methods	2016-04-04 14:50:16 +12:00
Damian Mooyman	77b47bac92	Merge pull request #5063 from benmanu/pulls/add-npm-json-js ... Moving thirdparty module to npm dependency - json-js	2016-04-04 10:13:33 +12:00
Sean Harvey	b1b85b539e	TinyMCE 4 optimisations. Use TinyMCE_Compressor.	2016-04-04 07:58:45 +12:00
Ben Manu	5c7a6166b6	Moving thirdparty module to npm dependency - json-js.	2016-04-01 15:43:09 +13:00
Ingo Schommer	d93da92c37	Merge pull request #5243 from open-sausages/pulls/4.0/client-routing ... Implement client-side routing with Page.js	2016-04-01 14:53:17 +13:00
Steve Boyd	7887be704e	Changed CMS close from an 'x' to a silverstripe font icon	2016-04-01 13:52:28 +13:00
Damian Mooyman	501b2f1809	API CMSMenu::get_cms_classes() is now sorted	2016-04-01 13:46:33 +13:00
David Craig	aa1aebd007	Implement client-side routing with Page.js ... - Removes thirdparty dependency History.js - Adds thirdparty dependency Page.js to manage client-side routing - Adds a wrapper around Page.js for SilverStripe specific behaviour - Increased minimum browser requirement to IE10. Native HTML History API routing requires IE10 or newer (necessitated by removal of History.js) - PJAX pannel loading via now uses promises rather than callbacks - Adds getClientConfig method to LeftAndMain which can be used to pass config from to the front-end client	2016-04-01 13:45:14 +13:00
Damian Mooyman	0fa7271ec2	Merge pull request #5239 from open-sausages/pulls/4.0/form-schema-fixes ... Form schema fixes	2016-03-31 09:49:55 +13:00
Sam Minnée	b4526ec554	Merge pull request #5237 from open-sausages/pulls/4.0/bootstrap-include-default ... Include Bootstrap by default	2016-03-30 14:57:32 +13:00
Ingo Schommer	2ba4e1dabe	Removed duplicate bootstrap lib ... Now generated on the fly through framework/admin/scss	2016-03-29 11:28:40 +13:00
scott1702	6b1444709f	Fix menu dropdown icon	2016-03-29 11:28:38 +13:00
David Craig	d4ad1504a9	Fix bottom toolbar height	2016-03-29 11:28:05 +13:00
Paul Clarke	dce31d7235	initial updates to main nav styles for 4.0 ... Conflicts: admin/css/ie7.css admin/css/ie7.css.map admin/css/ie8.css.map admin/css/screen.css admin/css/screen.css.map admin/javascript/dist/bundle-leftandmain.js admin/javascript/src/LeftAndMain.Menu.js admin/scss/_spritey.scss css/GridField.css	2016-03-29 10:29:33 +13:00
Ingo Schommer	884c44f596	Removed sourcemaps ... Will be part of .gitignore in a subsequent commit	2016-03-29 10:29:32 +13:00
scott1702	13d581dea5	Include bootstrap throughout the CMS	2016-03-29 10:29:27 +13:00
Ingo Schommer	c3a8159e80	Default to schema response part in LeftAndMain->schema() ... More of a standard API approach to return data by default, and make customisation via HTTP headers an optional mode.	2016-03-28 21:54:42 +13:00
David Craig	97176581eb	Tidy grunt file ... - Don't watch in prod mode - Use gulp-if instead of if statements	2016-03-28 21:02:15 +13:00
Sam Minnee	aeccb8b8e0	API: Move DBField subclasses into SilverStripe\Model\FieldType namespace ... API: Deprecate SS_Datetime. The DBField subclasses are have all been renamed to start with “DB” and be in the SilverStripe\Model\FieldType namespace. To keep DataObject definitions concise, the original short variations of their names are preserved as service definitions. Most of the field generation code doesn’t need to change, but where field classes are referenced directly, changes will be needed. SS_Datetime, which is commonly referenced outside the model system itself, has been preserved as a subclass of DBDatetime. This has been marked as deprecated and can be removed in SilverStripe 5. A few places that referred to $db and $casting values weren’t using the Injector to instantiate the relevant classes. This meant that the remapping we have created as part of moving classes into a namespace didn’t work.	2016-03-22 18:09:30 +13:00
Daniel Hensby	863b737717	Merge pull request #5214 from tractorcow/pulls/3.1/fix-array-values ... Do not hang on nested parameters in search context	2016-03-21 09:21:33 +00:00
Damian Mooyman	94b0f61957	Merge pull request #3494 from dnadesign/tabForceActive ... fixing issue where 'ss-tabs-force-active' wasn't actually working	2016-03-21 16:53:49 +13:00
Nicola Fontana	11561aeb54	Do not hang on nested parameters in search context ... Backport of 0b5a573 for 3.2 that does not add a new API, as required by #5056 to be semver compatible.	2016-03-21 15:54:22 +13:00
Daniel Hensby	ada12066f3	FIX Autocomplete loading spinner now showing	2016-03-21 15:15:00 +13:00
Damian Mooyman	2d56ea278a	API Move ss buttons plugin out of thirdparty ... BUG Fix incorrect parsing of shortcode properties	2016-03-21 13:51:33 +13:00
Ingo Schommer	8ae794ee99	API TinyMCE Image shortcodes	2016-03-21 09:23:40 +13:00
Jonathon Menz	283885f091	FIX tab wrapping ... jQuery UI css specificity is different to SS so causes some conflicts. (fixes #5207)	2016-03-20 11:09:36 -07:00
Damian Mooyman	0848aca462	API Massive refactor of Versioned ... API Implemented recursive versioned actions (publish, etc) API Un-deprecate delete batch action API Changed Versioned getters and setters for stages BUG Inject query parameters during DataObject construction to prevent incorrect lazy loading	2016-03-17 13:43:53 +13:00
Damian Mooyman	384297150a	API refactor LeftAndMain_Menu.ss into individually overridable components	2016-03-15 09:34:39 -07:00
Daniel Hensby	a7a23afe38	Merge pull request #5163 from mikenz/patch-5 ... Build dist assets and added console.warn	2016-03-14 16:38:28 +00:00
Paul Clarke	ae31619695	New styles for main nav	2016-03-14 10:18:32 +13:00
Mike Cochrane	3673a5e141	FIX Inserting a 'Download a file' without selecting an image ... In the html editor, when inserting a 'Download a file' link without selecting a file to link to, no link should be inserted. Currently is inserting a link to an undefined file id: [file_link,id=undefined]	2016-03-11 00:35:13 +00:00
Mike Cochrane	0b81bbef22	FIX attempt to access https iframe from http interface	2016-03-09 21:36:39 +13:00
Mike Cochrane	a3ee9ece90	FIX avoid javascript error when preview is https ... When the admin interface is http but the preview is https, javascript isn't able to read the contentDocument of the secure preview iframe. This currently results in a javascript error. Patch wraps try/catches around the two instances,	2016-03-09 21:19:26 +13:00
Damian Mooyman	6d88caa9b3	Merge pull request #5132 from open-sausages/features/form-schema ... API Form schema	2016-03-07 14:08:36 +13:00
Damian Mooyman	8566825194	Merge pull request #5131 from dhensby/pulls/3.3/fix-help-link ... Fixing user help link	2016-03-07 14:04:45 +13:00
Ingo Schommer	3b11d73c46	Merge remote-tracking branch 'origin/3' ... # Conflicts: # forms/gridfield/GridFieldDetailForm.php # javascript/GridField.js	2016-03-07 09:26:35 +13:00
Ingo Schommer	f36b110db3	Merge remote-tracking branch 'origin/3.3'	2016-03-04 17:06:04 +13:00
Ingo Schommer	466ed29f0e	Merge remote-tracking branch 'origin/3.3' into 3	2016-03-04 14:55:08 +13:00
Ingo Schommer	3c53da0890	Merge remote-tracking branch 'origin/3.2' into 3.3	2016-03-04 14:05:06 +13:00
Ingo Schommer	7bb6295c79	Fix TreeDropdownField auto-close regression ... Causes build failures due to Behat not being able to select a link from a dropdown in "Insert Media". Follow on effect from triggering a window.resize event when the window wasn't actually resized (in order to force a layout redraw). See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context	2016-03-03 17:54:07 +13:00
Ingo Schommer	61a8529d76	More reuseable FormSchema logic, return on save	2016-03-03 13:36:51 +13:00
Ingo Schommer	746322a9f1	Replace CMSForm use with new setValidationResponseCallback() API ... Preparing for form schema API, see https://github.com/silverstripe/silverstripe-framework/issues/4938	2016-03-03 08:20:55 +13:00
David Craig	404ac4ae43	Initial schemaState implementation	2016-03-03 08:20:54 +13:00
David Craig	afccef718c	Initial Form Field Schema implementation ... - Adds FormSchema class - Adds FormSchema dependency to LeftAndMain via Injector - Adds schema allowed_action method to LeftAndMain for generating Form schemas - Adds FormFieldSchemaTrait to for schema getters and setters on FormFields	2016-03-03 08:20:54 +13:00
Daniel Hensby	f313d7659d	Fixing user help link	2016-03-02 12:43:10 +00:00
Nicola Fontana	29b35c7ccf	Do not hang on nested parameters in search context ... Backport of 0b5a57389b for 3.2 that does not add a new API, as required by #5056 to be semver compatible.	2016-02-28 21:40:34 +01:00
David Craig	40723aaa58	Fix undeclared variable in UploadField.js	2016-02-26 14:43:14 +13:00
Damian Mooyman	c4f850003b	Merge pull request #5089 from jakedaleweb/3 ... added if statement to catch NULL validators	2016-02-26 09:29:53 +13:00
Damian Mooyman	3b0a9f4ba2	Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/javascript/LeftAndMain.Menu.js # control/HTTPRequest.php # css/GridField.css # css/GridField.css.map # docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md # docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md # docs/en/02_Developer_Guides/06_Testing/index.md # docs/en/02_Developer_Guides/14_Files/01_File_Management.md # docs/en/02_Developer_Guides/14_Files/02_Images.md # filesystem/Upload.php # javascript/HtmlEditorField.js # model/Image.php # model/connect/MySQLDatabase.php # model/fieldtypes/Enum.php # model/versioning/Versioned.php # scss/GridField.scss	2016-02-25 14:51:59 +13:00
Damian Mooyman	9fed5561f4	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # core/Constants.php # dev/DevelopmentAdmin.php	2016-02-24 17:39:04 +13:00
Damian Mooyman	5f2d3f31d7	Merge remote-tracking branch 'origin/3.2' into 3.3 ... # Conflicts: # dev/DevelopmentAdmin.php # docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md # lang/cs.yml # lang/lt.yml	2016-02-24 17:29:06 +13:00
Jake Ovenden	48ecb8d8f4	added if statement to catch NULL validators	2016-02-24 15:13:00 +13:00
scott1702	a67b8144b0	Fix incorrect height on main nav after toggle	2016-02-24 10:23:16 +13:00
David Craig	5a42a4181a	Added Bootstrap Alpha.2 ... - Managed by npm - Created an `npm run css` task to compile - Updated shrinkwrap - Updated changelog	2016-02-23 11:11:24 +13:00
Damian Mooyman	f20ad434ce	API Update TinyMCE to 4.x ... API Allow HtmlEditorField to be individually configured BUG Fix incorrect change detection BUG Fix missing i18n files	2016-02-23 10:10:02 +13:00
Damian Mooyman	3738436d0e	Update translations	2016-02-19 10:54:36 +13:00
Damian Mooyman	cfd1a5d696	Update translations	2016-02-19 10:21:03 +13:00
scott1702	38b1c0a162	Replace Compass with gulp-sass	2016-02-16 18:35:57 +13:00
Damian Mooyman	b82d585b57	Merge pull request #5019 from open-sausages/require-react ... Include React and related libraries in framework	2016-02-15 16:25:39 +13:00
scott1702	2bf802a8cd	Include React and related libraries in framework	2016-02-15 16:05:55 +13:00
Damian Mooyman	230d017677	Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/css/ie7.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/font/icon-reference.html # admin/font/silverstripe.eot # admin/font/silverstripe.svg # admin/font/silverstripe.ttf # admin/font/silverstripe.woff # admin/scss/_forms.scss # admin/scss/_style.scss	2016-02-12 15:41:45 +13:00
Damian Mooyman	d5b4c90cb4	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/css/screen.css # admin/css/screen.css.map # admin/scss/_fonts.scss # admin/scss/_retina.scss	2016-02-09 18:25:47 +13:00
Damian Mooyman	35b5c03fbc	Merge branch 3.3.0 into 3.3	2016-02-09 18:22:58 +13:00
Damian Mooyman	adc7a59108	Update translations	2016-02-09 17:45:21 +13:00
Daniel Hensby	cb39c41872	Merge pull request #5015 from webbuilders-group/3.3-datetime-search-fix ... BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel	2016-02-05 15:31:37 +00:00
UndefinedOffset	0c252af334	BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel	2016-02-05 10:53:35 -04:00
Loz Calver	70f8343475	Re-instate back button for item edit forms	2016-02-05 09:39:57 +00:00
Damian Mooyman	d754884214	Update translations	2016-02-04 11:03:41 +13:00
scott1702	f39989a396	Add new font icons to set ... Add .no-text class for icons which have no text	2016-02-04 10:34:30 +13:00
Daniel Hensby	316d5ef967	Set the stage reading mode in LeftAndMain	2016-02-03 21:27:13 +00:00
scott1702	15fba5a4cb	Remove old logout icon on retina screens ... Remove background rules for old preview icons	2016-02-03 16:36:21 +13:00
Daniel Hensby	24aaee984e	Set the stage reading mode in LeftAndMain	2016-02-02 13:35:39 +00:00
Daniel Hensby	c5fc9dd650	FIX CMS actions alignment	2016-01-26 14:38:48 +00:00
Damian Mooyman	d4521cbc92	Update gitattributes and Rebuild bundles	2016-01-26 13:14:48 +13:00
Damian Mooyman	6cebffd89b	BUG Fix SSViewerTest not restoring old requirements ... BUG Fix incorrect js path in UploadField.php Restore changes missing from merge	2016-01-26 11:39:53 +13:00
David Craig	2fc9d69197	Remove files after rebase	2016-01-26 11:39:53 +13:00
David Craig	2140025c20	Implement RFC-7 JavaScript module loader ... - Adds ES6 support via Babel - Transforms existing JavaScript to UMD modules - Adds module bundling via Browserify - Existing JavaScript converted to UMD modules - lib.js and leftandmain.js are bundled using browserify - JavaScript minifying of bundles handed by gulp	2016-01-26 11:39:20 +13:00
Damian Mooyman	69c9ad1428	Merge remote-tracking branch 'origin/3' ... # Conflicts: # admin/css/ie8.css.map # admin/css/screen.css # admin/css/screen.css.map # admin/scss/_style.scss # css/AssetUploadField.css # css/GridField.css.map # docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md # lang/fi.yml	2016-01-25 16:15:41 +13:00
Damian Mooyman	e091bb8474	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/scss/_forms.scss # admin/scss/_style.scss # tests/model/VersionedTest.yml	2016-01-25 15:57:37 +13:00
Damian Mooyman	75493e79ff	Update translations	2016-01-25 15:06:55 +13:00
scott1702	1a1c7b2f55	Update background colors	2016-01-22 17:50:01 +13:00
divzpatel123@gmail.com	7ead6f0ca9	Minor: changed px value on tabs (border-bottom)	2016-01-22 17:22:31 +13:00
Meeeeeeow	d8ee25c39c	Minor: Remove Boxshadows	2016-01-22 17:18:02 +13:00
divzpatel123@gmail.com	fbc68f433f	Minor: update background colors	2016-01-22 16:32:52 +13:00
scott1702	e4222d8186	Add default action from batch actions	2016-01-22 16:02:27 +13:00
Igor	3924db26d8	Add special flag to CMS preview requests	2016-01-22 13:02:59 +13:00
Daniel Hensby	1bf0605f5e	Merge pull request #4568 from tractorcow/pulls/4.0/dropdown-cleanup ... API Cleanup and refactor of select fields and Standardise Relation interface	2016-01-21 12:39:27 +00:00
Loz Calver	219f76f87c	Merge pull request #4951 from divya-patel/logout-menu-update ... Minor:updated the menu on the top left; changed styles	2016-01-21 09:54:54 +00:00
Damian Mooyman	bdb1a95758	API Cleanup and refactor of select fields ... API Standardise Relation interface	2016-01-21 15:40:19 +13:00
Damian Mooyman	bc2a4dd652	Merge pull request #4953 from lry6003/search-icon ... Search Icon Hover/Active/Focus changes	2016-01-21 14:57:13 +13:00
Damian Mooyman	d8ea6ceccc	Update translations	2016-01-21 14:22:35 +13:00
divzpatel123@gmail.com	4dee924432	Minor:updated the menu on the top left; changed styles	2016-01-20 15:44:40 +13:00
Luke Ryley	38e2cb5b6d	Search Icon Hover/Active/Focus changes ... Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states	2016-01-20 14:35:54 +13:00
Damian Mooyman	eeb110a04f	Merge pull request #4939 from lry6003/unbold-labels ... Minor: Unbolded labels in CMS	2016-01-20 13:31:13 +13:00
Damian Mooyman	e6b877df27	Merge remote-tracking branch 'origin/3' ... # Conflicts: # control/Director.php # control/HTTP.php # core/startup/ParameterConfirmationToken.php # docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md # docs/en/00_Getting_Started/04_Directory_Structure.md # docs/en/00_Getting_Started/05_Coding_Conventions.md # docs/en/01_Tutorials/01_Building_A_Basic_Site.md # docs/en/01_Tutorials/02_Extending_A_Basic_Site.md # docs/en/01_Tutorials/03_Forms.md # docs/en/01_Tutorials/04_Site_Search.md # docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md # docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md # docs/en/02_Developer_Guides/13_i18n/index.md # docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md # docs/en/03_Upgrading/index.md # docs/en/changelogs/index.md # docs/en/howto/customize-cms-menu.md # docs/en/howto/navigation-menu.md # docs/en/index.md # docs/en/installation/index.md # docs/en/installation/windows-manual-iis-6.md # docs/en/misc/contributing/code.md # docs/en/misc/contributing/issues.md # docs/en/misc/module-release-process.md # docs/en/reference/dataobject.md # docs/en/reference/execution-pipeline.md # docs/en/reference/grid-field.md # docs/en/reference/modeladmin.md # docs/en/reference/rssfeed.md # docs/en/reference/templates.md # docs/en/topics/commandline.md # docs/en/topics/debugging.md # docs/en/topics/email.md # docs/en/topics/forms.md # docs/en/topics/index.md # docs/en/topics/module-development.md # docs/en/topics/modules.md # docs/en/topics/page-type-templates.md # docs/en/topics/page-types.md # docs/en/topics/search.md # docs/en/topics/testing/index.md # docs/en/topics/testing/testing-guide-troubleshooting.md # docs/en/topics/theme-development.md # docs/en/tutorials/1-building-a-basic-site.md # docs/en/tutorials/2-extending-a-basic-site.md # docs/en/tutorials/3-forms.md # docs/en/tutorials/4-site-search.md # docs/en/tutorials/5-dataobject-relationship-management.md # docs/en/tutorials/building-a-basic-site.md # docs/en/tutorials/dataobject-relationship-management.md # docs/en/tutorials/extending-a-basic-site.md # docs/en/tutorials/forms.md # docs/en/tutorials/index.md # docs/en/tutorials/site-search.md # main.php # model/SQLQuery.php # security/ChangePasswordForm.php # security/MemberLoginForm.php # tests/control/ControllerTest.php # tests/core/startup/ParameterConfirmationTokenTest.php # tests/model/SQLQueryTest.php # tests/security/SecurityTest.php # tests/view/SSViewerTest.php # view/SSTemplateParser.php # view/SSTemplateParser.php.inc # view/SSViewer.php	2016-01-20 13:16:27 +13:00
Damian Mooyman	8c1cafd1a0	Merge remote-tracking branch 'origin/3.3' into 3 ... # Conflicts: # admin/scss/_forms.scss # admin/scss/_style.scss # admin/scss/_tree.scss # javascript/TreeDropdownField.js	2016-01-19 17:08:26 +13:00
Meeeeeeow	4301ae20bf	Changed the link colours	2016-01-19 15:46:29 +13:00
Luke Ryley	2701248387	Minor: Unbolded labels in CMS ... - updated _forms.scss removed font-weight - also removed drop-shadow include Luke Ryley - open source academy	2016-01-19 12:04:55 +13:00
David Craig	254b942737	Adds npm for managing client-side dependencies ... - Includes a package.json file with build and CI scripts - Includes shrinkwrap file for locking dependency version - Includes Gulp for running build tasks - Includes a 'build' task for copying library files from node_modules to thirdparty - Includes a 'sanity' task for makes sure library files in thirdparty match what's in node_modules - Includes updates to .travis.yml (new JS_SANITY_CHECK flag) to run the sanity task	2016-01-13 09:23:47 +13:00
scott1702	4a0e157479	Remove focus outline when clicking tabs	2016-01-08 15:11:17 +13:00
Sam Minnee	3ee8f505b7	MINORE: Remove training whitespace. ... The main benefit of this is so that authors who make use of .editorconfig don't end up with whitespace changes in their PRs. Spaces vs. tabs has been left alone, although that could do with a tidy-up in SS4 after the switch to PSR-1/2. The command used was this: for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+ find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//' done	2016-01-07 10:15:54 +13:00
scott1702	b64d73dcbf	color updates to meet contrast requirements	2016-01-05 11:20:30 +13:00
Damian Mooyman	952896e638	Update translations	2015-12-23 13:22:38 +13:00
Damian Mooyman	9fcca5c7e2	Merge pull request #4842 from open-sausages/icon-tabs ... Update icon-button-group css	2015-12-22 16:20:38 +13:00
Damian Mooyman	4e3d6f9118	Fix merge regressions from 3.2 -> 3	2015-12-22 14:35:05 +13:00
Damian Mooyman	48a30909f3	Merge remote-tracking branch 'origin/3.2' into 3 ... # Conflicts: # admin/javascript/LeftAndMain.BatchActions.js # css/UploadField.css # forms/HtmlEditorField.php	2015-12-22 14:07:52 +13:00
scott1702	78190f213d	Update icon-button-group css	2015-12-11 18:20:33 +13:00
Damian Mooyman	e68eb7e45d	Update translations	2015-11-11 17:06:45 +13:00
Damian Mooyman	b338efe5a7	Update translations	2015-11-11 16:07:20 +13:00
scott1702	4f8b061b59	Remove drag handle from non-draggable js-trees	2015-11-05 13:09:47 +13:00
Damian Mooyman	44728d1c76	Merge pull request #4740 from chillu/pulls/3.2/batch-action-url-fix ... Batch actions break with Translatable installed	2015-11-04 09:31:21 +13:00
Ingo Schommer	acdcf8ca02	Batch actions break with Translatable installed ... Due to ?locale GET parameter being appended to the action URL, and naive string concatenation of additional GET parameters.	2015-11-04 08:35:25 +13:00
Damian Mooyman	1e1a7a345c	Merge remote-tracking branch 'origin/3' ... Conflicts: control/Director.php filesystem/File.php filesystem/GD.php filesystem/ImagickBackend.php forms/HtmlEditorField.php javascript/UploadField_uploadtemplate.js model/Image.php model/Image_Backend.php model/fieldtypes/Enum.php templates/AssetUploadField.ss tests/model/ImageTest.php tests/search/FulltextFilterTest.php	2015-11-03 14:23:16 +13:00
Damian Mooyman	c4dc10b255	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: forms/DropdownField.php tests/model/ImageTest.php	2015-11-03 13:06:39 +13:00
Damian Mooyman	e07f80014c	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: lang/cs.yml lang/sk.yml	2015-11-03 11:10:46 +13:00
Ed Linklater	42d2e0ebbf	Don't try to unbind events from inside top-level iframes	2015-11-01 06:14:30 +13:00
scott1702	9f9d0089df	Send user to new area when inserting url	2015-10-29 11:37:59 +13:00
scott1702	1f64631bfc	Update asset admin toolbar	2015-10-23 17:39:42 +13:00
Stephen Shkardoon	6030854725	Fix page reordering bug with ParentID ... If you are viewing PageA in the CMS, but move PageB into PageC, the edit form will recieve an edit form ParentID of PageC. This is incorrect, as only PageB had it's ParentID change.	2015-10-12 20:10:48 +13:00
scott1702	4f72b5cfb6	Add thumbnails font-icon	2015-10-08 10:22:14 +13:00
Damian Mooyman	0cd3569fb9	Update translations	2015-10-06 18:33:16 +13:00
scott1702	23baa288ba	Sticky footer on insert media/link elements	2015-10-01 15:35:56 +13:00
scott1702	3f85c57013	Move 'upload new file' section to main files area ... Optimise and fix drag drop on upload fields Combine 3 tabs from the 'insert media' dialog box into 1	2015-09-28 12:02:33 +13:00
Loz Calver	8f0f6475da	FIX: Issues with field focus in edit forms (fixes #4621)	2015-09-23 15:19:24 +01:00
Nicola Fontana	c39cf2d55f	Do not hang on nested parameters in search context	2015-09-23 09:12:02 +02:00
Damian Mooyman	34b71cf6c8	Merge remote-tracking branch 'origin/3'	2015-09-15 13:42:17 +12:00
Damian Mooyman	00caeb700d	Added 3.1.14 changelog ... Update translations	2015-09-15 10:58:15 +12:00
scott1702	48c48d703d	Disable split view mode when not enough room	2015-09-15 10:28:37 +12:00
Damian Mooyman	45b22c788e	BUG Fix missing framework/admin/tests	2015-09-10 11:06:15 +12:00
Damian Mooyman	812b5ecb62	Fix merge regressions	2015-09-09 16:18:39 +12:00
Damian Mooyman	13e1f52b37	Merge remote-tracking branch 'origin/3.2' into 3	2015-09-09 16:14:28 +12:00
Damian Mooyman	6ad277c412	Fix merge regressions	2015-09-09 16:12:12 +12:00
Damian Mooyman	b552a7370f	Merge remote-tracking branch 'origin/3' ... Conflicts: tests/model/ImageTest.php	2015-09-09 15:44:47 +12:00
Damian Mooyman	f10785350e	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md	2015-09-09 14:50:47 +12:00
Damian Mooyman	309ac0d196	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: .travis.yml admin/code/CMSProfileController.php admin/tests/LeftAndMainTest.php control/HTTP.php security/Permission.php tests/forms/FormTest.php tests/model/ArrayListTest.php tests/security/PermissionTest.php	2015-09-09 14:35:29 +12:00
Damian Mooyman	96d20bc180	BUG Fix missing framework/admin/tests	2015-09-07 18:04:56 +12:00
scott1702	9cbb235daa	update cms notifications ... New style - text now wraps instead of overflowing Now stay on screen longer Hovering causes notification to stay on screen	2015-09-02 15:47:48 +12:00
Damian Mooyman	92f9af1984	Update translations	2015-09-02 11:15:53 +12:00
scott1702	5f56f204f1	Update view mode section w/ font icons	2015-09-01 10:54:52 +12:00
Daniel Hensby	ea757e72a6	Merge pull request #4560 from willmorgan/bugfixes/localstorage-win81-ie11 ... Fix localStorage for Windows 8.1 IE11 desktop mode	2015-08-29 21:15:19 +01:00
James Bolitho	0cb98bcce2	Fix localStorage for Windows 8.1 IE11 desktop mode ... In IE11 windows 8 call to window.localStorage was throwing out an access denied error. Using try and catch manages the issue and allows the script to execute in IE 11 in desktop mode. I think it is a problem with IE11 rather than the way Silverstripe is implementing the preview via an iframe from what I have been reading. http://blogs.msdn.com/b/ieinternals/archive/2009/09/16/bugs-in-ie8-support-for-html5-postmessage-sessionstorage-and-localstorage.aspx. It seems that the way IE11 deals with localStorage is broken in certain cases but I am not 100% certain of the cause yet as I have not been able to find a definitive answer. I only noticed it was a problem when a new client said they couldn't view the admin screen properly in IE11. I took a look in IE11 and I was experiencing the same problem which makes the admin interface layout screw up and the preview doesn't work due the error mentioned in the first post. Instead of the original code I submitted I have amended it and added an additional function to test more robustly to see if localStorage is available and can be accessed properly. It is a copy of the code on a blog post Mathias Bynens has written about detecting if localStorage is available and can be used: https://mathiasbynens.be/notes/localstorage-pattern I have added a console.warn as you suggested if localStorage is not available so that at least you get a warning if localStorage tests fail. I have tested this on Windows 8.1: Firefox, Chrome & Mac: Firefox, Safari, Chrome and it seems to work as expected. On IE11 it displays the admin area correctly now but obviously doesn't save the preview settings between page loads if localStorage is not available.	2015-08-29 15:54:14 +01:00
Sam Minnée	f4b7cd3f68	Merge pull request #4500 from stevie-mayhew/pulls/get-response ... FEATURE: implement getter and setter usage for response	2015-08-29 15:35:55 +12:00
Stevie Mayhew	1b57e0ca5b	FEATURE: implement getter and setter usage for response	2015-08-29 10:24:06 +12:00
scott1702	17ab371ffa	Update font icon library	2015-08-28 15:15:06 +12:00
scott1702	6180788f9d	Fix alignment of logout area	2015-08-28 12:20:00 +12:00
Daniel Hensby	08dd8fda62	Merge pull request #4086 from xini/fix-remote-url-field ... fix width of remote url field label to allow right-click-paste	2015-08-27 20:50:35 +01:00
Daniel Hensby	2d4b743090	FIX Members can access their own profiles in CMS	2015-08-26 15:47:51 +01:00
Damian Mooyman	445f1d4ccb	Merge pull request #4529 from scott1702/filtered-tree ... update the filtered tree styling	2015-08-25 14:50:39 +12:00
scott1702	7bbe258b44	update the filtered tree styling	2015-08-25 13:01:17 +12:00
Damian Mooyman	f7c19830d6	BUG Fix JS error on clicking collapsed panel	2015-08-24 17:36:29 +12:00
Sam Minnée	5c5dd7efce	Merge pull request #4531 from tractorcow/pulls/3.2/block-archived-dragdrop ... BUG disable archived pages from being droppable	2015-08-24 17:04:41 +12:00
Sam Minnée	942ef04664	Merge pull request #4532 from tractorcow/pulls/3.2/packages ... Add missing packages	2015-08-24 17:04:39 +12:00
Damian Mooyman	f220adc3e0	Update translations	2015-08-24 16:52:39 +12:00
Damian Mooyman	4a011303b9	Add missing packages	2015-08-24 16:15:38 +12:00
Damian Mooyman	80ce5498d8	BUG disable archived pages from being droppable ... Fixes https://github.com/silverstripe/silverstripe-cms/issues/1257	2015-08-24 15:59:59 +12:00
Damian Mooyman	58409f64c0	Merge remote-tracking branch 'origin/3'	2015-08-24 11:59:21 +12:00
Damian Mooyman	1bb6b85280	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: admin/javascript/LeftAndMain.BatchActions.js	2015-08-24 11:55:54 +12:00
Damian Mooyman	b14794b780	BUG Fix bulk actions making sitetree unclickable	2015-08-21 16:24:13 +12:00
Damian Mooyman	0f81d5ece5	BUG Fix bulk actions making sitetree unclickable	2015-08-21 16:22:08 +12:00
scott1702	7182c50721	Fix overlaying border on header tabs	2015-08-21 09:52:10 +12:00
Daniel Hensby	84b70422b6	Merge branch '3' ... Conflicts: .travis.yml	2015-08-18 16:41:21 +01:00
Daniel Hensby	0b177ad20f	Merge branch '3.2' into 3	2015-08-18 16:40:20 +01:00
Daniel Hensby	af5ef13e6c	Merge branch '3.1' into 3.2	2015-08-18 16:39:35 +01:00
Loz Calver	8b638f56fb	FIX: Using undefined var in ModelAdmin	2015-08-18 15:37:15 +01:00
Daniel Hensby	0b36082564	Merge branch '3' ... Conflicts: .travis.yml composer.json docs/en/changelogs/4.0.0.md forms/gridfield/GridFieldExportButton.php	2015-08-17 13:12:41 +01:00
Dan Hensby	c5c8a6a720	Merge remote-tracking branch '3.2' into 3 ... Conflicts: admin/templates/Includes/ModelAdmin_ImportSpec.ss css/GridField.css	2015-08-17 11:59:24 +00:00
Daniel Hensby	a8ab5a468d	Merge branch '3.1' into 3.2 ... Conflicts: admin/code/LeftAndMain.php composer.json	2015-08-17 11:43:28 +01:00
Sam Minnée	5911d50bca	Merge pull request #4477 from nickbooties/nickbooties-patch-1 ... Fixes #4424	2015-08-11 17:34:35 +12:00
Nick	c4c4d79c26	Fix for Issue #4424 ... Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces. Uses className for element ID on ImportSpec template.	2015-08-11 14:56:13 +10:00
Stevie Mayhew	ea7b0714c2	MINOR: be more specific with background class for menu	2015-08-07 13:22:57 +12:00
Daniel Hensby	009458e342	Fixing rubbish login message when trying to access the CMS	2015-08-04 12:23:22 +01:00
Nick	1438a53900	Issue #4424 ... Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424	2015-08-04 15:57:38 +10:00
Nick	9ad64716cc	Issue #4424 ... Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424	2015-08-04 15:55:07 +10:00
Damian Mooyman	102892e247	Update translations	2015-08-04 13:02:20 +12:00
Damian Mooyman	f2c39aac20	API batch restore action	2015-08-03 18:26:44 +12:00
scott1702	dfaaa3353e	Update batch archive warning to incl children pages	2015-08-03 16:17:31 +12:00
Damian Mooyman	66ca5405d0	BUG Fix change detection on browser back button	2015-08-03 08:31:51 +12:00
Damian Mooyman	09210efbc0	Merge remote-tracking branch 'origin/3' ... Conflicts: composer.json control/Session.php docs/en/05_Contributing/01_Code.md docs/en/05_Contributing/02_Release_Process.md forms/FormField.php model/DataQuery.php model/Image.php model/queries/SQLConditionalExpression.php view/SSViewer.php view/ViewableData.php	2015-07-31 15:49:35 +12:00
Damian Mooyman	fa76f98d0c	Merge pull request #4441 from jonom/choose-file-thumbnails-3.2 ... FIX Missing thumbnails and inconsistencies	2015-07-31 14:37:10 +12:00
Damian Mooyman	e0a560051e	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: css/AssetUploadField.css	2015-07-31 14:33:16 +12:00
Damian Mooyman	7ee444e08a	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: admin/code/LeftAndMain.php control/injector/SilverStripeServiceConfigurationLocator.php core/ClassInfo.php filesystem/File.php model/DataObject.php model/DataQuery.php search/filters/FulltextFilter.php search/filters/SearchFilter.php tests/core/ClassInfoTest.php tests/filesystem/FileTest.php tests/model/DataListTest.php	2015-07-31 11:38:18 +12:00
Jonathon Menz	aa286ef7d7	FIX Missing thumbnails and inconsistencies ... Made thumbnails and columns in File list Grid Fields more consistent (fixes #4409)	2015-07-30 16:15:51 -07:00
Daniel Hensby	1e20b7d698	Merge pull request #4390 from tractorcow/pulls/3.2/predictable-ids ... API respect custom attributes on OptionsetField and CheckboxSetField	2015-07-30 11:15:15 +01:00
Damian Mooyman	ae783e9598	Merge pull request #4042 from selay/3.1 ... Hardcoded http:// cause browser warnings in admin panel	2015-07-28 09:14:34 +12:00
Loz Calver	a3fd150bd0	Upgrade template translation syntax	2015-07-22 14:17:03 +01:00
Daniel Hensby	cd560eee12	Merge pull request #4397 from flashbackzoo/pulls/batch-actions-tree-status-fix ... Update tree status after bulk action is applied	2015-07-22 13:53:41 +01:00
Dan Hensby	64ceba133c	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: admin/css/screen.css	2015-07-20 14:08:36 +00:00
Daniel Hensby	ca8d0f2818	Merge branch '3.1' into 3.2 ... Conflicts: dev/Debug.php docs/en/05_Contributing/01_Code.md forms/FormField.php i18n/i18nTextCollector.php model/DataQuery.php	2015-07-20 10:48:01 +01:00
Jonathon Menz	272f6d7700	Improved site tree tooltips ... Now shows full title and friendly singular name for page type	2015-07-16 08:49:43 -07:00
David Craig	3c20b58067	Update tree status after bulk action is applied	2015-07-16 10:50:09 +12:00
Tom Densham	b17b186e93	Convert FQCNs to html safe strings ... Convert namespaced class names to html safe strings in `LeftAndMain.php` `CMSMenu.php` and `LeftAndMain.Main.js` by replacing backslashes (\) with dashes (\) and removing special characters with `Convert::raw2htmlname()`	2015-07-15 15:33:00 +01:00
scott1702	c51c52f61f	Update button and tab styles	2015-07-15 10:35:21 +12:00
Damian Mooyman	560f9a6e39	API respect custom attributes on OptionsetField and CheckboxSetField	2015-07-10 14:49:05 +12:00
David Craig	e4447698b5	Update compass config ... - Add sourcemaps for debugging - More consistant builds across environments	2015-07-09 10:11:00 +12:00
Jonathon Menz	2a9e7087eb	Improved label clipping in site tree ... Deeply nested site tree nodes show a few more characters and any clipped text in labels is marked as such (fixes https://github.com/silverstripe/silverstripe-cms/issues/1235)	2015-07-07 09:00:40 -07:00
Jonathon Menz	e5ac209e3e	Expanded bulk action checkbox hit zone ... Increased checkbox click area so it's harder to accidentally click underlying link. Also lightened selected checkbox background colour for consistency (fixes #4342, fixes https://github.com/silverstripe/silverstripe-cms/issues/400, closes #4352)	2015-07-03 16:16:48 -07:00
David Craig	ae3fc84181	Add three column layout to Page content view ... - Content filters included in SiteTree view - View (tree/list) buttons included in SiteTree view - Update view button styles for new layout - Updated breadcrumbs for new layout	2015-07-02 10:22:24 +12:00
Jonathon Menz	74e6a67cfa	Different status dots for draft and modified ... Added a colour difference for status dots so status of draft vs modified can be distinguished at a glance	2015-06-26 11:00:48 -07:00
Loz Calver	3ebb73a675	Fix background size for spinner @2x	2015-06-24 12:04:21 +01:00
scott1702	3bdae22f63	Fix padding bug pushing out the 'post options' panel	2015-06-24 11:53:38 +12:00
Damian Mooyman	0ce92b0728	Merge remote-tracking branch 'origin/3.2' into 3	2015-06-23 17:35:29 +12:00
David Craig	f6745a3feb	Fix new page SiteTree nesting	2015-06-23 16:53:38 +12:00
David Craig	ca039e15ef	BUG Fix regressions in changes to batch action feature	2015-06-23 16:28:25 +12:00
David Craig	a6013ed1d0	Move filters from panel to header ... - The filter panel has been removed in favour of a search menu in the header. - The multi-select component has been updated: - Now called 'Bulk actions' - Styling updated - Added placeholder text / removed redundant option - Now also appears in SiteTree view	2015-06-23 13:08:23 +12:00
Damian Mooyman	bc8bc7d0c5	Update translations	2015-06-19 18:18:00 +12:00
Hamish Friedlander	4e8aa72702	Merge pull request #4310 from tractorcow/pulls/3.2/deprecations ... Set deprecation level for all changes in 3.x to 4.0	2015-06-19 15:58:27 +12:00
Damian Mooyman	d9c7d4538b	Update user help link for 3.2	2015-06-19 15:56:12 +12:00
Damian Mooyman	e14f743bf0	Set deprecation level for all changes in 3.x to 4.0	2015-06-19 13:07:41 +12:00
Damian Mooyman	1d122803cc	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: dev/SapphireTest.php docs/en/02_Developer_Guides/01_Templates/01_Syntax.md forms/DatetimeField.php forms/NullableField.php forms/NumericField.php forms/gridfield/GridField.php tests/control/DirectorTest.php tests/model/DataObjectSchemaGenerationTest.php tests/model/MySQLDatabaseTest.php	2015-06-19 10:48:07 +12:00
scott1702	6cc1c4580c	Update styles for multi-selection button	2015-06-17 22:22:59 +12:00
Damian Mooyman	0103b076c3	Merge remote-tracking branch 'origin/3' ... Conflicts: forms/Form.php model/ManyManyList.php	2015-06-17 15:41:13 +12:00
Damian Mooyman	d0bd5bc225	Merge pull request #4292 from scott1702/drag-drop ... Shorten space between page icons and child page dropdown arrow	2015-06-17 12:33:45 +12:00
Damian Mooyman	0abacaead6	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: admin/code/LeftAndMain.php forms/EmailField.php forms/Form.php forms/HeaderField.php forms/LiteralField.php forms/PasswordField.php forms/TextareaField.php forms/TreeDropdownField.php model/DataObject.php tests/forms/uploadfield/UploadFieldTest.php tests/model/DataObjectTest.php	2015-06-17 11:24:25 +12:00
scott1702	d36d0f348f	Shorten space between page icons and child page dropdown arrow	2015-06-17 10:23:07 +12:00
Matthew Hailwood	d673fdf497	Float labels with ss-ui-button class in accordion ... Currently things like the upload field etc break when you use them inside a ToggleCompositeField:  This fixes it by adding the float back 	2015-06-12 14:13:47 +12:00
Daniel Hensby	ad04eeb5c4	Merge pull request #4259 from tractorcow/pulls/3/multi-htmleditor-config ... API Support for multiple HTMLEditorConfig per page	2015-06-12 00:53:44 +01:00
Damian Mooyman	c877882f7e	Merge pull request #4170 from kinglozzer/pulls/4137-leftandmain-tree ... Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135)	2015-06-10 09:18:05 +12:00
scott1702	f0bc073848	Tidy up loading gif	2015-06-09 13:41:21 +12:00
Damian Mooyman	54f4ef0e9f	Merge pull request #4249 from scott1702/tinymce-linkform-uploadfield ... Update #2908 for 3.2	2015-06-09 12:38:46 +12:00
Damian Mooyman	a8ace75341	API Support for multiple HTMLEditorConfig per page	2015-06-09 12:17:55 +12:00
Damian Mooyman	786b1dd5d4	Merge remote-tracking branch 'origin/3' ... Conflicts: control/HTTPRequest.php filesystem/Upload.php model/ManyManyList.php	2015-06-09 11:10:14 +12:00
Damian Mooyman	a72bd16f42	API Deprecate delete in favour of archive ... Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology Add pop-up verification to destructive actions Fix bug in reporting publishing of error pages Restoring a page also restores parents	2015-06-03 14:24:27 +12:00
scott1702	a9d22f1fbf	NEW: Files can be uploaded directly in the 'Insert Link' form	2015-06-03 11:20:29 +12:00
Damian Mooyman	8331171f2c	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: .scrutinizer.yml admin/javascript/LeftAndMain.Panel.js core/startup/ParameterConfirmationToken.php dev/Debug.php dev/FixtureBlueprint.php docs/en/00_Getting_Started/05_Coding_Conventions.md docs/en/00_Getting_Started/index.md docs/en/02_Developer_Guides/01_Templates/01_Syntax.md filesystem/File.php filesystem/Folder.php forms/FieldList.php forms/LabelField.php forms/MoneyField.php forms/TextField.php forms/TreeDropdownField.php forms/Validator.php forms/gridfield/GridField.php forms/gridfield/GridFieldExportButton.php lang/de.yml lang/fi.yml model/DataObject.php model/SQLQuery.php parsers/ShortcodeParser.php security/ChangePasswordForm.php security/Security.php tests/control/DirectorTest.php tests/core/startup/ParameterConfirmationTokenTest.php tests/dev/FixtureBlueprintTest.php tests/forms/FieldListTest.php tests/forms/MoneyFieldTest.php tests/model/SQLQueryTest.php tests/security/SecurityTest.php	2015-06-02 19:13:38 +12:00
Thierry François	533d5dbd4b	NEW Admin url can now be customized ... The default 'admin/' base URL can now be changed with Director rules	2015-05-31 16:54:00 +03:00
Jonathon Menz	869e69a9b2	BUG: Clicking icon in site tree link fails ... Code removed here intentonally prevented node selection when dragging but at the cost of clicks on site tree icons selecting the node but not loading the link. Since it's possible to drag a site tree item from the title, not just the icon, think it's better to remove this for now (choosing the lesser of two evils). A full fix to prevent node selection should follow, perhaps during an upgrade to jstree.	2015-05-27 09:22:42 -07:00
Damian Mooyman	161cd5c14d	Merge pull request #4203 from scott1702/sharedraftcontent-module-fix ... Fix broken inline buttons	2015-05-26 13:24:59 +12:00
scott1702	f9bd068ffe	Fix broken share draft button	2015-05-26 10:19:47 +12:00
David Craig	8b29732291	Fix left nav styling. ... - Incorrent collapsed state on reload, when 'flush' param is not present. - The content area had a horizontal scroll in split-mode.	2015-05-25 16:55:25 +12:00
David Craig	3bac6fadfe	Add 'sticky' behaviour to left menu	2015-05-25 12:09:14 +12:00
scott1702	2f2ba8600b	Run compass compile	2015-05-25 10:44:31 +12:00
scott1702	fe15016e2b	Updated SiteTree status overlay colours	2015-05-21 11:34:33 +12:00
scott1702	2670828cdc	Change drag/drop icons and only appear on hover	2015-05-20 11:00:16 +12:00
Damian Mooyman	cd1eb1b484	Merge remote-tracking branch 'origin/3' ... Conflicts: admin/tests/CMSFormTest.php	2015-05-19 09:19:47 +12:00
Damian Mooyman	69a244e03f	Update translations	2015-05-14 13:45:03 +12:00
David Craig	232ed3cb4f	Fix panel collapse	2015-05-13 10:15:50 +12:00
Loz Calver	8b4a9a3988	Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135)	2015-05-07 16:01:24 +01:00
Loz Calver	f38836df37	Recompile SCSS	2015-05-07 12:38:18 +01:00
Sean Harvey	2a04713323	Merge pull request #4153 from tractorcow/pulls/3/filter-page-highlight ... API Enable tree filter highlighting	2015-05-07 10:14:33 +12:00
scott1702	8107e86d01	Change cursor for drag + drop icon on hover/active	2015-05-05 16:43:47 +12:00
Damian Mooyman	8863797b76	API Enable tree filter highlighting ... Decoupling of CMS / Framework	2015-05-04 17:06:16 +12:00
Stevie Mayhew	0d94cf15a5	UPDATE: change all instances of $this->request to use appropriate getter/setter	2015-04-30 11:04:08 +12:00
David Craig	fa6f446867	Add styling to handle toggleable descriptions for files	2015-04-28 10:49:17 +12:00
Loz Calver	120b983ad6	FIX: X-Reload & X-ControllerURL didn't support absolute URLs (fixes #4119)	2015-04-27 15:38:54 +01:00
David Craig	3122226273	Add toggleable description to CMS fields	2015-04-24 11:40:29 +12:00
Florian Thoma	3e69ae84c3	fix width of remote url field label to allow right-click-paste	2015-04-21 12:30:10 +10:00
Daniel Hensby	cb7aed46cd	Adding loading spinner to ui-autocomplete fields when making ajax reqests	2015-04-17 11:38:04 +01:00
scott1702	25c9e9141e	Fix z-index bug with sidebar	2015-04-16 15:31:48 +12:00
Ingo Schommer	72a284c9b8	Merge remote-tracking branch 'origin/3' ... Conflicts: core/Constants.php docs/en/05_Contributing/01_Code.md tests/model/SQLQueryTest.php	2015-04-09 16:26:16 +12:00
Damian Mooyman	43f49e8434	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: admin/code/ModelAdmin.php control/Director.php model/SQLQuery.php security/Member.php tests/control/HTTPTest.php tests/model/SQLQueryTest.php tests/security/SecurityTest.php tests/view/SSViewerTest.php	2015-03-31 19:54:15 +13:00
ielmin	b617ef1abd	Hardcoded http:// cause browser warnings	2015-03-26 13:20:21 +11:00
Naomi Guyer	636cddb4bc	BUG: export and print buttons outside button row ... Export and print buttons are appearing outside the button row in model admin, meaning that if the add button is removed (say, by removing the create permission), the buttons are flush with the gridfield.	2015-03-26 14:08:46 +13:00
Loz Calver	2d1fa46be8	Merge pull request #4011 from dhensby/pulls/model-admin-import-naming ... Using sigular name for model import form rather than class name	2015-03-19 21:09:19 +00:00
Daniel Hensby	13cec2ee81	Using sigular name for model import form rather than class name	2015-03-13 13:36:52 +00:00
Damian Mooyman	319b96b48b	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md docs/en/05_Contributing/01_Code.md forms/TreeDropdownField.php model/DataObject.php security/Member.php tests/model/DataObjectTest.php	2015-03-11 11:40:06 +13:00
Damian Mooyman	636784845e	Update admin js translations	2015-03-10 09:13:35 +13:00
Damian Mooyman	a7bd6de2ec	Update translations	2015-03-09 17:11:10 +13:00
Daniel Hensby	d2a3da2203	Making docs gender agnostic	2015-03-07 12:32:04 +00:00
Jonathon Menz	8ee9130bcf	NEW: CMS site tree status icons ... Added coloured status 'dots' to overlay page icons and improved visibility of status labels	2015-03-04 08:43:00 -08:00
Jonathon Menz	5216b67290	Compile latest scss	2015-03-04 08:43:00 -08:00
Ingo Schommer	7c4c30270a	Merge pull request #3901 from flashbackzoo/pulls/ui-dialog-styling ... Improve styling on modal dialogs	2015-02-21 16:27:32 +13:00
Damian Mooyman	a86ed93759	Merge remote-tracking branch 'origin/3' ... Conflicts: docs/en/05_Contributing/01_Code.md	2015-02-20 14:09:38 +13:00
Damian Mooyman	dff65867cc	Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: control/HTTP.php control/HTTPResponse.php docs/en/05_Contributing/01_Code.md forms/CompositeField.php forms/FormAction.php forms/FormField.php forms/InlineFormAction.php forms/NumericField.php forms/TreeDropdownField.php forms/TreeMultiselectField.php templates/forms/TreeDropdownField.ss tests/core/CoreTest.php tests/forms/NumericFieldTest.php tests/model/DataDifferencerTest.php	2015-02-20 10:17:19 +13:00
Daniel Hensby	1d4150bee4	Merge pull request #3787 from uniun/patch-4 ... FIX. Use i18n_plural_name() instead of plural_name()	2015-02-17 10:54:45 +00:00
David Craig	33930597c0	Improve styling on modal dialogs	2015-02-16 08:58:23 +13:00
Aden Fraser	d555b5b26e	Fixed JS error in lib.js (fixes #3481)	2015-02-11 16:59:53 +00:00
Ingo Schommer	d5bb290b8e	Don't update CMS preview on a CMS redirect ... The CMS preview causes unnecessary browser processing by loading a URL which should be considered "in transit" when a CMS redirect is set through the X-ControllerURL HTTP header. The CMS history processing will load this new URL, and cause a new preview URL to be loaded. Fixes https://github.com/silverstripe/silverstripe-translatable/issues/158	2015-02-08 19:58:55 +13:00
Oliver Shaw	7484b4f5d9	Trim ModelAdmin SearchForm values	2015-02-08 19:25:51 +13:00