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
Mojmir Fendek
5b6a39e71a
TreeDropDown performance boost.
2017-06-19 15:10:23 +12:00
Lukas
a990c99d6e
NEW: suffix subfolder in silverstripe-cache with php-version ( #6810 )
...
Note that this changes the default temp path value
* Was: /tmp/silverstripe-cache-Users-FOO-webroot-BAR-php7.1.5/USER
* Now: /tmp/silverstripe-cache-Users-FOO-webroot-BAR/USER-php7.1.5
2017-06-16 11:25:02 +12:00
Loz Calver
2afe018dc7
FIX: Ensure HasManyList foreign ID filter includes table name ( fixes #7023 )
2017-06-15 12:06:30 +01:00
Daniel Hensby
6f2b08b962
Merge branch '3.6' into 3
2017-06-14 12:02:27 +01:00
Daniel Hensby
ecc88b2cbe
Merge branch '3.5' into 3.6
2017-06-14 12:02:06 +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
21d2e5cad1
Merge branch '3.6' into 3
2017-05-31 00:12:14 +01:00
Daniel Hensby
cda7e8dc39
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:29:05 +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
66456138e7
Merge branch '3.6' into 3
2017-05-26 14:58:16 +01:00
Daniel Hensby
02bb308ad5
Merge branch '3.5' into 3.6
2017-05-26 14:57:33 +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
283e3279be
Merge branch '3.6' into 3
2017-05-18 13:55:07 +01:00
Daniel Hensby
9f6e0cdc8f
Merge branch '3.5' into 3.6
2017-05-18 13:54:11 +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
Ben Speakman
27bca14f86
Test for getExtension()
2017-05-08 17:22:50 +12:00
Daniel Hensby
1f0e1913cd
Merge branch '3.5' into 3
2017-04-08 20:25:27 +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
Sam Minnee
22ad39e5ae
FIX: Fix SSViewerTest in PHP7
...
PHP7 is a bit more picky about passing values by reference.
2017-04-05 11:05:29 +10:00
Loz Calver
454646c4df
Fix invalid closure param in ShortcodeParserTest
2017-04-05 11:05:28 +10:00
Loz Calver
40bf945322
NEW: PHP 7 compatibility
...
This patch introduces PHP 7 compatability without breaking semver by adding DBInt
and DBFloat classes, with Int/Float classes that are only loaded into PHP 5 environments
2017-04-05 11:00:04 +10:00
Daniel Hensby
51f98c973f
Merge branch '3.5' into 3
2017-04-03 22:57:58 +01:00
Loz Calver
b3d37880e9
FIX: many_many_extraFields breaks _SortColumn0 ordering ( fixes #6730 )
2017-03-27 09:16:13 +01:00
Damian Mooyman
f1b99b6fa7
API Enable theming of GroupedDropdownField
...
Based on partial back-port of 4.0 code
2017-03-06 11:44:42 +13: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
0ddf3b4186
Merge branch '3.5' into 3
2017-02-20 21:33:31 +00: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
Daniel Hensby
4d3cd9d9a2
Merge branch '3.5' into 3
2017-02-08 10:40:40 +00: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
669f6a3d41
Merge branch '3.5' into 3
2017-01-31 13:33:26 +00: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
Robbie Averill
3583f1f79e
API Convert::raw2json can be passed an optional bitmask of JSON constants as options
2017-01-24 13:27:16 +13:00
Daniel Hensby
2ce80e448d
Merge branch '3.5' into 3
2017-01-16 21:00:14 +00: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
f2470cc98d
Merge pull request #6459 from robbieaverill/feature/nofollow-robots-in-security
...
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
2017-01-13 12:38:04 +00:00
Robbie Averill
2f6f5b5eff
Do not send the header if it is not defined
2017-01-11 08:26:04 +13:00
Daniel Hensby
733511565e
Merge branch '3.5' into 3
2017-01-10 12:52:06 +00:00
Robbie Averill
cb2dcc75f1
Add X-Robots-Tag noindex,nofollow header from Security controller to prevent indexing
2017-01-09 16:13:39 +13:00
Damian Mooyman
3e32b18c6b
Merge pull request #6263 from dhensby/pulls/3/allow-unltd-grid-row-count
...
NEW Allow setting of unlimited row counts on GridFieldPaginator
2017-01-05 09:12:02 +13:00
Daniel Hensby
776d2fbc66
NEW Allow setting of unlimited row counts on GridFieldPaginator
2016-12-29 14:10:13 +00: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
Daniel Hensby
3a009a5849
Merge branch '3.3' into 3.4
2016-11-29 11:39:58 +00:00
Damian Mooyman
9ec1d35f2b
BUG Fix behat tests unable to capture HTML editor fields
2016-11-29 14:49:39 +13:00
Daniel Hensby
3e36f5691b
Merge branch '3.4' into 3.5.0
2016-11-22 11:31:39 +00:00
Daniel Hensby
f57244d526
Merge branch '3.3' into 3.4
2016-11-22 11:29:32 +00:00
Daniel Hensby
f17e21c4a3
Merge branch '3.2' into 3.3
2016-11-22 11:26:41 +00:00
