a75990ef8c
Merge pull request #2278 from RoyalPulp/patch-1
...
PHP7.2 compatibility
2018-09-27 12:30:18 +02:00
60ce733cfb
Increase memory limit in Travis builds
2018-09-27 11:52:24 +02:00
31ee3eb0f3
PHP 5.3 compatibility in array syntax and use strict comparison operators
2018-09-27 11:51:43 +02:00
af99004549
PHP7.2 compatibility
...
each() and create_function() are deprecated in PHP7.2 ,
-> I copied the code from the 4 branch - seems to work in my local environment
2018-09-26 12:26:54 +02:00
3097bccadc
Merge branch '3.7' into 3
2018-06-22 18:46:34 +12:00
a242cc53a5
Remove obsolete branch alias
2018-06-12 11:25:29 +12:00
7052170e89
Merge pull request #2186 from creative-commoners/pulls/3.7/versioned-staging-fix
...
FIX Remove blind reliance on current versioning stage being valid
2018-06-12 10:50:03 +12:00
07112dbb0b
FIX Remove blind reliance on current versioning stage being valid
2018-06-12 09:56:14 +12:00
59a50dab0b
Remove obsolete branch-alias
2018-06-08 12:19:32 +12:00
c5205ecc1f
BUG Ensure errorpage is built in live mode
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/8110
2018-06-06 10:49:18 +12:00
a3a0e9cb1a
Merge pull request #2180 from open-sausages/pulls/3/versioned-cache-segmentation
...
ENHANCEMENT: Remove segmentation from core caches
2018-06-05 14:02:40 +12:00
078b426786
Remove segmentation from core caches, remove short array syntax
2018-05-31 12:09:43 +12:00
12826b2ace
Merge pull request #2174 from dhensby/pulls/3/redirector-link
...
FIX Make RedirectorPage::Link compatible with SiteTree::Link
2018-05-24 09:16:17 +12:00
b6dbae8b07
FIX Make RedirectorPage::Link compatible with SiteTree::Link
2018-05-23 16:18:39 +01:00
dfdaac48ca
ENHANCEMENT Backport versioned querystring fix ( #2153 )
...
* Backport versioned querystring fix
* Fix versioned state reset
* Fix up tests
* Fix permissions test
* Linting
2018-05-08 10:04:59 +12:00
7cc4ce7895
Merge branch '3.6' into 3
2018-03-18 09:15:47 +00:00
878443d478
Merge branch '3.5' into 3.6
2018-03-18 09:15:16 +00:00
d17d93f784
FIX: Remove SearchForm results() function from allowed_actions
2018-03-18 09:14:38 +00:00
2052a42066
Merge pull request #2126 from rotassator/3.6
...
FIX: Remove SearchForm results() function from allowed_actions
2018-03-18 08:58:09 +00:00
d096eb7c36
FIX: Remove SearchForm results() function from allowed_actions
2018-03-15 11:53:12 +11:00
a3edbd6d34
Merge pull request #2046 from dhensby/pulls/3/php7.2
...
Add PHP7.2 support
2018-02-02 09:25:46 +13:00
23d84e6285
Make travis test against 3.x-dev
2018-02-01 17:24:00 +00:00
b9f2f1d4b3
Add PHP7.2 support
2018-01-30 16:51:32 +00:00
54047719c0
Merge branch '3.6' into 3
2018-01-15 14:56:43 +00:00
169f75c7ba
Merge pull request #2070 from emteknetnz/fix-history-js
...
Update page history javascript to fix big performance issue
2018-01-11 10:04:03 +00:00
12ee49ccbd
Use regex with word boundaries to replace 'active'
2018-01-11 09:42:27 +13:00
fa8b9c143a
Update page history javascript so that it does not continously call element.compareDocumentPosition
2018-01-10 20:54:02 +13:00
a20f4f29f6
Merge branch '3.6' into 3
2017-11-25 18:21:15 +00:00
b2f6456922
Merge branch '3.5' into 3.6
2017-11-25 18:20:22 +00:00
246775b97e
Merge pull request #2030 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:57:48 +13:00
39edaedc8f
Loosen PHPUnit constraints
2017-11-17 11:45:41 +00:00
992381e285
Merge pull request #2003 from dhensby/pulls/3.5/composer-autoload
...
Add composer autoloading support to 3.x
2017-11-02 11:42:33 +13:00
9e31c3240b
Add composer autoloading support to 3.x
2017-10-25 17:58:53 +01:00
7c289a8b04
Merge branch '3.6' into 3
2017-10-20 11:04:02 +01:00
9e903f801f
Merge branch '3.5' into 3.6
2017-10-20 11:03:25 +01:00
4887eae1b6
Merge pull request #2000 from open-sausages/pulls/3.5/you-cannot-see-what-you-cannot-see
...
FIX revert to this button after archiving
2017-10-20 10:58:35 +01:00
a73d5b4177
FIX revert to this button after archiving
2017-10-20 10:01:56 +13:00
9ae6fbffe1
SiteTree check if in DB before delete children
2017-10-17 10:59:27 +13:00
0d1c6b9f0c
Merge pull request #1988 from open-sausages/pulls/3/hierarchy-cascading-deletes
...
Move cascading delete to onAfterDelete for SiteTree
2017-10-17 09:20:23 +13:00
528fd49ced
SiteTree check if in DB before delete children
2017-10-16 16:41:47 +13:00
0f2ff54557
Merge pull request #1990 from jason-zz/patch-1
...
BUG UploadField overwriteWarning isn't working in AssetAdmin
2017-10-13 14:31:55 +01:00
fd39faeefd
BUG UploadField overwriteWarning isn't working in AssetAdmin
...
When UploadField overwriteWarning is enabled, no overwrite warning message for uploading file in non-root folder. This fix will let CMSFileAddController know the current folder when 'fileexists' AJAX request is called.
2017-10-13 11:00:17 +01:00
a0a5979eb6
Merge pull request #1983 from kinglozzer/fr-7420-page-icons
...
Fix: TreeDropdownField showing broken page icons (fixes silverstripe/framework#7420 )
2017-10-05 13:48:25 +13:00
24e190ea82
Fix: TreeDropdownField showing broken page icons ( fixes silverstripe/silverstripe-framework#7420 )
2017-10-04 17:02:48 +01:00
be34b9b61c
Merge branch '3.6' into 3
2017-09-28 17:45:41 +01:00
50a9a5de6b
Merge branch '3.5' into 3.6
2017-09-28 17:45:22 +01:00
f8d0dc4ff7
Merge remote-tracking branch 'security/3.6.2' into 3.6
2017-09-28 17:45:18 +01:00
6a11fbfbf8
Merge remote-tracking branch 'security/3.5.5' into 3.5
2017-09-28 17:44:53 +01:00
32c74a86e2
Merge branch '3.5.5' into 3.6.2
2017-09-20 16:34:42 +01:00
d99a80cef9
Merge pull request #6 from silverstripe-security/patch/3.5/authenticator-fix
...
FIX Default LoginForm generated from default_authenticator
2017-09-20 11:37:40 +01:00
Robbie Averill
Robbie Averill
Hendrik Schaper
Damian Mooyman
Guy
Aaron Carlino
Daniel Hensby
Steve Dixon
Daniel Hensby
Daniel Hensby
Steve Boyd
Steve Boyd
Daniel Hensby
Christopher Joe
Jason
Loz Calver