16736 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	7026da20db	BUG Make template lookup use 'type' correctly	2016-08-10 15:52:15 +12:00
Hamish Friedlander	0fa39b591f	Merge pull request #5874 from open-sausages/pulls/4.0/fix-incorrect-versioned-basetable ... BUG Fix incorrect use of baseClass as baseTable	2016-08-10 07:17:44 +07:00
Daniel Hensby	34c8324673	Merge pull request #5877 from open-sausages/pulls/4.0/remove-data-formatters ... API remove DataFormatter class and all subclasses	2016-08-09 17:02:51 +01:00
Damian Mooyman	cb1f4335a0	API remove DataFormatter class and all subclasses ... Cleanup of #5461	2016-08-09 15:49:11 +12:00
Damian Mooyman	01a13dcba9	BUG Fix incorrect use of baseClass as baseTable	2016-08-08 17:44:46 +12:00
Hamish Friedlander	f79c11f7f8	Merge pull request #5870 from open-sausages/pulls/4.0/move-NestedController ... API Move NestedController from cms to framework	2016-08-05 11:23:34 +12:00
Damian Mooyman	1c3ec19353	API Move NestedController from cms to framework	2016-08-05 10:56:26 +12:00
Hamish Friedlander	2ea65e9064	Merge pull request #5795 from open-sausages/features/4.0/gridfield-styles ... Features/4.0/gridfield styles	2016-08-04 11:29:38 +12:00
Paul Clarke	b9445511b7	Bootstrap GridField	2016-08-03 18:35:18 +12:00
Daniel Hensby	96213924a2	Merge pull request #5866 from tractorcow/pulls/4.0/custom-script-type ... API Allow custom 'type' option for scripts	2016-08-02 11:47:18 +01:00
Damian Mooyman	4ca3d1dc94	API Allow custom 'type' option for scripts ... Fixes #5829	2016-08-02 18:49:13 +12:00
Hamish Friedlander	18465e783f	Merge pull request #5854 from open-sausages/pulls/4.0/controller-link-standardise ... API Add $action parameter to Controller::Link	2016-08-02 16:42:25 +12:00
Hamish Friedlander	76dd9b339f	Merge pull request #5861 from open-sausages/pulls/4.0/fix-uploadfield-buttons ... BUG Fix `[buttons]` appearing instead of actual buttons when uploading files	2016-08-02 13:28:59 +12:00
Damian Mooyman	12adba3d34	BUG Fix [buttons] appearing instead of actual buttons when uploading files	2016-08-02 11:55:25 +12:00
Damian Mooyman	9188628ae3	API Add $action parameter to Controller::Link	2016-08-02 10:27:55 +12:00
Daniel Hensby	59bba54b30	Merge pull request #5592 from silverstripe-terraformers/fixes/diff-dbfield-check ... Adjusted dbObject order of execution and make ignoreFields chainable	2016-08-01 14:10:24 +01:00
Christopher Joe	333f27badd	DataDifferencer ignoreFields chainable, adjusted dbObject to check that the field is a db field	2016-08-01 21:47:39 +12:00
Daniel Hensby	e0a51bfb02	Merge pull request #5853 from silverstripe-terraformers/fixes/datefield-disabled ... Disable datepicker for disabled or readonly fields	2016-08-01 01:46:44 +01:00
Christopher Joe	d93d9bc3c4	Disable datepicker for disabled or readonly fields, they were still editable through the picker	2016-08-01 11:47:48 +12:00
Daniel Hensby	d42826e2ba	Merge pull request #5851 from open-sausages/pulls/4.0/fix-hash-navigation ... BUG Fix hash link navigation in CMS	2016-07-29 11:26:07 +01:00
Damian Mooyman	6468f78b4b	Merge pull request #5724 from open-sausages/pulls/4.0/history-panel-tidyup ... History panel forms style tidy up	2016-07-29 17:04:51 +12:00
Damian Mooyman	06ae50e4f5	BUG Fix hash link navigation in CMS	2016-07-29 15:58:23 +12:00
Oly Su	89508a8f19	Tidy up history panel	2016-07-29 15:54:00 +12:00
Paul	e2826927a7	Adjust width of select dropdown (#5850)	2016-07-29 10:48:12 +12:00
Sam Minnée	c5d662b4fe	Merge pull request #5832 from open-sausages/pulls/4.0/bootify-forms-addpage ... Add page styles based on new bootstrap forms	2016-07-28 18:13:25 +12:00
Hamish Friedlander	4d2fd04c64	FIX Behat preview mode finder being too specific (#5846)	2016-07-28 17:59:31 +12:00
Damian Mooyman	d15b19d208	Fix merge regressions in add-link fixes	2016-07-28 17:03:46 +12:00
Damian Mooyman	a868ecdbfa	BUG Correct include paths for legacy JS files	2016-07-28 16:34:28 +12:00
Damian Mooyman	6e74b57c36	BUG Fix issue with gulpfile.js not compiling client/src/legacy dir ... BUG Make SelectionGroup.ss and SelectionGroup.js work together BUG Fix for IE visual indentation of composite field	2016-07-28 16:32:40 +12:00
Oly Su	2805baecd3	Added missing bootstrap form messages ... Align top of selection-group and label Fix styles for overly nested composite fields Step label added and new templates for forms	2016-07-28 16:32:40 +12:00
Damian Mooyman	c556b01071	API Update core templates for CompositeField / SelectionGroup.ss	2016-07-28 16:32:40 +12:00
Damian Mooyman	7a095b1a70	Merge pull request #5845 from open-sausages/fix/behat_tests ... Fix "Insert Link" dialog in HTMLEditorField. CSS still needs work.	2016-07-28 16:30:51 +12:00
Hamish Friedlander	1f8c2f781b	Fix "Insert Link" dialog in HTMLEditorField. CSS still needs work.	2016-07-28 16:01:50 +12:00
Damian Mooyman	0c4d9a90c0	Merge pull request #5840 from sminnee/correct-classname-values ... FIX: Remap obsolete ClassName values.	2016-07-26 09:59:50 +12:00
Daniel Hensby	a7d17ebb75	Merge branch '3'	2016-07-25 12:29:13 +01:00
Daniel Hensby	7391ba6229	Merge branch '3.4' into 3	2016-07-25 11:46:06 +01:00
Loz Calver	12e32debc4	Merge pull request #5839 from tractorcow/pulls/3.4/fix-editor-js ... BUG Fix regression in missing require_js from #4259	2016-07-25 09:18:55 +01:00
Loz Calver	73d418dbee	Merge pull request #5838 from tractorcow/pulls/4.0/minor-error-string ... MINOR Clarify string concatenation to improve readability	2016-07-25 09:17:14 +01:00
Sam Minnee	f9b4872583	FIX: Remap obsolete ClassName values. ... With the namespacing work, there are a number of classname values that need to be updated in existing databases. This change to DatabaseAdmin carries out the remapping as part of dev/build.	2016-07-25 18:37:17 +12:00
Damian Mooyman	020d0c181e	Changelog for https://github.com/silverstripe/silverstripe-cms/pull/1556 (#5837)	2016-07-25 18:27:38 +12:00
Damian Mooyman	9c7c7f6aa9	BUG Fix regression in missing require_js from #4259	2016-07-25 17:50:56 +12:00
Damian Mooyman	a809e80d01	API Convert CMS forms to bootstrap ... NEW Add cms-forms microtheme to cater to bootstrap's needs. Note that the old SS3 assets section is buggy as a result of this change.	2016-07-25 17:24:26 +12:00
Damian Mooyman	43efe73fc7	MINOR Clarify string concatenation to improve readability ... Replaces #5802	2016-07-25 16:56:23 +12:00
Daniel Hensby	c130e5550d	Merge pull request #5834 from tractorcow/pulls/4.0/fix-admin ... BUG Fix regressions in custom admin url from #3274	2016-07-22 09:31:03 +01:00
Damian Mooyman	7c24703804	BUG Fix regressions in custom admin url from #3274	2016-07-22 10:56:35 +12:00
Hamish Friedlander	46b15a93ca	Merge pull request #5830 from open-sausages/pulls/4.0/nested-themes-fixes ... API Abstract ThemeManifest into ThemeList	2016-07-21 15:13:53 +12:00
Damian Mooyman	20daf1f8e1	API Abstract ThemeManifest into ThemeList ... BUG Fix Requirements not resolving $default theme	2016-07-21 12:11:25 +12:00
Daniel Hensby	f548ddf8a8	Merge branch '3'	2016-07-20 21:44:47 +01:00
Daniel Hensby	340a48306b	Merge branch '3.4' into 3	2016-07-20 19:48:17 +01:00
Daniel Hensby	cf247534d5	Merge branch '3.3' into 3.4	2016-07-20 19:43:41 +01:00