Damian Mooyman
|
f4b13fb2c4
|
Merge remote-tracking branch 'origin/3.6' into 3
# Conflicts:
# model/DataQuery.php
|
2018-02-05 16:53:15 +13:00 |
|
Damian Mooyman
|
4da99efd5d
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2018-01-31 16:03:42 +13:00 |
|
Daniel Hensby
|
9103816333
|
NEW Add php 7.2 support
|
2018-01-30 16:50:32 +00:00 |
|
Damian Mooyman
|
72e2326731
|
Merge pull request #7798 from kinglozzer/member-groupset-delete
FIX: Fix Member_GroupSet::removeAll() (fixes #3948)
|
2018-01-25 09:20:30 +13:00 |
|
Loz Calver
|
c2cd6b3832
|
FIX: Fix Member_GroupSet::removeAll() (fixes #3948)
|
2018-01-24 17:17:20 +00:00 |
|
Daniel Hensby
|
7897b3bb25
|
Merge branch '3.6' into 3
|
2017-12-14 15:31:51 +00:00 |
|
Daniel Hensby
|
7b0500982e
|
Merge branch '3.5' into 3.6
|
2017-12-14 15:25:36 +00:00 |
|
Daniel Hensby
|
81150c5922
|
FIX Use PHP 5.3 array syntax
|
2017-12-14 15:24:53 +00:00 |
|
Damian Mooyman
|
50aa1f22a6
|
Merge branch '3.6' into 3
|
2017-12-07 13:20:58 +13:00 |
|
Daniel Hensby
|
89166a2ff2
|
Try using parseSortColumn from ArrayList
|
2017-12-06 13:38:58 +00:00 |
|
Daniel Hensby
|
2e43780a8a
|
NEW Add sort columns to DB index automatically
|
2017-12-06 13:38:25 +00:00 |
|
Damian Mooyman
|
d6a93f5215
|
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
# Conflicts:
# security/Member.php
|
2017-12-06 17:26:45 +13:00 |
|
Damian Mooyman
|
91cf85087b
|
Merge remote-tracking branch 'origin/3.5' into 3.6
|
2017-12-06 17:21:09 +13:00 |
|
Damian Mooyman
|
dd4c5417e7
|
Merge pull request #49 from silverstripe-security/pulls/3.5/ss-2017-007
[ss-2017-007] Ensure xls formulae are safely sanitised on output (3.5)
|
2017-12-06 16:25:58 +13:00 |
|
Damian Mooyman
|
44de03da01
|
Merge pull request #53 from silverstripe-security/pulls/3.5/ss-2017-006
[ss-2017-006] Fix user agent invalidation on session startup (3.5 branch)
|
2017-12-06 16:25:39 +13:00 |
|
Damian Mooyman
|
3e2bcaa0b4
|
Merge pull request #54 from silverstripe-security/pulls/3.5/ss-2017-009
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt (3.5 branch)
|
2017-12-06 16:25:19 +13:00 |
|
Daniel Hensby
|
2aa1d8f2c4
|
remove create_function usage
|
2017-12-05 14:20:13 +00:00 |
|
Damian Mooyman
|
25e276cf37
|
[ss-2017-006] Fix user agent invalidation on session startup
|
2017-12-01 10:55:00 +13:00 |
|
Damian Mooyman
|
22ccf3e2f9
|
[ss-2017-007] Ensure xls formulae are safely sanitised on output
CSVParser now strips leading tabs on cells
|
2017-12-01 10:19:48 +13:00 |
|
Damian Mooyman
|
6ba00e829a
|
[ss-2017-009] Prevent disclosure of sensitive information via LoginAttempt
|
2017-11-30 15:53:50 +13:00 |
|
Damian Mooyman
|
bac5f4c8aa
|
Merge branch '3.5' into pulls/3.5/update-pwd-encryption-on-change
|
2017-11-27 14:42:32 +13:00 |
|
Daniel Hensby
|
fd201bc71b
|
Merge branch '3.6' into 3
|
2017-11-25 16:18:46 +00:00 |
|
Daniel Hensby
|
badeb0cc8c
|
Merge branch '3.5' into 3.6
|
2017-11-25 16:17:36 +00:00 |
|
Daniel Hensby
|
09a003bc13
|
Fix deprecated usage of getMock in unit tests
|
2017-11-24 14:48:30 +00:00 |
|
Daniel Hensby
|
2ad3cc07d5
|
FIX Update meber passwordencryption to default on password change
|
2017-11-23 21:17:31 +00:00 |
|
Loz Calver
|
13b02feed7
|
Merge pull request #7602 from dhensby/pulls/3.5/fix-filter-any-inner-join
FIX ManyMany link table joined with LEFT JOIN
|
2017-11-16 13:48:07 +00:00 |
|
Daniel Hensby
|
4f3deb13e0
|
TEST filterAny on many_many relations return correct items
|
2017-11-16 11:10:12 +00:00 |
|
Daniel Hensby
|
3d3096485b
|
TEST Uppercase file extensions return correct mime type
|
2017-11-16 11:01:25 +00:00 |
|
Daniel Hensby
|
0baa996cc0
|
Merge branch '3.6' into 3
|
2017-11-14 12:13:08 +00:00 |
|
Daniel Hensby
|
4731d3c671
|
Merge branch '3.5' into 3.6
|
2017-11-14 12:00:53 +00:00 |
|
Andrew Aitken-Fincham
|
c4a50a3d10
|
Spelling in DataQueryTest
|
2017-10-20 12:00:35 +01:00 |
|
Robbie Averill
|
2f579b64cb
|
FIX Files without extensions (folders) do not have a trailing period added
|
2017-10-18 09:25:27 +13:00 |
|
Daniel Hensby
|
b49d1d7fbd
|
Merge branch '3.6' into 3
|
2017-09-28 17:17:19 +01:00 |
|
Daniel Hensby
|
bd7abc73de
|
Merge branch '3.5.5' into 3.6.2
|
2017-09-20 16:26:30 +01:00 |
|
Daniel Hensby
|
091d99f599
|
FIX Authenticators are more resilient to incomplete configuration
|
2017-09-12 15:57:03 +01:00 |
|
Daniel Hensby
|
c09305be9e
|
Merge branch '3.6' into 3
|
2017-08-17 14:31:57 +01:00 |
|
Daniel Hensby
|
921f615e19
|
Merge branch '3.5' into 3.6
|
2017-08-17 14:14:31 +01:00 |
|
Daniel Hensby
|
1ae07ac2a3
|
TEST Prove LastEdited is updated when no changes are made
|
2017-08-16 22:26:47 +01:00 |
|
Garion Herman
|
6ad19495a2
|
Add test coverage for auth failure after TempID expires.
|
2017-07-27 12:45:35 +01:00 |
|
Daniel Hensby
|
90be7e806d
|
Merge branch '3.5' into 3.6
|
2017-07-19 15:40:01 +01:00 |
|
Daniel Hensby
|
7b6aad8a65
|
Revert "TreeDropDown performance boost."
|
2017-07-19 12:44:43 +01:00 |
|
Daniel Hensby
|
297755d323
|
Merge branch '3.6' into 3
|
2017-07-18 12:00:33 +01:00 |
|
Daniel Hensby
|
7e732da709
|
Merge branch '3.5' into 3.6
|
2017-07-18 12:00:04 +01:00 |
|
Daniel Hensby
|
36666eb348
|
Merge branch '3.6' into 3
|
2017-07-14 14:53:06 +01:00 |
|
Robbie Averill
|
48d9088ab4
|
Separate composer.lock load method and add test mocking it
|
2017-07-11 12:22:25 +12:00 |
|
Loz Calver
|
960a0f8343
|
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145)
|
2017-07-10 09:41:36 +01:00 |
|
Roman Schmid
|
a6db16b229
|
Fix OS X issue with Convert::html2raw, HTMLText::FirstSentence, HTMLText::Summary and Text::FirstSentence.
Use unicode modifier for regular expressions that deal with whitespace.
Added unit-tests to ensure no invalud utf-8 gets generated by these methods.
|
2017-07-10 09:49:55 +02:00 |
|
Robbie Averill
|
ee4d8b4d4e
|
NEW Add new SilverStripeVersionProvider to provider module versions
|
2017-07-04 23:29:29 +12:00 |
|
Daniel Hensby
|
399c46579a
|
Merge branch '3.6' into 3
|
2017-06-27 13:15:14 +01:00 |
|
Daniel Hensby
|
1e5592a3d9
|
Merge branch '3.5' into 3.6
|
2017-06-27 13:14:39 +01:00 |
|