Commit Graph

5745 Commits

Author SHA1 Message Date
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 74495b498f
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-25 17:01:34 +13: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 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
Sam Minnee 494dbd1ef2 Merge branch '4.0' into 4 2017-10-20 18:46:05 +13: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
Damian Mooyman c2d9a0dc3b Merge pull request #1993 from open-sausages/pulls/4/hierarchy-cascading-deletes
Force SiteTree to check in DB before deleting children
2017-10-17 11:22:34 +13:00
Aaron Carlino 88dd3cb807 Force SiteTree to check in DB before deleting children 2017-10-17 11:01:44 +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
Damian Mooyman a1dd53e559 Merge pull request #1886 from Firesphere/disallow-fixed-routes
Disable the ability to use reserved URL's
2017-10-16 11:37:05 +13:00
Simon Erkelens 9eacf0eee6 Disable the ability to use reserved URL's
Fixes https://github.com/silverstripe/silverstripe-framework/issues/7139

Move check for disallowed rules to validURLSegment

Fix test
2017-10-14 12:08:31 +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
Christopher Joe a930d7ae2e BUG Fix up markup and classes to work better with flexbox 2017-10-12 16:49:19 +13:00
Damian Mooyman b67f1e8d5a
Merge remote-tracking branch 'origin/4.0' into 4 2017-10-12 11:33:50 +13:00
Damian Mooyman acadcadbdf
Update composer 2017-10-12 11:30:11 +13:00
Damian Mooyman 42cd0903df Update translations 2017-10-11 17:46:48 +13:00
Damian Mooyman 18a3d28569 Remove obsolete branch-alias 2017-10-11 17:31:43 +13:00
Loz Calver 65db25e3f7 Merge pull request #1987 from open-sausages/pulls/4.0/fix-icon-urls
Fix icon urls
2017-10-10 10:25:18 +01:00
Damian Mooyman c8f95182cb
Fix icon urls 2017-10-10 17:03:22 +13:00
Chris Joe 504b014bab Merge pull request #1986 from open-sausages/pulls/4.0/better-beta4-upgrade
Fix paths in Install_successfullyinstalled.ss
2017-10-10 13:26:11 +13:00
Damian Mooyman 9d873db976
Fix paths in Install_successfullyinstalled.ss 2017-10-10 11:23:21 +13: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
Chris Joe 06dcc42fc0 Merge pull request #1956 from open-sausages/pulls/4.0/unique-icons-css
BUG Prevent icons CSS being included twice
2017-10-05 10:21:08 +13:00
Damian Mooyman 49fd3391fe BUG Prevent icons CSS being included twice 2017-10-05 10:04:57 +13:00