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 |
|
Manuel Teuber
|
666ce26929
|
FIX: Permission::checkMember() use of undefined variable $codes
|
2015-10-07 16:02:36 +13:00 |
|
Damian Mooyman
|
557c4211fa
|
Update changelog
|
2015-10-07 09:51:24 +13:00 |
|
Elvinas L.
|
19c754bf9a
|
Fixed tests
|
2015-10-06 18:59:39 +03:00 |
|
Elvinas L.
|
ee6b250a46
|
Ajustments
Altered code to according to the feedback and added phpdoc.
|
2015-10-06 18:58:22 +03:00 |
|
Damian Mooyman
|
4af684f2f3
|
Added 3.2.0-rc2 changelog
|
2015-10-06 18:49:35 +13:00 |
|
Damian Mooyman
|
0cd3569fb9
|
Update translations
|
2015-10-06 18:33:16 +13:00 |
|
Ingo Schommer
|
0c06964cf7
|
Merge pull request #4655 from tractorcow/pulls/3.2/better-imagick
BUG Imagick tests compare image dimensions rather than image hashes
|
2015-10-06 17:13:05 +13:00 |
|
Damian Mooyman
|
df805af67b
|
BUG Imagick tests compare image dimensions rather than image hashes
|
2015-10-06 16:35:44 +13:00 |
|
Ingo Schommer
|
547a7f60f3
|
Merge pull request #4654 from tractorcow/pulls/3.2/fix-tree-dupe-id
BUG Fix duplicate HolderID on TreeDropdownField
|
2015-10-06 15:30:02 +13:00 |
|
Ingo Schommer
|
7ec24a1303
|
Merge pull request #4653 from tractorcow/pulls/3.2/imagick
BUG fix imagick interface and add to travis
|
2015-10-06 15:25:45 +13:00 |
|
Damian Mooyman
|
ad42f802c4
|
BUG Fix duplicate HolderID on TreeDropdownField
|
2015-10-06 12:54:35 +13:00 |
|
Damian Mooyman
|
6c117cd629
|
BUG fix imagick interface and add to travis
|
2015-10-06 12:40:24 +13:00 |
|
Damian Mooyman
|
9953c5f9c0
|
Merge pull request #4644 from kinglozzer/pulls/gfsortableheader-hasdbfield
FIX: GridFieldSortableHeader incorrectly reporting fields as sortable
|
2015-10-06 11:55:28 +13:00 |
|
Damian Mooyman
|
278caa86f4
|
Merge pull request #4636 from spekulatius/converting-spaces-to-tabs
converting spaces as intentation to tabs
|
2015-10-06 11:51:45 +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
|
cb55a0a621
|
FIX: GridFieldSortableHeader incorrectly reporting fields as sortable
|
2015-09-30 16:25:17 +01:00 |
|
Will Morgan
|
85654a495f
|
Merge pull request #4635 from spekulatius/adding-space-before-casting
adding a space before casting into a different type
|
2015-09-28 11:17:08 +01:00 |
|
Will Morgan
|
ecf06f9130
|
Merge pull request #4634 from spekulatius/remove-trailing-spaces
remove trailing spaces in the codebase
|
2015-09-28 11:16:42 +01:00 |
|
Peter Thaleikis
|
5fda95d951
|
converting spaces as intentation to tabs
|
2015-09-28 22:21:30 +13:00 |
|
Peter Thaleikis
|
21216b47ab
|
remove trailing spaces in the codebase
|
2015-09-28 22:21:08 +13:00 |
|
Peter Thaleikis
|
e6084b7ad2
|
adding a space before casting into a different type
|
2015-09-28 22:21:02 +13:00 |
|
Daniel Hensby
|
e2fbbda2fd
|
Merge pull request #4625 from kinglozzer/pulls/editform-field-focus
FIX: Issues with field focus in edit forms (fixes #4621)
|
2015-09-24 17:52:25 +01:00 |
|
Loz Calver
|
8f0f6475da
|
FIX: Issues with field focus in edit forms (fixes #4621)
|
2015-09-23 15:19:24 +01:00 |
|
Loz Calver
|
0d89a13c2d
|
FIX: GridFieldDetailForm failing to save many_many relations
|
2015-09-22 14:46:57 +01:00 |
|
Will Morgan
|
6261b7eb53
|
Merge pull request #4595 from kinglozzer/pulls/uploadfield-file-link-fix
FIX: Editing existing file links in HtmlEditorField was broken
|
2015-09-16 10:33:40 +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
|
8ddb4c7ffe
|
Merge remote-tracking branch 'origin/3.1.14' into 3.1
|
2015-09-15 11:07:14 +12:00 |
|
Damian Mooyman
|
00caeb700d
|
Added 3.1.14 changelog
Update translations
|
2015-09-15 10:58:15 +12:00 |
|
Damian Mooyman
|
b7f3095098
|
Merge pull request #4602 from SpiritLevel/patch-2
FIX: #103 in silverstripe-installer
|
2015-09-14 15:06:36 +12:00 |
|
David Alexander
|
81ca74bc30
|
FIX: #103
See also #58
|
2015-09-14 13:41:32 +12:00 |
|
Damian Mooyman
|
6699f65b3f
|
Merge pull request #4594 from kinglozzer/uploadfield-attach-nonexistent
FIX: UploadField error when attempting to attach non-existent file IDs
|
2015-09-11 16:33:42 +12:00 |
|
Loz Calver
|
6056e9cb1b
|
FIX: Editing existing file links in HtmlEditorField was broken
|
2015-09-10 09:57:50 +01:00 |
|
Ingo Schommer
|
f935f2f25e
|
Merge pull request #3 from silverstripe-security/fixes/ss-2015-020
[ss-2015-020]: Prevent possible Privilege escalation
|
2015-09-10 16:51:13 +12:00 |
|
Damian Mooyman
|
7367cf54c4
|
[ss-2015-020]: Prevent possible Privilege escalation
|
2015-09-10 13:01:24 +12:00 |
|
Damian Mooyman
|
45b22c788e
|
BUG Fix missing framework/admin/tests
|
2015-09-10 11:06:15 +12:00 |
|
Loz Calver
|
06cc18526a
|
FIX: UploadField error when attempting to attach non-existent file IDs
|
2015-09-09 09:24:56 +01:00 |
|
Damian Mooyman
|
6ad277c412
|
Fix merge regressions
|
2015-09-09 16:12:12 +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 |
|
Ingo Schommer
|
4c73721bab
|
Merge pull request #1 from silverstripe-security/fixes/ss-2015-016
[ss-2015-016]: Fix XSS in install.php
|
2015-09-09 09:48:56 +12:00 |
|
Daniel Hensby
|
00385792c5
|
Merge pull request #4588 from tractorcow/fix/3.1/admin-tests
BUG Fix missing framework/admin/tests
|
2015-09-08 09:57:53 +01:00 |
|
Christopher Pitt
|
751d77386c
|
Merge pull request #2 from silverstripe-security/fixes/ss-2015-015
[ss-2015-015]: Fix insecure returnURL in DatabaseAdmin
|
2015-09-08 10:53:59 +12:00 |
|
Damian Mooyman
|
d8fd64c3e2
|
[ss-2015-016]: Fix XSS in install.php
|
2015-09-08 10:08:28 +12:00 |
|
Damian Mooyman
|
7192932022
|
[ss-2015-015]: Fix insecure returnURL in DatabaseAdmin
|
2015-09-08 09:48:09 +12:00 |
|
Loz Calver
|
b87c2ae78d
|
Merge pull request #4589 from johndalangin/patch-3
Typo Correction
|
2015-09-07 10:56:27 +01:00 |
|
johndalangin
|
1b661c9f17
|
Typo Correction
|
2015-09-07 17:08:49 +08:00 |
|
Loz Calver
|
d0b53b5135
|
Merge pull request #4585 from javabrett/patch-1
Update 02_Composer.md
|
2015-09-07 09:23:08 +01:00 |
|
Damian Mooyman
|
96d20bc180
|
BUG Fix missing framework/admin/tests
|
2015-09-07 18:04:56 +12:00 |
|
Brett Randall
|
e0b0c17685
|
Update 02_Composer.md
Fixed typo, "in to thier" -> "into their".
|
2015-09-05 13:50:57 +10:00 |
|