tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
4,674 Commits 29 Branches 403 Tags 28 MiB
0a2456e71e
Commit Graph

42 Commits

Author SHA1 Message Date
Damian Mooyman
7dfe145412 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
 2016-01-20 13:16:43 +13:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace. 
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
 2016-01-07 10:32:05 +13:00
Peter Thaleikis
4694763fa5 remove trailing spaces in the codebase 2015-09-29 17:18:03 +13:00
Stevie Mayhew
7ddf5fa697 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:02 +12:00
Gus King
7b4cc316ef Numerous PHPDoc fixes. 2014-02-10 15:35:13 -05:00
Ingo Schommer
2deb525d47 Using new CMSForm class to allow for validation errors in CMS 
This class allows deferring handling of responses to the parent
controller's response negotiator implementation.
 2013-06-13 07:44:37 +02:00
Sean Harvey
c7ebf76757 Page history panel: show appropriate message when viewing latest version 2013-05-07 17:14:28 +12:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:21:04 +01:00
Ingo Schommer
537b0c6117 Define $allowed_actions consistently 
Required due to stricter $allowed_actions checks in 3.1
 2013-02-18 15:12:46 +13:00
Ingo Schommer
53c2059a01 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	code/controllers/SilverStripeNavigator.php
 2013-02-07 21:44:41 +01:00
Ingo Schommer
97fbfd3f12 FIX Respect escaping rules on readonly fields in CMS history view 
Avoids showing unescaped HTML on fields which didn't allow it otherwise,
e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
which got evaluated within the CMS. If this section contains any
JavaScript it gets executed and can disrupt CMS operation.
 2013-02-04 17:16:15 +01:00
Ingo Schommer
649de6e1bc BUG Reinstated CMS "History" Preview (fixes ##8089) 2013-01-25 11:35:48 +01:00
Mateusz Uzdowski
230182fc77 Remove preview button from history section. 
No longer works. Needs to be rewritten to work with side-by-side.
 2012-12-10 18:09:54 +01:00
Ingo Schommer
027a41aec7 Consistent naming for root breadcrumb on page controllers (fixes #8057) 2012-11-29 14:43:37 +01:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Ingo Schommer
f454f481f2 BUG Session namespace sharing for CMS controllers 
Ideally we could do this without session, but pragmatically
we still need it, because of the inflexible routing system,
and because of performance considerations.

Example: The tree is lazy loaded via a generic  URL (admin/pages/treeview).
While we could add ?ID=<currentpage> to make the view (more or less) stateless,
it would trigger a full tree reload on every tree navigation action.
Instead, we assume that all "reachable" nodes are already cached,
and simply mark a different one as current. For this to work, we need
shared session state between CMS controllers.

See http://open.silverstripe.org/ticket/7815 for detail.
 2012-08-29 15:09:15 +02:00
Naomi Guyer
7c0e38707c BUG: Missing preview archive version button (fixes 7656) 
Added missing preview button
 2012-07-31 17:49:59 +12:00
Ingo Schommer
c8052da5b8 BUGFIX Corrected page history pane loading (fixes #7477) 2012-06-15 12:50:54 +02:00
Ingo Schommer
38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Ingo Schommer
6aeac37906 API CHANGE Combined "Pages" and "Edit Page" into a single menu entry 
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
 2012-04-17 22:59:08 +02:00
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +12:00
Ingo Schommer
69e819a417 BUGFIX Moved 'rollback' logic back from CMSPageHistoryController to CMSMain (used in edit mode as well), removed unnecessary performRollback(), and introduced PJAX response handling to ensure the edit view is loaded correctly regardless of context (edit or history mode) (fixes #7108) 2012-04-11 10:19:54 +02:00
Ingo Schommer
3341a181c7 MINOR Using SS_HTTPRequest->isAjax() instead of deprecated RequestHandler API 2012-04-05 14:45:26 +02:00
Ingo Schommer
c6b259e856 MINOR Redirect to page edit view after rolling back to a specific version in CMSPageHistoryController (fixes #6912) 2012-03-27 14:50:09 +02:00
Ingo Schommer
44a4e8a840 MINOR Fixed "Pages" breadcrumbs not to include root node, since its already in the tree panel 2012-03-12 11:52:39 +01:00
Ingo Schommer
ce5204f2f8 MINOR Respect permission failures from parent implementation in CMSPageHistoryController 2012-03-08 20:02:15 +01:00
Ingo Schommer
e0a67a80c7 BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 18:42:44 +01:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
Ingo Schommer
8c503069b8 MINOR Removed jQuery.metadata usage in CMS, use jQuery.data() and HTML5 data attributes instead. Also fixes errors where jQuery.metadata tries to eval() HTML5 data attrs, which isn't always applicable 2012-02-16 18:06:48 +01:00
Ingo Schommer
c5323547b8 BUGFIX Fixed loading of full page template via ajax in CMSPageHistoryController, which causes infinite loops in CMS initialization 2011-10-29 22:04:40 +02:00
Sam Minnée
7394c31a44 Merge pull request #32 from stojg/release/new-orm-cleanup 
Release/new orm cleanup
 2011-10-28 21:33:48 -07:00
Will Rossiter
c34ef60d82 BUGFIX prevent calling function on null record 2011-10-29 15:46:38 +13:00
Stig Lindqvist
05e90838c0 API CHANGE Switch usage from FieldSet to FieldList 2011-10-27 20:24:45 +02:00
Ingo Schommer
f7d322a004 BUGFIX Marking fields as readonly in CMSMain->compareversions() before loading data, to avoid loading invalid values (HTML diffs) into the fields (AIR-39) 2011-10-07 12:07:46 +02:00
Will Rossiter
010829f6fb MINOR: added note to select two entries 2011-09-19 21:38:19 +02:00
Ingo Schommer
ab9d62b53c MINOR Removed hardcoding of history ajax links 2011-09-19 21:34:46 +02:00
Ingo Schommer
10e76830c4 MINOR Fixed history panel non-ajax loading and version links in "comparing X and Y" titles 2011-09-19 21:06:39 +02:00
Will Rossiter
ecae94e8c2 MINOR: added unit test for checking whether viewing an unpublished version directly selects the checkbox option 2011-09-19 17:30:47 +02:00
Will Rossiter
11821f3e43 ENHANCEMENT: implemented further tests for CMSPageHistoryController::getEditForm() 2011-09-19 17:30:47 +02:00
Will Rossiter
18471e8878 ENHANCEMENT: added tests for CMSPageHistoryController::VersionsForm(). BUGFIX: fixed VersionsForm hidden ID storing a reference to itself. ENHANCEMENT: changed url structure from /version/ to /show/ for consistency between CMSPageHistoryController and CMSMain. APICHANGE: moved performRollback() from CMSMain to CMSPageHistoryController 2011-09-19 17:30:47 +02:00
Will Rossiter
f81531115f ENHANCEMENT: added notice template for outputting notices to cmsmain interfaces. 2011-09-19 17:30:47 +02:00
Will Rossiter
d90ea0d236 ENHANCEMENT: implemented CMSPageHistoryController with comparsion view, single version view into new CMSMain API. 2011-09-19 17:30:46 +02:00