Commit Graph

5050 Commits

Author SHA1 Message Date
Daniel Hensby
95bb134e64 Merge pull request #1566 from jonom/fix-direct-edit
FIX Direct edit file by URL
2016-08-01 00:58:29 +01:00
Jonathon Menz
c965133da0 FIX Direct edit file by URL
Trying to navigate directly to the edit view of a file by URL would fail if a folder other than the file’s parent was held in session data. Removed reliance on current ID in session and added folder detection for edit view.
2016-07-29 16:53:31 -07:00
Damian Mooyman
8e9a243966 Merge pull request #1532 from open-sausages/pulls/4.0/history-panel-tidyup
History panel forms markup add extra table header class
2016-07-29 17:04:55 +12:00
Paul Clarke
84e946a035 History panel tidy up styles 2016-07-29 10:21:30 +12:00
Sam Minnée
006d03eacc Merge pull request #1554 from open-sausages/pulls/4.0/bootify-forms-addpage
Add page styles based on the new bootstrap forms
2016-07-28 18:12:40 +12:00
Damian Mooyman
d7fa00267e
Fix field casting 2016-07-28 12:06:05 +12:00
Paul Clarke
1c2228f508 Template reorder and adjust step styles 2016-07-28 10:24:06 +12:00
Daniel Hensby
41f7e5bd27
Removing accidental file addition 2016-07-26 00:16:02 +01:00
Paul
c3d5498041 Merge pull request #1562 from open-sausages/pulls/4.0/bootstrap-page-search
Adjust layout of page search form
2016-07-26 10:54:49 +12:00
Damian Mooyman
47e06bd2be Adjust layout of page search form 2016-07-26 10:42:23 +12:00
Daniel Hensby
75d72285c7 Merge pull request #1556 from open-sausages/pulls/4.0/remove-obsolete-actions
API Remove obsolete API
2016-07-25 15:33:21 +01:00
Daniel Hensby
1ae58bbc82
Merge branch '3' 2016-07-25 14:51:39 +01:00
Damian Mooyman
3306deb69b BUG Fix link concatenation in SilverStripeNavigator (#1560)
Fixes #1557
Fixes https://github.com/tractorcow/silverstripe-fluent/issues/219
2016-07-25 14:34:45 +01:00
Daniel Hensby
3959508463
Merge branch '3.4' into 3 2016-07-25 14:12:49 +01:00
Daniel Hensby
4f99ced5df
Merge branch '3.3' into 3.4 2016-07-25 14:12:31 +01:00
Damian Mooyman
ff07a2e264 API Convert CMS forms to bootstrap
API Update to cms-forms theme

This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
2016-07-25 17:25:22 +12:00
Damian Mooyman
886d65ad37 API Remove obsolete Folder_UsusedAssetsField 2016-07-25 10:16:18 +12:00
Damian Mooyman
4d007cd13c API remove obsolete CMSMain::buildbrokenlinks() 2016-07-25 10:15:45 +12:00
Damian Mooyman
b135c2566c API remove obsolete UpgradeSiteTreePermissionSchemaTask 2016-07-25 10:15:28 +12:00
Robbie Averill
82e54314bf FIX do not show HiddenClass pages in allowed children (#1555)
* FIX do not show HiddenClass pages in allowed children

* Resolves #1553

* * Update SiteTreeTest to include HiddenClass checks
* Refactor testAllowedChildren to use a data provider
2016-07-22 09:45:14 +01:00
Daniel Hensby
a8cf17b008 Merge pull request #1551 from phptek/issue/1054
FIX: Fixes #1054 By preventing errors in the CMS _only_.
2016-07-21 12:18:33 +01:00
Russell Michell
10e06dce50 FIX: Fixes #1054 By preventing errors in the CMS _only_.
MINOR Boyscouting: Addition of missing braces, default return and missing types in @return annotation.
2016-07-21 20:07:30 +12:00
Daniel Hensby
6b4617d476 Merge pull request #1549 from dhensby/pulls/4/admin-url-fix
FIX Allow changing admin URLs
2016-07-19 14:48:19 +01:00
Christopher Joe
adcc5251b5 added translation to src file 2016-07-19 10:04:24 +12:00
Daniel Hensby
0a7437db40
FIX Allow changing admin URLs 2016-07-18 12:44:20 +01:00
Daniel Hensby
4861310834 Merge pull request #1538 from tractorcow/pulls/4.0/fix-canpublish
BUG Restore SiteTree::canPublish method to resolve incorrect fallback…
2016-07-18 00:17:17 +01:00
Damian Mooyman
abda4dc2d8
BUG Restore SiteTree::canPublish method to resolve incorrect fallback to SiteTreeExtension
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5625
2016-07-18 10:59:07 +12:00
Hamish Friedlander
0f950800ef FIX wrongly named themes after themestack API change (#1548) 2016-07-15 17:13:53 +12:00
Daniel Hensby
7e5f0087b8
Merge branch '3' 2016-07-14 12:25:54 +01:00
Daniel Hensby
dc4a02087b
Merge branch '3.4' into 3 2016-07-14 12:24:31 +01:00
Daniel Hensby
c7b1a4ded8
Merge branch '3.3' into 3.4 2016-07-14 12:24:04 +01:00
Hamish Friedlander
563e942e18 Merge pull request #1546 from open-sausages/pulls/4.0/casting-regressions
BUG Fix regressions from https://github.com/silverstripe/silverstripe-framework/pull/5653
2016-07-14 15:38:32 +12:00
Damian Mooyman
f8b1c27e3c BUG Fix regressions from https://github.com/silverstripe/silverstripe-framework/pull/5653 2016-07-14 11:51:14 +12:00
Daniel Hensby
e5aad336ce Merge pull request #1525 from tractorcow/pulls/4.0/dupe-api
API Cleanup inconsistent SiteTree::duplicate API
2016-07-14 00:41:40 +01:00
Daniel Hensby
53daaf9d55 Merge pull request #1520 from tractorcow/pulls/4.0/default-cast
API Respect default_cast
2016-07-13 10:59:31 +01:00
Daniel Hensby
dc8d4ffe0b API Refactor usages of HTMLText -> HTMLFragment
API Revert hack in VirtualPage
API Respect default_cast
2016-07-13 18:48:46 +12:00
Daniel Hensby
1cc39a9c0b Merge pull request #1542 from tractorcow/pulls/3.3/fix-live-link
BUG Fix getAbsoluteLiveLink() concatenation
2016-07-12 13:52:57 +01:00
Damian Mooyman
8123c433f0 BUG Fix getAbsoluteLiveLink() concatenation
Fixes #1183
2016-07-12 15:57:52 +12:00
Daniel Hensby
3a395e6d56
Merge branch '3' 2016-07-12 01:13:07 +01:00
Daniel Hensby
00d16ec276
Merge branch '3.4' into 3 2016-07-12 01:12:07 +01:00
Daniel Hensby
a2657b519a
Merge branch '3.3' into 3.4 2016-07-12 01:08:54 +01:00
Daniel Hensby
118a09afff
Merge branch '3.2' into 3.3 2016-07-12 01:07:12 +01:00
Hamish Friedlander
d2485a60fd Merge pull request #1536 from open-sausages/pulls/4.0/namespace-security
API Apply SilverStripe\Security namespace
2016-07-07 13:24:25 +12:00
Daniel Hensby
ba98f77747 Merge pull request #1540 from open-sausages/pulls/4.0/fix-tab-styles
BUG Fix missing tabs layout in pages view
2016-07-06 12:48:56 +01:00
Damian Mooyman
59d4b51d8e BUG Fix missing tabs layout in pages view 2016-07-06 16:56:30 +12:00
micmania1
5f2d8cae0d
Merge pull request #1522 from micmania1/fix-sitetree-rading-stage 2016-07-05 16:13:23 +01:00
Damian Mooyman
25e4cad164
API Apply SilverStripe\Security namespace 2016-07-05 15:08:05 +12:00
Ingo Schommer
d208a6f511 Merge pull request #1534 from open-sausages/pulls/4.0/namespace-orm
API Update for new SilverStripe\ORM namespace
2016-07-01 15:09:00 +12:00
Christopher Joe
49e5cd54fa When page is disabled, rename "Edit" label in contextmenu and hide duplicate options 2016-06-30 17:28:17 +12:00
Damian Mooyman
bf511939f4 Merge pull request #1514 from stevie-mayhew/pulls/redirector-description
DOCS: updated description for redirector page
2016-06-28 18:13:28 +12:00