Commit Graph

2986 Commits

Author SHA1 Message Date
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
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
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
091d99f599
FIX Authenticators are more resilient to incomplete configuration 2017-09-12 15:57:03 +01:00
Daniel Hensby
1ae07ac2a3
TEST Prove LastEdited is updated when no changes are made 2017-08-16 22:26:47 +01:00
Daniel Hensby
7b6aad8a65 Revert "TreeDropDown performance boost." 2017-07-19 12:44:43 +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
Mojmir Fendek
5b6a39e71a TreeDropDown performance boost. 2017-06-19 15:10:23 +12:00
Loz Calver
2afe018dc7
FIX: Ensure HasManyList foreign ID filter includes table name (fixes #7023) 2017-06-15 12:06:30 +01:00
Loz Calver
4ad2cae864
FIX: Upload_Validator failed to fetch max size from PHP ini values (fixes #6999) 2017-06-06 14:28:03 +01:00
Daniel Hensby
24166700e8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:02:35 +01:00
Daniel Hensby
f71efb5063 Merge pull request #40 from silverstripe-security/patch/3.4/ss-2017-002
[SS-2017-002] FIX Lock out users who dont exist in the DB
2017-05-28 22:18:56 +01:00
Daniel Hensby
24a768ae14
Merge branch '3.4' into 3.5 2017-05-26 14:57:15 +01:00
Daniel Hensby
447ce0f84f
[SS-2017-002] FIX Lock out users who dont exist in the DB 2017-05-25 16:14:52 +01:00
Daniel Hensby
85f0650796
Remove unnecessary nesting of config/injector in tests 2017-05-24 16:05:39 +01:00
Daniel Hensby
cc70d893bc
Merge branch '3.4' into 3.5 2017-05-18 13:53:49 +01:00
Daniel Hensby
49a0354998
Make sure that nested relations dont break 2017-05-17 23:01:42 +01:00
Thomas Portelange
efbf14be63
Allow filtering if a relation is defined or a formatting 2017-05-17 21:05:21 +01:00
Robbie Averill
55eb7ebdcc FIX Do not insert requirements more than once in includeInHTML
This change consolidates the string replacements used to insert requirements into the page content to help ensure
that they are not compounding and overwriting eachother.

The added test case includes where a user may have a Javascript snippet that contains a closing head tag, and the
test ensures that it does not get injected with requirements as well as the actual head tag in the DOM.
2017-04-07 17:04:17 +12:00
Daniel Hensby
8aaa3e3a86
Merge branch '3.4' into 3.5 2017-03-03 14:54:29 +00:00
Daniel Hensby
7f194a917d
Merge pull request #6351 from steve-silverstripe/patch-2 2017-03-03 14:05:53 +00:00
Daniel Hensby
62e301bdba Merge pull request #6529 from timezoneone/3.5
Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns
2017-03-03 12:45:05 +00:00
Shawn
72b6fb49b6 Fix bug: In addOrderBy method, _SortColumn will only keep the last one if there are more than 1 multi-word columns 2017-03-03 14:11:53 +13:00
Daniel Hensby
5a6f784e42
Merge branch '3.4' into 3.5 2017-02-20 21:31:09 +00:00
Daniel Hensby
7122e1fde7 FIX Comments ignored by classmanifest (#6619) 2017-02-15 10:46:04 +13:00
Damian Mooyman
c25c443d95 BUG Fix minor mysql 5.7 warning in SQLQueryTest (#6608)
Fixes #5451
2017-02-08 15:44:55 +13:00
Daniel Hensby
56b887f578
Merge branch '3.4' into 3.5 2017-01-31 13:33:00 +00:00
Damian Mooyman
609b0a612c Merge pull request #6512 from silverstripe/pulls/3.4/ensure-string-return
Test fixes - reorder assertions and ensure string returned
2017-01-31 17:25:34 +13:00
Stephan Bauer
17d123a3be BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing 2017-01-16 21:24:34 +01:00
Daniel Hensby
de7372ad3b
Test fixes - reorder assertions and ensure string returned 2017-01-16 14:46:22 +00:00
Stephan Bauer
1f1fffe734 BUG Ensure correct regeneration of ConfigManifest if only one of the cache files is missing (fixes #6467) 2017-01-14 23:13:47 +01:00
Daniel Hensby
c8a40605ec Merge pull request #6413 from volkerloew/1400-text-contextsummary
search term highlighting without altering case (fixes #1400)
2016-12-28 13:36:08 +00:00
Volker Löw
5e581eace7
search term highlighting without altering case (fixes #1400) 2016-12-28 13:03:35 +00:00
Damian Mooyman
b1b3a6ee13 Merge 3.4 into 3.5 2016-12-22 13:18:37 +13:00
Damian Mooyman
94c3bc9fa1 Merge 3.4.3 into 3.4 2016-12-22 13:16:12 +13:00
Damian Mooyman
f314b86ad8 BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)
Fixes #5987
2016-12-22 10:08:46 +13:00
Damian Mooyman
ffdb99e78d BUG Temp disable shortcode SPLIT behaviour due to crash (#6436)
Fixes #5987
2016-12-21 18:55:00 +13:00
Daniel Hensby
273a06d47d
TEST Duplicated DataObjects dont keep Created date value 2016-12-19 14:23:39 +00:00
Daniel Hensby
78ed003977
Merge branch '3.4' into 3.5 2016-12-19 10:48:10 +00:00
Damian Mooyman
c007e85d1b
BUG Suppress HtmlEditorField casting
Fixes #6396
2016-12-19 16:03:48 +13:00
Daniel Hensby
efd8114fd5
Merge branch '3.4' into 3.5 2016-12-16 15:52:53 +00:00
Daniel Hensby
f8132b39af
Assertions should be $this->assert($expected, $actual) 2016-12-13 11:32:52 +00:00
Daniel Hensby
2e538ca9ab
Merge tag '3.4.2' into 3.4
Release 3.4.2
2016-11-29 17:17:00 +00:00
Daniel Hensby
fb39022ef3
Merge branch '3.4' into 3.5 2016-11-29 11:40:37 +00:00