Daniel Hensby
d677760b24
Merge branch '3' into 4
2018-01-15 16:52:47 +00:00
Daniel Hensby
5a77ec8cea
Merge branch '4.0' into 4
2018-01-15 16:19:22 +00:00
Daniel Hensby
a77a7cfe35
Merge branch '3.6' into 4.0
2018-01-15 15:49:47 +00:00
Daniel Hensby
54047719c0
Merge branch '3.6' into 3
2018-01-15 14:56:43 +00:00
Damian Mooyman
23a23043bc
Fix successfullyinstalled() ( #2069 )
...
Cleanup ContentController.php
2018-01-12 14:39:27 +13: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
d41cb312e2
Merge pull request #2068 from creative-commoners/pulls/4.0/issue-reporting-link
...
DOCS Update documentation links, remove forums link and helpful robot badge
2018-01-09 13:44:12 +00:00
Robbie Averill
29fb386c61
DOCS Update documentation links, remove forums link and helpful robot badge
2018-01-09 14:24:45 +13:00
Damian Mooyman
eb46974ad4
Merge pull request #2066 from creative-commoners/pulls/4.0/update-subsites-namespace
...
FIX Implement correct subsites namespace in File extension
2018-01-08 18:23:14 +13:00
Robbie Averill
157aef8eb7
FIX Implement correct subsites namespace in File extension
2018-01-08 15:40:48 +13:00
Chris Joe
a5160b963c
Merge pull request #2062 from open-sausages/pulls/4/no-view-toggle-when-search
...
FIX no button view type toggle when searching pages
2017-12-21 12:25:01 +13:00
Daniel Hensby
3997470b6a
Merge pull request #2060 from open-sausages/pulls/4.1/to-test-or-not-to-test
...
FIX Amend rules to ignore test files only
2017-12-20 14:24:02 +00:00
Saophalkun Ponlu
2fd81eea9e
FIX no button view type toggle when searching pages
2017-12-20 11:54:27 +13:00
Christopher Joe
646ba57152
FIX Amend rules to ignore test files only
2017-12-20 11:14:04 +13:00
Chris Joe
d5148e3b38
Merge pull request #2056 from open-sausages/pulls/4.0/add-page-root-breadcrumb-title
...
Add root breadcrumb title to add page form
2017-12-19 12:17:08 +13:00
Saophalkun Ponlu
502998bcb6
Add root breadcrumb title to add page form
2017-12-19 10:36:33 +13:00
Damian Mooyman
4d9a5ce943
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# tests/php/Controllers/CMSMainTest.php
2017-12-19 10:33:38 +13:00
Damian Mooyman
c4b2782ce0
Automatic linting fixes
2017-12-19 10:31:25 +13:00
Damian Mooyman
3efcd09f0a
Merge pull request #2053 from open-sausages/pulls/4.1/composer-does-prefer-dist
...
Feature Set .gitattributes to ignore docs and tests folder, and …
2017-12-18 17:50:35 +13:00
Damian Mooyman
6a24daa093
Update .travis.yml
2017-12-18 16:22:46 +13:00
Christopher Joe
2985b4a6e9
Feature Set .gitattributes to ignore docs and tests folder, and some source asset files which are not needed
2017-12-18 16:16:42 +13:00
Damian Mooyman
227ce39414
Merge branch '4.0' into 4
2017-12-18 16:16:20 +13:00
Damian Mooyman
2c034ac501
Merge pull request #2049 from open-sausages/pulls/4/remember-pages-viewtype
...
Remember pages view type
2017-12-14 09:21:58 +13:00
Damian Mooyman
210213a455
Fix search behaviour
2017-12-13 18:16:34 +13:00
Damian Mooyman
073cb77500
Trim some unnecessary API
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
8a04e9c46b
Fix wrong/confusing url segment
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
b391db4977
Fix search view
2017-12-13 17:10:39 +13:00
Saophalkun Ponlu
042dbbb13d
Remember pages view type
2017-12-13 17:10:39 +13:00
Damian Mooyman
6b0863d362
Merge pull request #2048 from open-sausages/pulls/4.0/sitetree-can-create-cache
...
ENHANCEMENT: Cache canCreate in CMSMain
2017-12-13 16:55:35 +13:00
Damian Mooyman
c2d54a571d
Fix up code style, fix tests
...
Add in missing service definitions
2017-12-13 16:36:01 +13:00
Aaron Carlino
8ee5d9f5ce
ENHANCEMENT Cache canCreate
2017-12-13 16:26:36 +13:00
Damian Mooyman
5d879e5b41
Merge pull request #2045 from open-sausages/pulls/4.0/permission-impossible
...
ENHANCEMENT: Cache inherited permissions
2017-12-12 13:37:28 +13:00
Damian Mooyman
6dd07b5262
Fix CI config for 4 branch
2017-12-12 12:45:49 +13:00
Aaron Carlino
d8e5037eb4
Add site tree inherited permisssions service
2017-12-12 12:45:29 +13:00
Lee Bradley
7eb04121a6
Change new HTMLEditorField to HTMLEditorField::Create ( #2050 )
...
This allows for the field to be overridden using
the injector e.g.
```yml
SilverStripe\Core\Injector\Injector:
SilverStripe\Forms\HTMLEditor\HTMLEditorField:
class: SilverStripers\markdown\forms\MarkdownEditorField
```
2017-12-07 15:36:51 +13:00
Damian Mooyman
b5f64aebec
Update translations
2017-12-07 11:08:26 +13:00
Loz Calver
7efe667a48
FIX: VirtualPage not using target page's template ( fixes #2039 ) ( #2041 )
...
* FIX: VirtualPage refreshFromCopied creates duplicate URLSegments on first write
* FIX: VirtualPage not using target page's template (fixes #2039 )
2017-12-06 11:59:30 +13:00
Aaron Carlino
ddda763710
Use new ESLint package ( #2018 )
...
* New eslint config
* Upgrade to eslint-config 0.0.2
2017-11-29 13:48:20 +13:00
Lee Bradley
1fedc5fc10
API Make CMSMain::getSiteTreeFor() default to null nodeCount ( #2029 )
2017-11-28 10:09:27 +13:00
Daniel Hensby
23771add04
Merge branch '3' into 4
2017-11-26 16:02:03 +00:00
Daniel Hensby
c007eab72c
Merge branch '4.0' into 4
2017-11-26 16:01:48 +00:00
Daniel Hensby
363fea3de0
Merge branch '3.6' into 4.0
2017-11-26 16:00:55 +00: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
Daniel Hensby
35a4f609d7
Merge pull request #2035 from oilee80/issue-2034/page-data-icons
...
Issue-2034: Fix for Page icons using data urls
2017-11-23 16:54:39 +00:00
Lee Bradley
d3fa8946be
Issue-2034: Fix for Page icons using data urls
...
Fixes #2034
Code was getting the icon twice, both in SiteTree &
LeftAndMainPageIconsExtenstion.
Now just uses `SiteTree::getPageIconURL()`
Tweaked to use `sprintf` instead of double quotes
2017-11-23 15:42:31 +00:00
Chris Joe
a92c03c464
Merge pull request #2037 from open-sausages/pulls/4.0/tweak-travis-behat
...
Update .travis.yml in line with framework .travis.yml
2017-11-23 23:44:25 +13:00
Damian Mooyman
99cdeec461
Update .travis.yml in line with framework .travis.yml
2017-11-23 15:55:37 +13:00
