tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,986 Commits 28 Branches 396 Tags 24 MiB
Commit Graph

4986 Commits

Author SHA1 Message Date
Daniel Hensby a2b9a966d8
Merge pull request #2529 from creative-commoners/pulls/3.7/php-7.4-builds 
Update Travis config to include PHP 7.4 build (3.x)
 2020-04-05 21:23:51 +01:00
Garion Herman 600fe51b66 Update Travis config to include PHP 7.4 build 2020-02-27 14:04:16 +13:00
Garion Herman deb80c5370 Upgrade Travis config to trusty 
Can't adopt Xenial by default as it doesn't include earlier PHP versions
 2020-02-27 13:36:57 +13:00
Robbie Averill 338c512e15
Merge pull request #2260 from oetiker/patch-1 
do not die if there is no parent in RelativeLink
 2018-10-03 13:35:49 +02:00
Robbie Averill b74cd001cc Increase memory limit in Travis builds 2018-09-27 12:32:22 +02:00
Robbie Averill ad5c2d41b4 PHP 5.3 compatibility in array syntax and use strict comparison operators 2018-09-27 12:31:12 +02:00
Hendrik Schaper e86ac130a5 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-27 12:31:09 +02:00
Tobias Oetiker 8bccac1d07
do not die if there is no parent in RelativeLink 
When resolving a relative link it can be that no valid parent node is reached ... handle this condition gracefully.
 2018-09-12 14:11:44 +02:00
Robbie Averill 8e871460a8 FIX Give Behat more memory in Travis builds 2018-09-06 12:57:29 +02:00
Robbie Averill 5ecd0c98de
Merge pull request #2252 from zemiacsik/patch-1 
fixed deprecated create_function() in PHP 7.2
 2018-09-06 12:48:36 +02:00
zemiacsik 4acf401b71
fixed deprecated create_function() in PHP 7.2 
fixed for "PHP Deprecated:  Function create_function() is deprecated in \cms\code\model\SiteTree.php on line 2116" while using PHP 7.2
 2018-09-05 14:49:31 +02:00
jcarter be348af3eb [Fix] (Squash) CMSMain::save class change 
Fixed class change as it was treating ClassName attrs in reverse order (going new->to->old, rather than old->to->new).
 2018-07-11 09:38:39 +12:00
Maxime Rainville f7a0ec395a Unit test for class change (#2194) 2018-07-11 09:38:39 +12:00
Damian Mooyman 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
Guy 07112dbb0b FIX Remove blind reliance on current versioning stage being valid 2018-06-12 09:56:14 +12:00
Damian Mooyman 59a50dab0b Remove obsolete branch-alias 2018-06-08 12:19:32 +12:00
Damian Mooyman 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
Damian Mooyman 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
Aaron Carlino 078b426786 Remove segmentation from core caches, remove short array syntax 2018-05-31 12:09:43 +12:00
Robbie Averill 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
Daniel Hensby b6dbae8b07
FIX Make RedirectorPage::Link compatible with SiteTree::Link 2018-05-23 16:18:39 +01:00
Damian Mooyman 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
Daniel Hensby 7cc4ce7895
Merge branch '3.6' into 3 2018-03-18 09:15:47 +00:00
Daniel Hensby 878443d478
Merge branch '3.5' into 3.6 2018-03-18 09:15:16 +00:00
Steve Dixon d17d93f784
FIX: Remove SearchForm results() function from allowed_actions 2018-03-18 09:14:38 +00:00
Daniel Hensby 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
Steve Dixon d096eb7c36 FIX: Remove SearchForm results() function from allowed_actions 2018-03-15 11:53:12 +11:00
Damian Mooyman a3edbd6d34
Merge pull request #2046 from dhensby/pulls/3/php7.2 
Add PHP7.2 support
 2018-02-02 09:25:46 +13:00
Daniel Hensby 23d84e6285
Make travis test against 3.x-dev 2018-02-01 17:24:00 +00:00
Daniel Hensby b9f2f1d4b3
Add PHP7.2 support 2018-01-30 16:51:32 +00:00
Daniel Hensby 54047719c0
Merge branch '3.6' into 3 2018-01-15 14:56:43 +00:00
Daniel Hensby 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
Steve Boyd 12ee49ccbd
Use regex with word boundaries to replace 'active' 2018-01-11 09:42:27 +13:00
Steve Boyd fa8b9c143a Update page history javascript so that it does not continously call element.compareDocumentPosition 2018-01-10 20:54:02 +13:00
Daniel Hensby a20f4f29f6
Merge branch '3.6' into 3 2017-11-25 18:21:15 +00:00
Daniel Hensby b2f6456922
Merge branch '3.5' into 3.6 2017-11-25 18:20:22 +00:00
Damian Mooyman 246775b97e
Merge pull request #2030 from dhensby/pulls/3.5/phpunit-loosen-constraint 
Loosen PHPUnit constraints
 2017-11-20 13:57:48 +13:00
Daniel Hensby 39edaedc8f
Loosen PHPUnit constraints 2017-11-17 11:45:41 +00:00
Damian Mooyman 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
Daniel Hensby 9e31c3240b
Add composer autoloading support to 3.x 2017-10-25 17:58:53 +01:00
Daniel Hensby 7c289a8b04
Merge branch '3.6' into 3 2017-10-20 11:04:02 +01:00
Daniel Hensby 9e903f801f
Merge branch '3.5' into 3.6 2017-10-20 11:03:25 +01:00
Daniel Hensby 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
Christopher Joe a73d5b4177 FIX revert to this button after archiving 2017-10-20 10:01:56 +13:00
Aaron Carlino 9ae6fbffe1 SiteTree check if in DB before delete children 2017-10-17 10:59:27 +13:00
Damian Mooyman 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
Aaron Carlino 528fd49ced SiteTree check if in DB before delete children 2017-10-16 16:41:47 +13:00
Daniel Hensby 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
Jason 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
Damian Mooyman 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