Commit Graph

998 Commits

Author SHA1 Message Date
Robbie Averill
24ee5a186e Merge branch '1.4' into 1 2018-02-22 11:37:26 +13:00
Robbie Averill
e04d04dc70 Merge branch '1.3' into 1.4 2018-02-22 11:35:52 +13:00
Robbie Averill
742c4a7fa3 Update branch alias for 1.5.x-dev 2018-02-22 10:22:58 +13:00
Robbie Averill
e4702dc132 Remove obsolete branch-alias 2018-02-22 09:25:11 +13:00
Dylan Wagstaff
299f12765c
Merge pull request #344 from creative-commoners/pulls/2.0/fix-subsite-redirect
FIX Redirect user back to the full current URL after changing subsites
2018-02-09 10:21:24 +13:00
Damian Mooyman
5279748931
Merge pull request #342 from creative-commoners/pulls/2.0/fix-extension-classes
FIX Use correct class names for Settings and Subsites admin menu items
2018-02-08 11:06:58 +13:00
Robbie Averill
ab24aa6d9f FIX Redirect user back to the full current URL after changing subsites 2018-02-08 00:23:00 +13:00
Robbie Averill
510d80683a FIX Use correct class names for Settings and Subsites admin menu items 2018-02-07 19:50:36 +13:00
Daniel Hensby
73943afd5b
Merge pull request #338 from creative-commoners/pulls/2.0/fix-validation-error
Pulls/2.0/fix validation error
2018-02-01 17:02:32 +00:00
Raissa North
34c0c4946c FIX Hide subsite operations when no subsites exist 2018-02-01 15:41:54 +13:00
Raissa North
5404dafac1 FIX Fix unit tests for installations in which the base url is set 2018-02-01 14:26:12 +13:00
Raissa North
e405dff946 FIX Add an empty string to the subsite operations dropdown.
This prevents a subsite from being chosen as the default option, assuming this is undesired
2018-02-01 14:24:04 +13:00
Raissa North
809b1d9b85 Fix switch statement syntax and replace deprecated doPublish() method. 2018-02-01 13:24:48 +13:00
Raissa North
098660e27d Refactor GridFieldSubsiteDetailForm_ItemRequest and $_cache_accessible_sites
Remove underscores to comply with PSR-2
2018-02-01 13:22:48 +13:00
Raissa North
8b5f593999 Fix line length 2018-02-01 13:19:02 +13:00
Raissa North
db69c486a0 FIX: Turn SilverStripe Map into an array to give an accurate falsey value 2018-01-31 17:25:32 +13:00
Raissa North
bb5f2c07e1 Merge branch 'master' of https://github.com/silverstripe/silverstripe-subsites into pulls/2.0/fix-validation-error 2018-01-31 11:02:19 +13:00
Raissa North
aa370f8df6 FIX Replace deprecated doPublish() method with publishRecursive() 2018-01-31 10:10:09 +13:00
Raissa North
4f15894f86 Add codesniffer ruleset 2018-01-31 10:08:21 +13:00
Daniel Hensby
cde41c4409
Merge pull request #337 from creative-commoners/pulls/2.0/fix-subsites-treedropdown
FIX Subsites VirtualPage link to edit main page and TreeDropdownField API implementations
2018-01-30 20:38:48 +00:00
Robbie Averill
34b3fbf04d FIX Subsites VirtualPage link to edit main page and TreeDropdownField API implementations 2018-01-30 16:21:45 +13:00
Robbie Averill
6fb0af0f93 FIX Typo in requirements call to TreeDropdownField javascript resource 2018-01-26 16:09:42 +13:00
Dylan Wagstaff
8eee411d5a
Merge pull request #335 from creative-commoners/pulls/2.0/more-configging
API Convert most of Subsite public statics to config properties
2018-01-23 12:49:22 +13:00
Robbie Averill
17427fd251 Ignore host-map.php in phpcs, and ensure it is disabled in unit tests 2018-01-23 12:09:48 +13:00
Robbie Averill
6bbf988fda API Convert most of Subsite public statics to config properties 2018-01-23 12:09:48 +13:00
Robbie Averill
73f5bcaecc
Merge pull request #336 from mikenz/patch-2
Fix alignment of menu toggle icons
2018-01-23 10:39:10 +13:00
Dylan Wagstaff
17e0db47a1
Merge pull request #334 from creative-commoners/pulls/2.0/fix-file-subsites
API Move subsite dropdown logic for folders into FolderFormFactoryExtension
2018-01-23 10:37:38 +13:00
Mike Cochrane
d02b668885
Fix alignment of menu toggle icons 2018-01-22 23:01:59 +13:00
Robbie Averill
a88ac5d05d Switch from precise to trusty in Travis 2018-01-18 16:27:00 +13:00
Robbie Averill
ace068b93d FIX Move extensions to correct folder location for PSR-4 compatibility 2018-01-18 16:23:11 +13:00
Robbie Averill
4f174ffd6e NEW Add test for FolderFormFactoryExtension with a separate fixture 2018-01-18 16:22:35 +13:00
Robbie Averill
a0836bed79 NEW Add PHP 7.2 to Travis build matrix 2018-01-18 16:04:09 +13:00
Robbie Averill
1dd1f2ce6c API Move subsite dropdown logic for folders into FolderFormFactoryExtension 2018-01-18 16:03:58 +13:00
Robbie Averill
a201e7e953
Merge pull request #332 from mikenz/css-did-nothing
Remove or update CSS that wasn't doing anything
2018-01-08 10:08:14 +13:00
Mike Cochrane
4e297d920b Remove or update CSS that wasn't doing anything 2018-01-05 04:29:54 +00:00
Damian Mooyman
1cdae5024a
Merge pull request #329 from mikenz/patch-1
Bugfix: Don't assume all forms have a URLSegment field
2017-12-14 14:55:45 +13:00
Mike Cochrane
157db89dbf
Bugfix: Don't assume all forms have a URLSegment field 2017-12-14 14:17:30 +13:00
Robbie Averill
727efb0ea0
Merge pull request #328 from jyrkij/parent-calls
Add parent call to onAfterWrite
2017-12-14 09:44:41 +13:00
Jyrki Lilja
01d09695a9 Add parent call to onAfterWrite 2017-12-13 14:53:09 +02:00
Damian Mooyman
33622c440b
Merge pull request #326 from creative-commoners/pulls/2.0/vendorise
NEW Convert to vendor module
2017-12-06 08:55:05 +13:00
Robbie Averill
b529947362 Update constraint for silverstripe/serve dependency 2017-12-04 15:33:29 +13:00
Robbie Averill
bcab2af5af FIX Update Scrutinizer configuration to run new build system 2017-12-04 15:29:15 +13:00
Robbie Averill
95a71566f1 NEW Convert to vendor module 2017-12-04 15:26:17 +13:00
Damian Mooyman
0ebf9509bf
Merge pull request #325 from jsirish/refactor/canEditExtend
Subsite - allow canEdit to be extended
2017-11-23 15:38:05 +13:00
Jason Irish
8fcfe55ba8 Subsite - allow canEdit to be extended 2017-11-22 12:22:57 -06:00
Daniel Hensby
7bf430ba83
Merge branch 'pull/322' 2017-10-11 16:17:20 +01:00
Mike Cochrane
1dcba49e5c SubsitesTreeDropdownField: Get the tree in the context of the correct subsite 2017-10-06 11:09:58 +13:00
Daniel Hensby
0157bd0c05 Merge pull request #321 from mikenz/resetable-state
Implement Resettable interface on SubsiteState so it gets reset between unit tests
2017-10-05 17:22:56 +01:00
Robbie Averill
4a1f571f1c Merge pull request #319 from mikenz/lost-namespaces
Add missing use lines, fix some class names, remove unused use lines
2017-10-05 19:06:33 +13:00
Mike Cochrane
a2a86c6eb1 Implement Resettable interface on SubsiteState so it gets reset between unit tests 2017-10-05 04:52:53 +00:00