646ba57152
FIX Amend rules to ignore test files only
2017-12-20 11:14:04 +13:00
4d9a5ce943
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# tests/php/Controllers/CMSMainTest.php
2017-12-19 10:33:38 +13:00
c4b2782ce0
Automatic linting fixes
2017-12-19 10:31:25 +13:00
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
6a24daa093
Update .travis.yml
2017-12-18 16:22:46 +13:00
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
227ce39414
Merge branch '4.0' into 4
2017-12-18 16:16:20 +13:00
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
210213a455
Fix search behaviour
2017-12-13 18:16:34 +13:00
073cb77500
Trim some unnecessary API
2017-12-13 17:10:39 +13:00
8a04e9c46b
Fix wrong/confusing url segment
2017-12-13 17:10:39 +13:00
b391db4977
Fix search view
2017-12-13 17:10:39 +13:00
042dbbb13d
Remember pages view type
2017-12-13 17:10:39 +13:00
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
c2d54a571d
Fix up code style, fix tests
...
Add in missing service definitions
2017-12-13 16:36:01 +13:00
8ee5d9f5ce
ENHANCEMENT Cache canCreate
2017-12-13 16:26:36 +13:00
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
6dd07b5262
Fix CI config for 4 branch
2017-12-12 12:45:49 +13:00
d8e5037eb4
Add site tree inherited permisssions service
2017-12-12 12:45:29 +13:00
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
b5f64aebec
Update translations
2017-12-07 11:08:26 +13:00
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
ddda763710
Use new ESLint package ( #2018 )
...
* New eslint config
* Upgrade to eslint-config 0.0.2
2017-11-29 13:48:20 +13:00
1fedc5fc10
API Make `CMSMain::getSiteTreeFor()` default to `null` nodeCount ( #2029 )
2017-11-28 10:09:27 +13:00
23771add04
Merge branch '3' into 4
2017-11-26 16:02:03 +00:00
c007eab72c
Merge branch '4.0' into 4
2017-11-26 16:01:48 +00:00
363fea3de0
Merge branch '3.6' into 4.0
2017-11-26 16:00:55 +00: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
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
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
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
99cdeec461
Update .travis.yml in line with framework .travis.yml
2017-11-23 15:55:37 +13: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
73c7dc47c6
Merge pull request #2032 from open-sausages/pulls/4.0/we-are-children-of-the-future
...
BUG Fix allowed children types now load properly
2017-11-20 12:24:49 +13:00
694d258957
BUG Fix allowed children types now load properly
2017-11-20 09:17:22 +13:00
39edaedc8f
Loosen PHPUnit constraints
2017-11-17 11:45:41 +00:00
d6ccc4c5c2
Merge pull request #2028 from open-sausages/pulls/4.0/enable-link-empty
...
BUG Restore missing '(Choose Page)' text in link insert modal
2017-11-16 15:21:04 +13:00
8de154d92c
BUG Restore missing '(Choose Page)' text in link insert modal
2017-11-16 14:43:32 +13:00
53b0090826
Merge remote-tracking branch 'origin/4.0' into 4
2017-11-16 10:18:08 +13:00
365eabb85a
Merge pull request #2010 from open-sausages/pulls/4.0/deprecated-each
...
BUG Remove usage of deprecated each()
2017-11-08 16:32:25 +13:00
0c02b8872f
Merge pull request #2013 from open-sausages/pulls/4.0/better-tests
...
BUG Ensure we publish pages to update permissions during testing
2017-11-03 11:55:58 +13:00
3e627cb4e6
Merge pull request #2014 from open-sausages/pulls/4.0/youll-cancel-when-I-say-you-can-cancel
...
BUG Fix regression to cancel draft changes
2017-11-03 11:20:37 +13:00
1b190de7e1
BUG Fix regression to cancel draft changes
2017-11-03 10:44:05 +13:00
02e4273680
Update translations
2017-11-02 16:30:42 +13:00
27907304c1
BUG Ensure we publish pages to update permissions during testing
2017-11-02 15:59:41 +13:00
a9cc93749d
Merge pull request #2011 from open-sausages/pulls/4.0/dont-give-me-a-falsified-report
...
BUG Fix ambiguous query for content report
2017-11-02 12:03:13 +13: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
6c2d5311d3
Docblock
2017-11-02 11:29:49 +13:00
0b8c5d7bb0
Merge pull request #2007 from open-sausages/pulls/4.0/site_url_check
...
BUG Safely check for is_site_url before parsing a shortcode
2017-11-02 10:02:12 +13:00
Christopher Joe
Damian Mooyman
Saophalkun Ponlu
Aaron Carlino
Lee Bradley
Loz Calver
Daniel Hensby
Daniel Hensby
Lee Bradley
Chris Joe
Daniel Hensby