Commit Graph

18996 Commits

Author SHA1 Message Date
Damian Mooyman
62a242154e [ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField 2016-08-15 13:24:06 +12:00
Daniel Hensby
1c7d5de51b [SS-2016-014] FIX Autologin cookies are ignored if autologin is disabled 2016-08-15 13:24:06 +12:00
Daniel Hensby
6817c57f64 [SS-2016-013] FIX Uncasted member name 2016-08-15 13:21:14 +12:00
Daniel Hensby
6606d98663 [SS-2016-011] ChangePasswordForm does not check $member->canLogin before login
This could be used as a way to circumvent login restrictions by using the change password feature to log users in that are unable to login for reasons other than too many password attempts
2016-08-15 13:20:02 +12:00
Daniel Hensby
298f61521c [SS-2016-008] Reset Member::Salt on password change 2016-08-15 13:19:02 +12:00
Damian Mooyman
4d9f929ca3 Update translations 2016-08-15 13:12:49 +12:00
Daniel Hensby
66a04158f3 Merge pull request #5887 from open-sausages/pulls/4.0/remove-modelsidebar
Remove obsolete template ModelSidebar.ss
2016-08-12 12:26:28 +01:00
Daniel Hensby
fc5b52a0b4 Merge pull request #5888 from open-sausages/pulls/4.0/remove-editor-toolbar
Remove obsolete template Editor_toolbar.ss
2016-08-12 12:25:58 +01:00
Ingo Schommer
7322c57fc8 Merge pull request #5882 from open-sausages/pulls/4.0/redux-devtools
Switch redux-logger to redux devtools for easier debugging
2016-08-12 16:11:58 +12:00
Christopher Joe
42d36da3fb Switch redux-logger to redux devtools for easier debugging 2016-08-12 16:11:33 +12:00
Damian Mooyman
3c1a5d2a46 Merge pull request #5872 from dhensby/pulls/3/injector-for-cmslogin
FIX Use create syntax for CMSMemberLoginForm remember me form
2016-08-12 14:10:56 +12:00
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