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
Daniel Hensby
32cef975ef
FIX Use self::inst() for Injector/Config nest methods
2017-10-25 17:48:35 +01:00
Daniel Hensby
f8c5ff2f15
Merge branch '3.6' into 3
2017-08-29 16:54:09 +01:00
Patrick Nelson
fdd501182e
NEW: Ability to override SS_TemplateManifest via Injector ( fixes #7305 )
2017-08-23 17:34:07 -07:00
Daniel Hensby
016e0e657a
Merge branch '3.6' into 3
2017-07-19 15:45:56 +01:00
Daniel Hensby
90be7e806d
Merge branch '3.5' into 3.6
2017-07-19 15:40:01 +01:00
Daniel Hensby
b77274c1a3
FIX Add unique prefix to cache stores to prevent cache leak
2017-07-18 23:43:08 +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
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
bbb250916e
Merge branch '3.6' into 3
2017-05-08 16:22:32 +01:00
Daniel Hensby
f4f1c55fb6
Merge branch '3.5' into 3.6
2017-05-08 15:20:11 +01:00
Daniel Hensby
793a020ce9
Merge branch '3.4' into 3.5
2017-05-08 11:31:33 +01:00
Jake Bentvelzen
082c2ddb90
Adjust ConfigStaticManifest_Reflection deprecation notices
2017-05-08 17:52:13 +12:00
Silbinary Wolf
08bb23823b
Adjusted code based on feedback on PR (Pull-request)
2017-05-08 17:52:13 +12:00
Silbinary Wolf
8f65c44865
Modified how to re-enable old SS_ConfigStaticManifest to suit the SS config system
2017-05-08 17:52:13 +12:00
Silbinary Wolf
65ac23098e
Adds support for using the newer ConfigStaticManifest from the 4.0/master branch. If the developer is doing something weird that involves accessing the 'getStatics()', they can simply delete the ConfigStaticManifest40.php file to bring back full compatibility. My reasoning for this addition is that it reduces the /dev/build process greatly and increases the programmers productivity and improves their quality of life (in my opinion anyway, less waiting for 7-12s for private static changes).
...
I'm thinking this should go into 3.3.
2017-05-08 17:52:13 +12:00
Gregory Smirnov
2d138b0ef0
Fix class name reference consistency
2017-05-03 09:34:25 +02:00
3Dgoo
2187c160b9
Fixing pagination api doc typo
2017-05-03 06:23:47 +09:30
Sam Minnee
f224849cc6
FIX: Don’t use SplFixedArray in PHP 7.
...
PHP 7 seems to suffer a segfault when using SplFixedArray. Since LRU is
deprecated anyway, I’m not too fussed about getting to the bottom of
this issue, however, if it turns out that SplFixedArray is corrected in
PHP 7.0.0 stable or a future patch release, we could update this check.
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
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
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
Daniel Hensby
8dc250455e
Merge branch '3.4' into 3.5
2016-12-19 16:15:46 +00:00
PingMetal
222ee6bde2
Fixed a pagination bug
...
Depending on the current page, a page not supposed to show up in the pagination summary can be skipped without returning a null value. It makes it difficult to know it is existent, but just skipped.
2016-12-19 14:54:06 +00:00
Andrew Aitken-Fincham
e0c94e0f72
remove FRAMEWORK_PATH and namespace IPUtils
2016-12-15 11:10:47 +00:00
Christopher Pitt
a4167e29fe
Replace hard-coded directory separators constant
...
This removes warnings when building the manifest cache in Windows environments.
2016-11-24 08:00:34 +13:00
Daniel Hensby
17108ff50c
Merge branch '3.4' into 3.5.0
2016-11-10 14:23:38 +00:00
Damian Mooyman
ebae480c66
BUG Fix regression in aggregate column lookup from #6199
2016-11-10 11:13:02 +13:00
Daniel Hensby
9a6121c867
Merge branch '3.4' into 3
2016-10-16 22:56:37 +01:00
Matt Peel
5a2591ec7d
Make __call() clearer that a method may be non-public
...
Resolves #6151
2016-10-06 14:01:38 +13:00
Andrew Aitken-Fincham
ad0d68d133
add IPUtils.php to control and implement symfony IpUtils ( #6062 )
2016-09-26 12:44:55 +13:00
Damian Mooyman
7de5b998e1
Merge 3.4 into 3
2016-08-05 19:12:25 +12: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
Damian Mooyman
cd80d501f9
BUG Fix unset config options returning isset() = true
...
Fixes #4791
2016-08-02 18:07:55 +12:00
Sam Minnée
366224078b
FIX: Allow caching of false config values ( Fixes #4755 ) ( #4762 )
...
False values were indistinguishable from cache misses. This patch solves
this by introducing a new multiple-return-value varation on cache->get().
The new method is named differently so as not to break a public API.
2016-07-15 09:22:58 +01:00
Loz Calver
21cf67f1b4
Minor refactor of SS_ConfigStaticManifest_Parser::parse() ( #5782 )
2016-07-07 12:14:54 +01:00
Daniel Hensby
8a21d53a07
Merge branch '3.4' into 3
2016-07-07 10:28:49 +01: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
390b1fc6c4
Merge branch '3.4' into 3
2016-06-29 11:43:02 +01:00