Commit Graph

16868 Commits

Author SHA1 Message Date
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
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
992413ef59 Merge pull request #5855 from tractorcow/pulls/3.4/fix-mysql-privileges
BUG Fix permission checking code not correctly handling escaped SQL identifiers
2016-08-01 09:48:17 +01:00
Damian Mooyman
7d0b8e6520 BUG Fix permission checking code not correctly handling escaped SQL identifiers
Fixes https://github.com/silverstripe/silverstripe-installer/issues/96
2016-08-01 18:15:30 +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