Damian Mooyman
46cbe809ac
Merge remote-tracking branch 'origin/3.1' into 3.2
...
# Conflicts:
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
# docs/en/03_Upgrading/index.md
# docs/en/05_Contributing/01_Code.md
# forms/TreeMultiselectField.php
# security/Permission.php
2016-01-19 14:00:19 +13:00
Daniel Hensby
4335d8ed22
FIX Members with no ID inherit logged in user permission
2016-01-05 08:16:18 +00:00
Damian Mooyman
66b3a6a2c5
Merge pull request #4840 from mateusz/guard
...
BUG Guard against users being added to all groups on unsaved Group.
2015-12-22 16:29:09 +13:00
Loz Calver
d265c9b733
FIX: Allow omitting a value for OptionsetField submissions ( fixes #4824 )
2015-12-14 16:50:22 +00:00
Mateusz Uzdowski
5a21b2fb15
BUG Guard against users being added to all groups on unsaved Group.
...
If ->Members()->add() is called on an unsaved group (with ID 0), the
collateFamilyIDs() will errorneously return all root Groups thinking
it's looking for Groups with ParentID=0. As a result, the Member will be
added to all root groups, instead of just the selected group and all its
children.
2015-12-11 14:51:51 +13:00
Christopher Darling
e9b833f5f0
FIX: ConfirmedPassword field correctly reports mismatching passwords
...
added testFormValidation to prove #4780
2015-11-20 15:56:27 +00:00
Loz Calver
68d99be24b
FIX: Hidden errors for composite fields nested inside FieldGroups ( fixes #4773 )
2015-11-17 16:34:17 +00:00
Damian Mooyman
fd6ae72e1d
Merge remote-tracking branch 'origin/3.2.1' into 3.2
2015-11-16 16:39:15 +13:00
Hamish Friedlander
b61d6dcd57
[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
2015-11-13 15:20:09 +13:00
Damian Mooyman
fea1158d19
BUG Fix print button only displaying first page
2015-11-12 14:59:08 +13:00
Damian Mooyman
245e0aae2f
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
2015-11-11 17:50:02 +13:00
Ingo Schommer
ac4342d81d
[ss-2015-022]: XML escape RSSFeed $link parameter
2015-11-11 17:46:39 +13:00
Damian Mooyman
97f21fddb3
[ss-2015-021] Fix rewrite hash links XSS
2015-11-11 17:46:27 +13:00
Damian Mooyman
bc1b2893ac
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
2015-11-11 16:56:19 +13:00
Ingo Schommer
4f55b6a115
[ss-2015-022]: XML escape RSSFeed $link parameter
2015-11-11 16:54:04 +13:00
Damian Mooyman
132e9b3e2f
[ss-2015-021] Fix rewrite hash links XSS
2015-11-11 16:52:53 +13:00
Damian Mooyman
0272e443f4
BUG Prevent dev/build continually regenerating Number field type
2015-11-11 09:21:50 +13:00
Daniel Hensby
d380252488
Merge pull request #4760 from tractorcow/pulls/3.2/fix-empty-filter
...
BUG Correct behaviour for empty filter array (as per 3.1)
2015-11-10 01:48:47 +00:00
Damian Mooyman
732e705bbf
BUG Correct behaviour for empty filter array (as per 3.1)
2015-11-10 14:24:45 +13:00
Will Morgan
6d85d618b6
Merge pull request #4751 from dhensby/pulls/plural-fix
...
Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly
2015-11-06 16:55:25 +00:00
Daniel Hensby
dad3784621
Fixing issue where words ending ay/ey/iy/oy/uy are not pluralised correctly
2015-11-06 16:23:45 +00:00
Garion Herman
6a1a3bf182
Corrected TotalItems() method to use Count(). Added test coverage. ( fixes #4646 )
2015-11-04 00:20:45 +13:00
Damian Mooyman
2813f94124
BUG Ensure that filters on any fixed field are scoped to the base data table
...
Fixes #4700
2015-10-30 16:26:14 +13:00
Damian Mooyman
db16248b9a
BUG Fix broken InlineFormAction
2015-10-29 10:48:49 +13:00
Daniel Hensby
1974e79d71
Allow multi-line enum declarations
2015-10-15 16:23:19 +01:00
Patrick Nelson
f192a6ecaf
FIX #4392 : Ensure headers are checked first before being clobbered by globally maintained state. Also ensuring tests utilize separate responses for isolation.
2015-10-09 13:50:33 -04:00
Daniel Hensby
95ae107c4c
Merge pull request #4486 from uniun/patch-2
...
BUGFIX. FulltextFilter requires table identifiers in match query
2015-10-07 10:28:15 +01:00
Elvinas L.
630062c0e0
Removed whitespaces
2015-10-07 09:33:02 +03:00
Elvinas L.
19c754bf9a
Fixed tests
2015-10-06 18:59:39 +03:00
Damian Mooyman
df805af67b
BUG Imagick tests compare image dimensions rather than image hashes
2015-10-06 16:35:44 +13:00
Damian Mooyman
b8335793d6
Merge pull request #4620 from kinglozzer/pulls/manymanyextrafields-compat
...
FIX: GridFieldDetailForm failing to save many_many relations
2015-10-06 11:49:56 +13:00
Loz Calver
0d89a13c2d
FIX: GridFieldDetailForm failing to save many_many relations
2015-09-22 14:46:57 +01:00
Damian Mooyman
c4710b2272
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/GroupImportForm.php
admin/code/MemberImportForm.php
tests/model/DataListTest.php
2015-09-15 13:18:47 +12:00
Damian Mooyman
7367cf54c4
[ss-2015-020]: Prevent possible Privilege escalation
2015-09-10 13:01:24 +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
Will Morgan
17e97babf1
Merge pull request #4549 from kinglozzer/pulls/recursion-arraylist-sort
...
FIX: Recursion errors when sorting objects with circular dependencies (fixes #4464 )
2015-09-01 16:42:17 +01:00
Loz Calver
0943b3b1a0
FIX: Recursion errors when sorting objects with circular dependencies ( fixes #4464 )
2015-09-01 09:37:06 +01:00
Damian Mooyman
e86b45bf5d
BUG Remove html5 number field due to insufficient localisation support
2015-09-01 12:23:35 +12:00
Ingo Schommer
28554dbe94
Merge pull request #4504 from dhensby/pulls/fields-fix
...
When loading data into a form, make sure its using ALL fields
2015-08-28 08:38:49 +12:00
Daniel Hensby
cffb11e568
TEST Ensure data is loaded into complete FieldList
2015-08-27 17:56:22 +01:00
Daniel Hensby
2d4b743090
FIX Members can access their own profiles in CMS
2015-08-26 15:47:51 +01:00
Loz Calver
99a8a81e9a
Fix issues with tests and "subfolder" URLs
2015-08-25 11:49:01 +12:00
Damian Mooyman
1686c83826
Revert #3425 #3396 to restore deprecated functionality
...
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
6eede57ff2
Fix issue where Access All CMS Sections doesnt work
2015-08-20 22:30:43 +01: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
Daniel Hensby
910156b84c
Merge pull request #4443 from JorisDebonnet/base64url
...
Url-safe alternative for base64_encode in resampled Image filenames
2015-08-10 13:56:35 +01:00
Damian Mooyman
cf9d2d12ac
BUG Fix duplicate primary key crash on duplicate
2015-08-10 09:54:30 +12:00
JorisDebonnet
18e163d985
Url-safe alternative for base64_encode in resampled Image filenames
2015-08-05 20:59:40 +02:00
Loz Calver
687de33d0d
Ensure ClassInfo is backwards compatible with non-existant classes
2015-08-04 15:07:07 +01:00
Damian Mooyman
1532eeb69e
Merge pull request #4459 from kinglozzer/test-path-fixes
...
Fix issues with tests and "subfolder" URLs
2015-07-31 21:16:46 +12:00
