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
Daniel Hensby
363fea3de0
Merge branch '3.6' into 4.0
2017-11-26 16:00:55 +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
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
Damian Mooyman
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
Christopher Joe
694d258957
BUG Fix allowed children types now load properly
2017-11-20 09:17:22 +13:00
Daniel Hensby
39edaedc8f
Loosen PHPUnit constraints
2017-11-17 11:45:41 +00:00
Chris Joe
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
Damian Mooyman
8de154d92c
BUG Restore missing '(Choose Page)' text in link insert modal
2017-11-16 14:43:32 +13:00
Chris Joe
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
Chris Joe
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
Damian Mooyman
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
Christopher Joe
1b190de7e1
BUG Fix regression to cancel draft changes
2017-11-03 10:44:05 +13:00
Damian Mooyman
02e4273680
Update translations
2017-11-02 16:30:42 +13:00
Damian Mooyman
27907304c1
BUG Ensure we publish pages to update permissions during testing
2017-11-02 15:59:41 +13:00
Damian Mooyman
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
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
Damian Mooyman
6c2d5311d3
Docblock
2017-11-02 11:29:49 +13:00
Chris Joe
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
Damian Mooyman
0946332915
Remove table prefix
2017-11-01 17:19:04 +13:00
Christopher Joe
c331dedae9
BUG Fix ambiguous query for content report
2017-11-01 17:02:00 +13:00
Damian Mooyman
1bdfd05648
BUG Remove usage of deprecated each()
2017-11-01 14:51:14 +13:00
Paul
a46b5508a9
Merge pull request #2004 from creative-commoners/pulls/4.0/warning-button-state-for-revert
...
FIX Add warning state to revert action in CMS page history
2017-10-31 10:36:15 +13:00
Damian Mooyman
4fb5306008
BUG Safely check for is_site_url before parsing a shortcode
2017-10-30 14:38:31 +13:00
Robbie Averill
4d0632892b
FIX Add warning state to revert action in CMS page history
2017-10-27 17:32:00 +13:00
Daniel Hensby
9e31c3240b
Add composer autoloading support to 3.x
2017-10-25 17:58:53 +01:00
Damian Mooyman
cb0c00440a
Update translations
2017-10-25 16:18:08 +13:00
Chris Joe
82d85e15cf
Merge pull request #2001 from creative-commoners/pulls/4.0/i-require-monkey-bars
...
Separate logic for whether to show the link text from the renderModal method
2017-10-25 13:08:13 +13:00
Robbie Averill
23d00fb9f1
Separate logic for whether to show the link text from the renderModal method
2017-10-25 12:11:23 +13:00
Damian Mooyman
8c9dd7d804
Merge pull request #1998 from open-sausages/pulls/4/inspect-upgrade-warnings
...
Upgrading rules for new inspect/warning capabilities
2017-10-24 15:28:02 +13:00
Damian Mooyman
ab9bf91211
Remove unnecessary warning
2017-10-24 14:29:43 +13:00
Ingo Schommer
276400eb59
Upgrading rules for new inspect/warning capabilities
2017-10-24 13:10:16 +13:00
Damian Mooyman
7b71b2868e
Merge pull request #1999 from open-sausages/pulls/4.0/you-cannot-see-what-you-cannot-see
...
FIX revert to this button after archiving
2017-10-24 09:46:08 +13: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
Christopher Joe
689c198fbe
FIX revert to this button after archiving
2017-10-20 09:26:35 +13:00
Chris Joe
b22ea39ffd
Merge pull request #1996 from open-sausages/pulls/4.0/fix-page-icons
...
BUG Fix page icons in vendor modules
2017-10-19 16:19:46 +13:00
Damian Mooyman
77b26b36fd
BUG Fix page icons in vendor modules
2017-10-19 15:41:12 +13:00
Loz Calver
c5335c4c2c
Merge pull request #1997 from SilbinaryWolf/doc-location
...
DOC: Update comment to inform the correct location of the PageIconCSS generation code
2017-10-18 09:12:12 +01:00
Jake B
1013c2b006
DOC: Update comment to inform the correct location of the PageIconCSS generation code
2017-10-18 15:23:39 +11:00
Damian Mooyman
2ff8c057e1
Merge pull request #1992 from open-sausages/pulls/4.0/i-dont-like-this-tree
...
FEATURE hide tree view icon when searching
2017-10-17 16:12:06 +13:00
Christopher Joe
78f39e6b11
FEATURE hide tree view icon when searching
2017-10-17 15:54:41 +13:00
Damian Mooyman
e251d481e6
Merge pull request #1991 from open-sausages/pulls/4.0/i-smith-thee-with-my-css-hammer
...
BUG Fix up markup and classes to work better with flexbox
2017-10-17 14:38:04 +13:00
Christopher Joe
199f83775c
BUG standardise "cms-content-header" content with ModalAdmin layout
2017-10-17 12:04:04 +13:00
