Sam Minnee
d6117630bd
FIX: Stricter regex syntax for PHP7.3 support.
2018-10-02 18:48:12 +13:00
Daniel Hensby
9103816333
NEW Add php 7.2 support
2018-01-30 16:50:32 +00: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
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
Robbie Averill
48d9088ab4
Separate composer.lock load method and add test mocking it
2017-07-11 12:22:25 +12: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
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
Daniel Hensby
0ddf3b4186
Merge branch '3.5' into 3
2017-02-20 21:33:31 +00:00
Daniel Hensby
7122e1fde7
FIX Comments ignored by classmanifest ( #6619 )
2017-02-15 10:46:04 +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
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
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
Damian Mooyman
ca754eb887
Merge 3.3 into 3.4
...
# Conflicts:
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/it.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/it.js
# lang/cs.yml
# lang/eo.yml
# lang/fa_IR.yml
# lang/fi.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:48:26 +12:00
Daniel Hensby
e7c6509196
Merge remote-tracking branch 'cow/pulls/3.3/check-isset-config' into 3.3
2016-08-02 12:00:04 +01:00
Damian Mooyman
cd80d501f9
BUG Fix unset config options returning isset() = true
...
Fixes #4791
2016-08-02 18:07:55 +12:00
Daniel Hensby
55e1fd8782
Merge branch '3.3' into 3.4
2016-07-07 10:28:17 +01:00
Daniel Hensby
ce47f8112b
Merge branch '3.2' into 3.3
2016-07-07 10:27:25 +01:00
Loz Calver
27cea80b15
FIX: SS_ConfigStaticManifest_Parser failed to handle ::class syntax ( fixes #5701 ) ( #5781 )
2016-07-07 10:23:38 +01:00
Daniel Hensby
2ab0dcf618
Merge branch '3.3' into 3.4
2016-06-29 11:42:05 +01:00
Daniel Hensby
da0b62f853
Merge branch '3.2' into 3.3
2016-06-29 11:40:58 +01:00
Daniel Hensby
3fe8d30c2c
Merge branch '3.1' into 3.2
2016-06-29 11:40:27 +01:00
Daniel Hensby
c11ac5d248
Merge pull request #4162 from kinglozzer/pulls/object-parse-class-spec
...
FIX: Object::parse_class_spec failed to parse associative arrays
2016-06-28 16:07:12 +01:00
Damian Mooyman
303f695751
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/LeftAndMain.EditForm.js
2016-05-18 17:29:30 +12:00
Damian Mooyman
dad7981332
Merge 3.2 into 3.3
2016-05-18 17:27:28 +12:00
Damian Mooyman
8dfeeb0eb6
Merge 3.1 into 3.2
2016-05-18 17:25:42 +12:00
Damian Mooyman
62bd26d11a
BUG Fix suppression of display_errors in ErrorControlChain
2016-05-18 13:36:54 +12:00
Daniel Hensby
457931d664
Merge branch '3.3' into 3
2016-05-04 23:32:10 +01:00
Daniel Hensby
8673ac15bc
MINOR Empty YAML config causes invalid argument error
2016-04-26 12:58:27 +01:00
Daniel Hensby
679185514d
Merge 3.3 into 3
...
Conflicts:
admin/css/screen.css.map
2016-04-26 00:24:59 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3
...
Conflicts:
.travis.yml
2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2
...
Conflicts:
admin/javascript/LeftAndMain.js
control/HTTPRequest.php
docs/en/00_Getting_Started/00_Server_Requirements.md
2016-04-26 00:09:33 +01:00
Damian Mooyman
6ec2656201
BUG fix ErrorControlChain causing errors to be displayed if display_errors in php.ini is false
...
Fixes #5250
2016-04-01 11:04:06 +13:00
Daniel Hensby
119bd2f873
Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref
...
API before/afterExtend now support parameters passed by reference
2016-01-22 16:08:20 +00:00
Sam Minnee
3ee8f505b7
MINORE: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
Damian Mooyman
62f183d037
API before/afterExtend now support parameters passed by reference
...
Closes #4810
2015-12-14 10:10:45 +13:00
Damian Mooyman
c4dc10b255
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
forms/DropdownField.php
tests/model/ImageTest.php
2015-11-03 13:06:39 +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
Nicola Fontana
c39cf2d55f
Do not hang on nested parameters in search context
2015-09-23 09:12:02 +02: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
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
7ee444e08a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
Daniel Hensby
ffbeac6b7d
Ensuring classinfo is case insensitive
2015-07-28 11:17:50 +01:00
Damian Mooyman
914d734df0
API Disable deprecation notices by default
2015-07-16 09:56:47 +12:00
Daniel Hensby
66391ab57a
FIX Imported namespaces now correctly used to determine class inheritance
...
Fixes #3707
2015-06-20 16:09:10 +01:00