16932 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Damian Mooyman	14e0cd52bd	Merge pull request #5869 from micmania1/patch-11 ... FIX don't look in node_modules	2016-08-12 13:52:23 +12:00
Hamish Friedlander	3125852648	Merge pull request #5886 from open-sausages/pulls/4.0/fix-shortcode-test ... BUG Fix usage of $this as closure argument	2016-08-12 06:43:42 +07:00
Damian Mooyman	56f5a9e06b	Remove obsolete template Editor_toolbar.ss	2016-08-12 11:38:55 +12:00
Damian Mooyman	64ec1f0b03	Remove obsolete template ModelSidebar.ss	2016-08-12 11:08:03 +12:00
Damian Mooyman	ed7fe65156	BUG Fix usage of $this as closure argument	2016-08-12 09:49:23 +12:00
Daniel Hensby	b40d2beac6	Merge pull request #5884 from jonom/fix-can-filter ... FIX include related fields on filter/sort check	2016-08-11 19:34:49 +01:00
Jonathon Menz	d4114b3dce	FIX include related fields on canFilter() check ... closes #5576	2016-08-11 10:26:18 -07:00
Daniel Hensby	56f0b72e8d	FIX ETag header now properly quoted	2016-08-11 15:49:29 +01:00
Daniel Hensby	988af4582d	Merge pull request #5862 from silverstripe-terraformers/fixes/batch-actions-checkboxes ... Fix batch action permissions not applied to new nodes loaded	2016-08-11 14:26:27 +01:00
Hamish Friedlander	6c3a34ab1d	Merge pull request #5875 from open-sausages/pulls/4.0/namespace-cms ... API Upgrade for CMS namespace	2016-08-11 09:35:51 +07:00
Hamish Friedlander	f95d577c87	Merge pull request #5881 from open-sausages/pulls/4.0/cmsmenu-byclass ... API Add CMSMenu::remove_menu_class to remove items by class instead of code	2016-08-11 08:03:26 +07:00
Damian Mooyman	cf6f882e29	API Ensure that i18n plural / singular names use shortname prior to namespaced translations	2016-08-11 11:51:02 +12:00
Damian Mooyman	6005a1c2b2	API Upgrade for silverstripe CMS namespace changes	2016-08-11 11:51:02 +12:00
Damian Mooyman	c7387ff45f	API Upgrade to SilverStripe\CMS namespace	2016-08-11 11:50:18 +12:00
Damian Mooyman	afdae4937e	API Add CMSMenu::remove_menu_class to remove items by class instead of code	2016-08-11 11:47:56 +12:00
Christopher Joe	7448fb7bae	Fix batch action permissions not applied to new nodes loaded	2016-08-11 11:41:07 +12:00
Hamish Friedlander	a9d66b5152	Merge pull request #5873 from open-sausages/pulls/4.0/template-lookup-type ... BUG Make template lookup use 'type' correctly	2016-08-11 05:56:48 +07:00
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
Daniel Hensby	86add3e021	FIX Use create syntax for CMSMemberLoginForm remember me form	2016-08-07 20:20:20 +01:00
Damian Mooyman	7de5b998e1	Merge 3.4 into 3	2016-08-05 19:12:25 +12:00
Damian Mooyman	f0b32f1483	Merge 3.4.1 into 3.4	2016-08-05 19:11:55 +12:00
Damian Mooyman	2299b8e67a	Added 3.4.1-rc1 changelog	2016-08-05 18:52:14 +12:00
Damian Mooyman	eb11c47d1c	Update translations	2016-08-05 17:57:46 +12:00
Damian Mooyman	ca754eb887	Merge 3.3 into 3.4 ... # Conflicts: # admin/javascript/lang/fa_IR.js # admin/javascript/lang/it.js # admin/javascript/lang/src/fa_IR.js # admin/javascript/lang/src/it.js # lang/cs.yml # lang/eo.yml # lang/fa_IR.yml # lang/fi.yml # lang/it.yml # lang/sk.yml	2016-08-05 16:48:26 +12:00
Damian Mooyman	e1352b6494	Merge 3.3.3 into 3.3	2016-08-05 16:41:13 +12:00
Damian Mooyman	958344eb5d	Added 3.3.3-rc1 changelog	2016-08-05 16:33:22 +12:00
Damian Mooyman	0d5ae23f2b	Merge 3.2 into 3.3	2016-08-05 14:36:35 +12:00
Damian Mooyman	66668450ed	Merge 3.2.5 into 3.2	2016-08-05 14:33:10 +12:00
Damian Mooyman	6e6451fa71	Added 3.2.5-rc1 changelog	2016-08-05 13:24:35 +12:00
Damian Mooyman	cb39f2ef27	Merge 3.1 into 3.2 ... # Conflicts: # admin/javascript/lang/cs.js # admin/javascript/lang/de.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/eo.js # admin/javascript/lang/src/es.js # admin/javascript/lang/src/fa_IR.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 # javascript/lang/fa_IR.js # javascript/lang/src/fa_IR.js	2016-08-05 11:41:04 +12:00
Damian Mooyman	3fb3a1bd7d	Merge 3.1.20 into 3.1	2016-08-05 11:31:56 +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	ec969c21e6	Added 3.1.20-rc1 changelog	2016-08-05 11:17:57 +12:00
Damian Mooyman	9805544cee	Update translations	2016-08-05 11:06:51 +12:00
Damian Mooyman	1c3ec19353	API Move NestedController from cms to framework	2016-08-05 10:56:26 +12:00
Michael Strong	5fcdf8c313	FIX don't look in node_modules ... Its a scary place. And can sometimes take 5 minutes+ to get back out.	2016-08-04 22:54:34 +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
Damian Mooyman	e683c97f6e	Merge pull request #5867 from andrewandante/MINOR_getAuthenticator-returns-default ... Modify getAuthenticator to fall back to get_default_authenticator	2016-08-03 12:07:35 +12:00
Andrew Aitken-Fincham	66f2e6811b	modify getAuthenticator to fall back to get_default_authenticator	2016-08-03 10:36:43 +12:00
Daniel Hensby	d083c9622a	Merge pull request #4394 from simonwinter/patch-1 ... Update 05_Typography.md	2016-08-02 21:27:56 +01:00
Daniel Hensby	af3412a4c2	Merge pull request #5340 from dnadesign/fixToGridFieldLoadingWrongCurrentPage ... fix to grid field loading wrong current page id when using multiple tabs	2016-08-02 12:44:11 +01:00
Daniel Hensby	e7c6509196	Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3	2016-08-02 12:00:04 +01: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
Damian Mooyman	cd80d501f9	BUG Fix unset config options returning isset() = true ... Fixes #4791	2016-08-02 18:07:55 +12:00