Patrick Nelson
ff6c0a3160
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-08 17:48:31 -04:00
Patrick Nelson
785f85047f
FIX for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-08 17:38:58 -04:00
Peter Thaleikis
4694763fa5
remove trailing spaces in the codebase
2015-09-29 17:18:03 +13:00
David Craig
1ea22c766c
Move UI to main assets area
2015-09-29 09:35:28 +13:00
Peter Thaleikis
f291c5f365
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-09-28 22:31:31 +13:00
Damian Mooyman
8e3f549b19
BUG Fix regressions in CMS from db field changes
2015-09-28 17:22:44 +13:00
Daniel Hensby
f7985b34f2
Merge pull request #1259 from stevie-mayhew/pulls/get_response
...
UPDATE: make all response code use getResponse() method
2015-09-25 12:23:43 +01:00
Stevie Mayhew
d54e117392
UPDATE: make all response code use getResponse() method
2015-09-25 09:10:24 +12:00
Damian Mooyman
e68a752ac7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
.travis.yml
2015-09-09 14:53:48 +12:00
Damian Mooyman
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
Damian Mooyman
f2efbefb8c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
2015-09-09 14:09:00 +12:00
scott1702
c028278957
Update font icons to use new library
2015-08-25 15:08:09 +12:00
Sam Minnée
da348f74e8
Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions
...
BUG block adding children from archived pages
2015-08-24 17:04:46 +12:00
Damian Mooyman
46180f671e
Fix missing packages
2015-08-24 16:14:33 +12:00
Damian Mooyman
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
Stephen Shkardoon
b87f5473d9
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
...
Previously, we would be limited by the way allParams will return 3 parameters
at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Daniel Hensby
7d50e0fac7
Merge branch '3'
...
Conflicts:
.travis.yml
2015-08-17 14:24:16 +01:00
Daniel Hensby
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
Daniel Hensby
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
Damian Mooyman
e22b653e06
API batch restore action
2015-08-03 20:57:30 +12:00
Damian Mooyman
3790273ae7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
2015-07-31 15:49:46 +12:00
Damian Mooyman
71b23b622c
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-31 14:34:04 +12:00
Jonathon Menz
7041a43684
Moved image thumbnail style rules to Framework
...
for consistent styling of image thumbnails in GridFields
2015-07-30 16:15:35 -07:00
Loz Calver
10b2fdc318
FIX: ContentController::getViewer() not returning all found templates ( fixes #1244 )
2015-07-24 11:50:09 +01:00
Dan Hensby
a94881372f
Merge remote-tracking branch 'origin/3.2' into 3
2015-07-20 14:14:28 +00:00
Daniel Hensby
f55b22bd75
Merge branch '3.1' into 3.2
...
Conflicts:
CONTRIBUTING.md
code/reports/BrokenLinksReport.php
code/reports/SideReport.php
tests/model/RedirectorPageTest.php
tests/reports/ReportTest.php
2015-07-20 11:09:29 +01:00
Fred Condo
f9cceaada0
Correct doubly-escaped " marks
...
The links in the Broken Links Report had extraneous " marks that made
them unusable. This fixes the links.
2015-07-01 17:42:26 -07:00
Loz Calver
d78d325073
FIX: RedirectorPage_Controller shouldn't attempt redirection if the response is finished ( fixes #1230 )
2015-06-26 10:47:39 +01:00
Daniel Hensby
524b36b75c
Merge pull request #1213 from nglasl/3.1
...
FIX Enforced the published/draft selection for SS reports, which was bein…
2015-06-24 08:08:37 +01:00
David Craig
cc3385b9f8
Move filters from panel to header
...
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
- Renamed to Bulk actions
- Styles updated
- Added placeholder text / removed redundant option
- Now appears in SiteTree view too
2015-06-24 09:58:48 +12:00
Stephen Shkardoon
b71a521c21
Fix incorrect permission check on duplicate()
...
Will now properly fall back to the canCreate() on the parent
2015-06-23 16:42:08 +12:00
Devlin
bc4dc5cf79
increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain
2015-06-22 14:15:49 +02:00
Nathan Glasl
0de71d45db
Enforced the published/draft selection for SS reports, which was being ignored due to previous code refactoring.
2015-06-22 16:05:13 +10:00
Damian Mooyman
04a513b0a8
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 12:00:42 +12:00
Damian Mooyman
8de0106fea
Merge remote-tracking branch 'origin/3.1' into 3.2
2015-06-19 10:35:00 +12:00
Daniel Hensby
0b92a61e51
Updating docs link in default install
...
Fixing the default Content for Homepage to link to docs.silverstripe.org (there's an "s" at the end of "docs")
2015-06-18 16:47:10 +01:00
Daniel Hensby
e9fde144eb
Merge pull request #1201 from scott1702/update-content
...
Update default home content
2015-06-17 15:40:17 +01:00
Damian Mooyman
4aa84f3dd2
API make DataObject::validate public
...
See https://github.com/silverstripe/silverstripe-framework/pull/4294
2015-06-17 15:57:12 +12:00
Damian Mooyman
dd49a888e8
Merge remote-tracking branch 'origin/3'
2015-06-17 15:54:01 +12:00
scott1702
60c68098eb
Update default home content
2015-06-17 13:04:29 +12:00
Damian Mooyman
f3e1472493
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:44:19 +12:00
scott1702
ffb6c38e3d
Remove 'Filtered Tree' notification when clearing the filter
2015-06-15 16:54:41 +12:00
Daniel Hensby
715cd9ab4e
Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation
...
Conflicts:
tests/model/SiteTreeTest.php
2015-06-13 15:23:22 +01:00
Stan Hutcheon
e2d85b2f88
VirtualPage call init on target controller
2015-06-13 12:38:59 +12:00
Damian Mooyman
3bc76e69fb
API Formalise new DataObject::canCreate argument
2015-06-09 11:32:38 +12:00
Damian Mooyman
e99554fc17
Merge remote-tracking branch 'origin/3.1' into 3
2015-06-09 11:11:39 +12:00
Stevie Mayhew
a819bcfc97
FIX: explicitly call get functions for site tree checks
2015-06-05 11:09:23 +12:00
Damian Mooyman
b169823a00
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
2015-06-03 14:46:16 +12:00
Damian Mooyman
1f9fc33349
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteTree.php
code/model/SiteTreeLinkTracking.php
tests/controller/CMSMainTest.php
2015-06-02 19:23:48 +12:00
Jonathon Menz
dbe2ad4f9f
FIX: Folder expansion icons
...
This is a companion fix for https://github.com/silverstripe/silverstripe-framework/pull/4202
2015-05-29 08:43:44 -07:00
Damian Mooyman
c5e0c8f007
API Enable tree filter highlighting
...
Decoupling of CMS / Framework
2015-05-04 17:05:35 +12:00
Stevie Mayhew
7ddf5fa697
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:02 +12:00
Ingo Schommer
36ac61115a
Fix auto-setting of URL from localized page titles
...
Replace the hardcoded check for english locale ("new-page")
with a localized version.
See https://github.com/silverstripe/silverstripe-translatable/issues/180
2015-04-29 00:16:53 +12:00
Ingo Schommer
221281dade
Merge pull request #1181 from dhensby/pulls/injector-searc-form
...
FIX Use SearchForm::create to instantiate SearchForm
2015-04-29 00:11:52 +12:00
Ingo Schommer
94d354de4a
Fixed BacklinkTracking filter usage
...
Previous deprecation fixes made this method error out
when called on the root node (ID=0), so when admin/assets is first called.
2015-04-28 23:34:26 +12:00
Ingo Schommer
812a921072
Merge branch 'pulls/dataobject-relation-updates' of https://github.com/dhensby/silverstripe-cms into dhensby-pulls/dataobject-relation-updates
2015-04-28 23:17:25 +12:00
David Craig
7bdca7f5cc
Added a list of pages where a file is used
2015-04-28 13:15:44 +12:00
Stephen Shkardoon
857ade7d1d
Refactor ErrorPage to have static file building in a separate method
2015-04-27 11:56:54 +12:00
Nik Rolls
5163690bdc
PHPDoc improvements for SiteTree and SiteTreeLinkTracking
...
- Removed @param/@method references to fields from extensions
- Added @mixin references to extensions
- Fixed incorrect PHPDoc @params and @returns
- Fixed wrapping width on many docblocks
- Added and/or improved method documentation when missing or confusing
- Fixed typos as found
2015-04-20 20:59:52 +12:00
Michael Strong
5ab15da8fe
Concat links in "broken links" report ( fixes #1117 )
...
Fixes operation with any modules that add GET parameters to CMS links,
such as the Translatable module.
Pull request by @micmania1, see https://github.com/silverstripe/silverstripe-cms/pull/1118 .
Modified by @chillu based on peer review feedback.
2015-04-19 22:39:57 +12:00
Colin Tucker
02fcf6429b
Issue #1150 : Removed Save and Delete buttons from regular edit form.
2015-04-17 09:19:15 +10:00
Daniel Hensby
a71f5f99fa
FIX Use SearchForm::create to instantiate SearchForm
2015-03-31 17:03:17 +01:00
Damian Mooyman
cf4d9edafb
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteConfig.php
javascript/CMSMain.AddForm.js
tests/model/SiteConfigTest.php
tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman
a84361e4e8
Ensure SiteConfig::canView
2015-03-19 16:16:54 +13:00
Damian Mooyman
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
Loz Calver
e0afd2f772
Update use of DataObject methods (as per framework #3799 )
2015-03-13 22:11:51 +00:00
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
Damian Mooyman
cabd8bbab9
Merge pull request #1132 from kinglozzer/pulls/virtualpage-casting
...
FIX: VirtualPages use correct casting for 'virtual' database fields
2015-03-06 11:29:18 +13:00
Damian Mooyman
21e2bc7258
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/reports/Report.php
2015-02-20 10:16:37 +13:00
Daniel Hensby
fe8cbc89d4
Remove double escaping of report data
2015-02-08 02:11:17 +00:00
Daniel Hensby
a530085016
FIX External redirects shouldnt show in preview pane
2015-02-08 00:30:38 +00:00
Michael Strong
7733c4335e
BUG Correctly sanitise Title
2015-01-22 17:54:05 +13:00
Damian Mooyman
475b6d18e5
Merge remote-tracking branch 'composer/3.1' into 3
2015-01-15 17:48:11 +13:00
Stephen McMahon
9d888d5dde
BUG: Fixed SearchForm not calling getTemplate() in forTemplate()
2014-12-02 15:13:42 +11:00
Damian Mooyman
d01883a5f8
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/model/SiteConfig.php
2014-11-18 12:45:42 +13:00
Loz Calver
a142ffd465
FIX: VirtualPages use correct casting for 'virtual' database fields
2014-11-17 15:44:17 +00:00
Daniel Hensby
dd0332d66d
Merge branch 'guywatson-patch-1' into 3.1
2014-11-03 23:06:38 +00:00
guywatson
d2f0eafa27
Add an extension hook to the getIsModifiedOnStage method
2014-11-03 23:04:28 +00:00
Sean Harvey
56142b8bba
BUG sprintf missing on exception in SilverStripeNavigator
2014-11-03 14:09:27 +13:00
micmania1
8310135923
FIX Broken links on dependent pages tab
2014-10-23 21:53:12 +00:00
Nerijus Eimanavičius
7f3563cd72
Fixes #1112
...
Fixes #1112 $conn->fieldList('SiteTree') has protected access but is called from SiteTree
2014-10-07 10:11:49 +03:00
Daniel Hensby
89184a8134
Implement TemplateGlobalProvider
on SiteConfig
...
Seeing as the `SiteConfig` is a site wide and "global" object, it makes sense to have it universally available to the templates
2014-08-22 14:28:19 +01:00
Sean Harvey
195ef05c8d
Removing deprecated method
2014-08-22 18:16:03 +12:00
Mateusz Uzdowski
2ba1c46bc8
API Change broken link hihglighting to write to database.
...
Before it would be applied on the fly during the rendering of the
HtmlEditorField, and only be written to the database during the
subsequent write.
We just shift the behaviour to apply just-in-time.
2014-08-15 12:29:26 +12:00
Mateusz Uzdowski
b41e081130
Refactor the link-tracking code and move it from framework.
...
This code has a dependency on SiteTree, so it fits much better in the
cms module.
Abstracted away the content parser so the same code can be reused both
in the render phase (to highlight the links) and in the write phase
(storing information about broken links and references).
2014-08-14 11:16:49 +12:00
Mateusz Uzdowski
52d297e6ef
Merge remote-tracking branch 'origin/3.1' into merge-back
...
Conflicts:
code/controllers/CMSSiteTreeFilter.php
code/controllers/ReportAdmin.php
code/reports/Report.php
2014-08-13 17:19:01 +12:00
Sean Harvey
796874dae7
Merge pull request #1017 from tractorcow/pulls/3.1/fix-report-sorting
...
BUG Fix sorting on main ReportAdmin grid
2014-08-13 10:52:51 +12:00
Will Rossiter
18d6c538a7
API: Extract siteconfig out to an external module.
2014-08-09 17:29:50 +12:00
madmatt
4e5b1966d3
Fix changed pages filter to match SiteTree's 'MODIFIED' label
2014-08-07 16:48:06 +12:00
Damian Mooyman
53dbbb7982
BUG Fix CMSMain::getList to correctly respect filter result
...
Fixes #1064
CMSSiteTreeFilter refactored to allow SS_List of filtered pages to be returned
2014-08-06 15:00:48 +12:00
Damian Mooyman
1c48cb6aae
BUG Fix search range for asset filter
2014-08-06 13:26:23 +12:00
Jakx.nz
20df063f43
#1067 No updateEditForm hook on CMSFieldAddController::getEditForm()
2014-08-01 10:37:11 +12:00
Stig Lindqvist
482c23f18e
NEW Adding CMS sitetree filter to see the current 'live' site
...
This adds a new filter that will show a content editor what the current published site-tree
looks like for a visitor. This helps when there is a lot of drafted content that get included
in the default filter 'All Pages'
2014-07-29 13:12:36 +12:00
Stig Lindqvist
45046f08e8
Bug: CMS tree filters doesn't count the correct number of children for deleted pages
...
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.
This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.
The solution involves a couple of smaller fixes in both CMS and framework modules.
1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
2014-07-25 16:18:54 +12:00
Simon Welsh
6a0366fb84
Merge pull request #1060 from stojg/pull/search-for-date
...
BUG: Narrowing site tree search to one date shows no pages
2014-07-24 13:32:31 +10:00
Stig Lindqvist
3eefd65f7c
BUG: Narrowing site tree search to one date shows no pages
...
It turns out that the search doesn't work if you put the same date into both start and end date. Adding
time to the query seems to fix this issue.
2014-07-24 15:24:03 +12:00
Damian Mooyman
a395c5322f
API Move of codebase to parameterised query database abstraction layer
...
API Renamed DB static methods to properly conform to naming convention (lowercase, underscored)
API Replaced deprecated method
2014-07-07 15:07:37 +12:00
Will Rossiter
a777266e43
FIX ensure controller stack is updated when execution halted by an exception.
...
See: https://github.com/silverstripe/silverstripe-framework/issues/2467
popCurrent would be incorrectly not pop a controller from the controller stack if an exception was throw from inside the handleRequest() method.
This change captures the exception, ensures the controller is popped from the stack and passes the exception along.
2014-07-01 14:18:53 +12:00
Rodney Way
1e194854e0
BUG: Ensure that all child pages are deleted (regardless of ShowInMenu status) under enforce_strict_hierarchy.
...
Also updated SiteTree YML test data to match.
2014-06-24 13:29:16 +10:00
Damian Mooyman
519b0dfaa0
Merge remote-tracking branch 'origin/3.1'
2014-06-17 18:18:21 +12:00
Damian Mooyman
b8d19ba495
BUG Fix deleted pages redirecting the CMS
...
Update behat tests for Mink 1.6 compatibility
2014-06-17 10:36:08 +12:00
Stig Lindqvist
30d42e06d6
Merge pull request #1013 from tractorcow/pulls/3.2-fix-fulltext-query-encoding
...
BUG Fix encoding of SearchForm::getSearchQuery
2014-06-14 17:15:40 +12:00
Damian Mooyman
1a85c7a1ec
Merge pull request #1022 from silverstripe-iterators/pulls/redirector-proto-relative
...
Pulls/redirector proto relative
2014-06-13 16:01:20 +12:00
Damian Mooyman
cba0061fe2
Merge pull request #974 from micmania1/930-added-breadcrumbs-getter
...
API Added getBreadcrumbItems to SiteTree
2014-06-03 08:43:53 +12:00
Ingo Schommer
40f7a876d4
Support for protocol relative RedirectorPage.ExternalURL
2014-05-30 00:01:45 +12:00
Damian Mooyman
7277dc1600
BUG Fix sorting on main ReportAdmin grid
...
ref: CWPBUG-133
2014-05-15 14:49:41 +12:00
Damian Mooyman
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
micmania1
f46b6bde51
Added getBreadcrumbItems to SiteTree
2014-05-08 03:21:40 +01:00
Damian Mooyman
3162d0e664
API Update ErrorPage to respect new HTTP Error codes
2014-05-06 15:29:33 +12:00
Damian Mooyman
5dd058338a
BUG Fix encoding of SearchForm::getSearchQuery
...
This made it awkward for user code to extract the query value for use in other applications; This would otherwise have to be xml decoded again.
Casting has been promoted to the templating level via DBField::create_field and a `SearchForm.casting` config setting.
2014-05-06 11:11:46 +12:00
Damian Mooyman
b3699281c0
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-05-06 10:24:28 +12:00
Damian Mooyman
f9cb8805e1
API Error page support for Security controller errors
2014-05-05 17:13:11 +12:00
Mateusz U
fcb6a9140c
Merge pull request #1004 from tractorcow/pulls/sitetree-title
...
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 14:37:29 +12:00
Damian Mooyman
341eeb7c31
Merge pull request #998 from kinglozzer/pulls/sitetree-file-linktracking
...
FIX: Broken file link tracking (fixes #996 )
2014-04-29 09:36:36 +12:00
Damian Mooyman
89fbae2c2e
BUG Fix encoding of SiteTree.MetaTags
2014-04-29 08:54:17 +12:00
Ingo Schommer
9bff36c078
Merge pull request #994 from tractorcow/pulls/3.1-asset-datefilter
...
API Filter by date created for files
2014-04-28 23:40:17 +12:00
Ingo Schommer
66919ed0cc
Merge pull request #1003 from tractorcow/pulls/3.1-configurable-paging
...
API Ability to configure paging for assets / pages
2014-04-28 23:06:47 +12:00
Loz Calver
396fd9a86e
FIX: Broken file link tracking ( fixes #996 )
2014-04-28 09:26:34 +01:00
Damian Mooyman
0285322049
API Ability to configure paging for assets / pages
...
ref: CWPBUG-143
2014-04-28 15:22:17 +12:00
Russell Michell
a502c9d21c
NEW Fixes #966 . Ability to filter pages on page status.
...
- New filters for statuses normally found through SiteTree::getStatusFlags().
- Refactored menu sorting. Now alphabetical, as it wasn't previously.
2014-04-28 14:50:07 +12:00
Damian Mooyman
61ebe08437
Merge remote-tracking branch 'origin/3.1'
2014-04-22 12:10:49 +12:00
Damian Mooyman
3765030faa
API Filter by date created for files
...
Added test cases
Do not merge before https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/32
ref: CWPBUG-144
2014-04-15 09:42:53 +12:00
Damian Mooyman
baff7f12bd
Merge pull request #968 from phptek/issue/965
...
FIX Fixes #965 . Allow user date-settings to show on GridField Page admin
2014-04-10 14:21:08 +12:00
Damian Mooyman
3204ab5af3
BUG Fix orphaned pages reporting they can be viewed
2014-04-07 12:52:07 +12:00
Damian Mooyman
ecda66a1c4
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:39:47 +13:00
Damian Mooyman
ab78198946
Merge pull request #979 from ss23/SS2014005-3-1
...
FIX Do now allow arbitary class creation in CMS
2014-03-27 12:55:40 +13:00
Stephen Shkardoon
a67ed2799d
FIX Do now allow arbitary class creation in CMS
2014-03-19 19:27:39 +13:00
Stephen Shkardoon
8e50405871
FIX Prevent SQLi when no URL filters are applied
2014-03-19 19:05:13 +13:00
Simon Welsh
b497b8f548
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/reports/Report.php
2014-03-18 09:23:39 +13:00
Russell Michell
b4a1aa4537
FIX Fixes #965 . Allow user date-settings to show on GridField Page admin
...
- Relies on framework PR #2961 .
2014-03-17 10:40:08 +13:00
Simon Welsh
403b47fe6c
Merge pull request #951 from sheadawson/950-fileexists
...
FIX fileexists check
2014-03-16 20:29:12 +13:00
Simon Welsh
2503d1dca2
Merge pull request #911 from chillu/pulls/908-all-sections-canedit
...
Page edit access with CMS_ACCESS_LeftAndMain (fixes #908 )
2014-03-16 20:12:15 +13:00
Simon Welsh
5024a48f89
FIX: Reports with Parameter fields override ReportTitle and ReportDescription
...
Fixes #696
2014-03-16 19:09:47 +13:00
sheadawson
dc865399dc
FIX fileexists check via ajax didnt know what folder the file was being uploaded to. Fixes #950
2014-02-20 15:17:04 +11:00
Ingo Schommer
889e97e17d
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:56 +13:00
Hamish Friedlander
224033e518
FIX Limit ExtraMeta to only allow meta and link elements
2014-02-17 12:08:09 +13:00
Sam Minnee
d0a4fc2065
FIX: Fix failover to index template in ContentController::getViewer()
...
Historically, if you visit a foo action on Page, and Page_foo.ss doesn't exist, then it fails over
to Page.ss. The introduction of ContentController::getViewer() broke this, but this patch adds a
test for this case and fixes it.
It was identified by build failures on silverstripe/userforms when tested against the master branch.
2014-02-14 17:44:53 +13:00
Sean Harvey
0bb5b4c8a4
Merge branch '3.1'
2014-02-12 11:13:29 +13:00
Gus King
7b4cc316ef
Numerous PHPDoc fixes.
2014-02-10 15:35:13 -05:00
Gus King
457cadb103
Documented magic properties/methods of SiteTree and SiteConfig.
2014-02-09 19:13:04 -05:00
Ingo Schommer
683b099308
Merge pull request #914 from micmania1/900-page-templates-without-controller
...
NEW Locate page template without needing to define a controller
2014-02-07 14:20:30 +13:00
Russell Michell
7d7c75414c
NEW Track broken anchors
2014-01-31 12:44:59 +13:00
micmania1
47582b3e3c
getViewer will now locate and use the correct templates for pages which don't have their own controller
2013-12-20 20:52:11 +00:00
Ingo Schommer
07033548fc
Merge remote-tracking branch 'origin/3.1'
2013-12-19 20:22:26 +01:00
Ingo Schommer
1f17f4320d
Page edit access with CMS_ACCESS_LeftAndMain ( fixes #908 )
...
"Access to all sections" implies edit access in the CMS
2013-12-13 10:05:06 +01:00
Martijn
dec2be38fa
use Controller::join_links() for listview links
...
This fixes incorrect adding of the locale parameter when using translatable :
http://site.com/admin/pages/edit/show?locale=nl_NL/11
2013-12-06 15:45:15 +01:00
Ingo Schommer
6403be518a
Backwards compat OldPageRedirector
...
Regression from f972466880
.
Passes tests in 3.1, but fails in master due to Deprecation notices.
Tests needed adjustments because OldPageRedirector::find_old_page()
doesn't have the same method signature...
2013-12-06 14:28:08 +01:00
Ingo Schommer
9ca336bea3
Merge remote-tracking branch 'origin/3.1'
2013-12-02 20:44:57 +01:00
Ingo Schommer
ec41cb38ce
ValidationException support in CMS "Settings" UI
2013-12-02 16:38:46 +01:00
Ingo Schommer
6804461539
Merge pull request #898 from dnadesign/errorpagepermissions
...
FIX: ErrorPage generating empty responses for 403/401 requests
2013-11-22 11:49:37 -08:00
Loz Calver
8f720406b5
Implement History.js logic for "Cancel" action
2013-11-22 12:46:03 +01:00
Loz Calver
95d9257b1b
ENHANCEMENT: Add 'Cancel' button to 'Add Page' form
2013-11-20 20:15:08 +01:00
Will Rossiter
ddc2e3822b
FIX: ErrorPage generating empty responses for 403/401 requests
...
Previously by setting the response status code inside the action, this prevented response bodies from being included due to 403/401 being matched by SS_HTTPResponse::isFinished() (which stops popular
I assume SS_HTTPResponse::isFinished() is valid for the permission error use case (and I would be hesitant to change it) so this simply moves the declaration of the response status code till after the parent has populated the body of the response.
2013-11-18 16:32:15 +13:00
Martijn
0a854e9260
Make Settings Link in CMSSettingsController clickable
...
When SiteConfig has a GridField, you can't click on the Link to go back
2013-11-15 09:55:31 +01:00
Andrew Short
e17fb17520
Merge branch '3.1'
...
Conflicts:
lang/es.yml
2013-11-11 18:24:03 +11:00
Damian Mooyman
f9c3f4d1cc
Merge pull request #889 from chillu/pulls/2638-uploadfield
...
Disable UploadField change detection in assets/admin/add
2013-11-06 17:16:17 -08:00
Stephen Shkardoon
f972466880
Refactor old page redirector into an extension
2013-11-06 23:00:50 +13:00
Ingo Schommer
2d0ee2ca91
Disable UploadField change detection in assets/admin/add
...
See https://github.com/silverstripe/silverstripe-framework/issues/2638
2013-11-06 10:08:15 +01:00
Trevor
e3724e9207
Fix comment typo
2013-10-28 13:48:31 +11:00
Loz Calver
b6589ba9a9
NEW: Page types no longer require a controller, they can inherit the parent page type's
...
Use ClassInfo::ancestry() instead of get_parent_class()
Fall back to ContentController by default
2013-10-23 16:44:59 +01:00
Ingo Schommer
ef0f633f46
Merge remote-tracking branch 'origin/3.1'
2013-10-23 14:53:33 +02:00
Ingo Schommer
3d9fc2cc4c
Default CMSMain to Versioned::reading_stage("Stage")
...
Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
2013-10-23 14:29:24 +02:00
Ingo Schommer
c645d76b1f
Merge pull request #879 from sheadawson/833-currentPageID
...
Add hook for extensions to update current page id, before falling ...
2013-10-21 00:24:06 -07:00
sheadawson
1b5465809d
MINOR add hook for extensions to update current page id, before falling back to default
2013-10-21 17:42:45 +11:00
Ingo Schommer
0a1ffd3e1a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-10-20 13:51:19 +02:00
Ingo Schommer
aae6b2b296
Avoid encoded HTML breadcrumbs
2013-10-11 00:27:21 +02:00
Andrew Short
68d254c3c4
Add an extension hook for customising site tree hints.
2013-10-11 01:31:07 +11:00
Ingo Schommer
dd29936fee
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:10:20 +02:00
Andrew Short
b7476f2a46
BUG: Fix add new button not passing the correct parent ID.
...
The `%s` parent ID placeholder was being URL encoded, so it was not being
replaced properly when adding a new page. This fix separately adds
placeholder parameters to the URL to avoid this issue.
The fix is not ideal, but there is no easy way to indicate that some
URL parameters should be URL encoded and others should not while still
correctly constructing the URL.
2013-10-10 13:09:24 +11:00
Loz Calver
66bfff4d15
FIX Don't validate pages when restoring or reverting ( fixes #2449 )
...
Use new method
2013-10-03 16:54:38 +01:00
Ingo Schommer
2a4191d449
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8
Fixed report link escaping
2013-10-02 12:19:23 +02:00
Ingo Schommer
956b6de05c
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0
FIX ReportAdmin report links regression
...
Regression from 79996a76fe
,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-01 11:17:36 +02:00
Ingo Schommer
32478ab512
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-09-27 19:07:13 +02:00
Ingo Schommer
8a96bab70d
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-27 18:50:52 +02:00
Ingo Schommer
9a4a5d909d
Merge pull request #816 from kinglozzer/798-custom-page-icons
...
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798 )
2013-09-25 12:54:01 -07:00
Ingo Schommer
86339a551d
Clearer escaping in CMSMain
...
No direct security issue, but makes intent clearer
2013-09-24 21:37:26 +02:00
Ingo Schommer
e170f4c21b
FIX Escaping in "dependent pages" (SS-2013-009)
2013-09-24 21:37:26 +02:00
Ingo Schommer
79996a76fe
Clearer escaping in ReportAdmin
...
No direct security issue since report titles can't be set by the user
2013-09-24 21:37:26 +02:00
Ingo Schommer
29e502a63a
Hints for SiteTree.TreeTitle casting
...
Relates to SS-2013-009
2013-09-24 21:37:26 +02:00
Ingo Schommer
201f4881e6
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-12 17:16:29 +02:00
Ingo Schommer
4e031076be
Search callback for "add page" selector
...
Necessary since we now default $showSearch=true in TreeDropdownField.
See https://github.com/silverstripe/silverstripe-framework/pull/2364
2013-08-29 17:08:42 +02:00
Tom Densham
4f30fedafd
FIX: GridField button styling in reports
2013-08-29 13:56:29 +01:00
Damian Mooyman
5f828149c3
BUG Fixed instances of loosely defined SQL predicates not qualified by table name
...
Fixed duplicate SQL escaping on SiteTree::get_by_link
2013-08-29 13:59:45 +12:00
Ingo Schommer
6d694a550a
Merge pull request #837 from ARNHOE/3.1-siteconfigfix
...
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-28 02:20:47 -07:00
Sean Harvey
27749fdb7a
AssetAdmin: PHP warning trying to add empty values into CompositeField
...
If the logged in user doesn't have permission to add a Folder record,
AssetAdmin::getEditForm() tries to enter an empty value into the
children of a ComposteField. This breaks SSViewer with a
call_user_func invalid args PHP warning.
Only include these buttons when they're available to the user.
2013-08-27 14:30:39 +12:00
Arno Poot
920da0d120
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-24 12:33:38 +02:00
Ingo Schommer
c62f992dc3
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:28 +02:00
Ingo Schommer
3dc86f98a3
Fixed merge error
2013-08-20 22:25:24 +02:00
Ingo Schommer
ba57d42349
Merge remote-tracking branch 'origin/3.0' into 3.1.0
...
Conflicts:
code/controllers/ContentController.php
code/model/SiteTree.php
tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
Ingo Schommer
7ad9712f05
Merge remote-tracking branch 'origin/3.1'
2013-08-16 13:37:49 +02:00
Ingo Schommer
44fdf66834
Merge pull request #809 from ARNHOE/3.1-siteconfig
...
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07:00
Hamish Friedlander
71608f0d4a
FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself
2013-08-09 11:46:32 +02:00
Sam Minnée
d7d0cb45ae
Merge pull request #824 from hafriedlander/fix/archivedate
...
FIX ArchiveDate enforcement
2013-08-08 17:38:53 -07:00
Simon Welsh
b1664f86a4
FIX Check for stage and drafts in SiteTree::canView()
2013-08-09 10:45:09 +12:00
Hamish Friedlander
2fae9280e5
FIX ArchiveDate enforcement
2013-08-08 17:17:35 +12:00
Ingo Schommer
5eaeb7462a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
lang/en.yml
2013-08-07 17:20:28 +02:00
Ingo Schommer
99ba7bdb4e
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
lang/en.yml
templates/CMSPageHistoryController_versions.ss
2013-08-07 17:15:17 +02:00
Ingo Schommer
07cccc8e95
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
issues with unknown locales in Zend's CLDR database
2013-08-04 12:31:29 +02:00
Ingo Schommer
3f118ef08f
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 12:28:07 +02:00
Ingo Schommer
ab0f83c48d
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Renamed "lolcat" locale from "lc_xx" to "en@lolcat" (Transifex/CLDR notation)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 11:05:41 +02:00
Ingo Schommer
e0aa610172
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
templates/Includes/ReportAdmin_Content.ss
templates/ReportAdminForm.ss
2013-08-03 19:46:46 +02:00
Loz Calver
09b869f5d3
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension ( fixes #798 )
2013-07-31 09:30:58 +01:00
Arno Poot
afd9f28279
Updated siteconfig layout to be more like modeladmin
2013-07-26 17:45:28 +02:00
Simon Welsh
ff18abb994
Merge branch '3.0' into 3.1
...
Conflicts:
.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh
3a3e8f2faa
Adds LoginForm as an allowed action
...
Behaves as a form method defined on ContentController
2013-07-14 17:21:59 +12:00
Andrew Short
1710958207
Merge branch '3.1'
...
Conflicts:
.travis.yml
code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Hamish Friedlander
a5f00ae2c3
FIX Not checking stage in SiteTree#canView
...
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
a2c2be2ad5
Correct form name in CMSFileAddController, fixes upload
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2172
2013-07-02 09:33:38 +02:00
Ingo Schommer
0bd257c8fc
Merge pull request #770 from chillu/pulls/cmsform
...
Using new CMSForm class to allow for validation errors in CMS
2013-06-28 02:54:09 -07:00
Ingo Schommer
98750a9cf1
Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
...
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
aeacbc38aa
Fix AssetAdmin::$allowed_actions
2013-06-21 00:54:28 +02:00
Ingo Schommer
a29ce594a1
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:57 +02:00
Jeremy Thomerson
b8908efdf7
ENHANCEMENT: allow sites to override meta generator tag
2013-06-17 20:35:14 +00:00
Mike Parkhill
c7f14129ea
FIX #651 Broken redirection after creating new folder in assets
2013-06-13 14:58:09 +02: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
Ingo Schommer
0c4b2f8157
API SiteTree->validURLSegment() prioritizes extension votes
...
Tri-state, use NULL to ignore the extension result
2013-06-12 12:32:42 +02:00
g4b0
238f2908e5
BUG: fixed "regression" inserted with 9281ebc647
adding a new class to SiteTree elem (edit-disabled)
2013-06-03 13:46:10 +02:00
Ingo Schommer
c21c9cba0d
Merge remote-tracking branch 'origin/3.1'
2013-05-31 18:10:26 +02:00
Sean Harvey
206f09ab65
Merge pull request #757 from mparkhill/651-assets-broken-redirection
...
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 15:04:22 -07:00
Mike Parkhill
85f5a45951
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 17:21:07 +12:00
Sean Harvey
20f044cef0
BUG Fixing regression from silverstripe/sapphire/67d1327
...
Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
2013-05-26 12:31:15 +12:00
Simon Welsh
e8f6b416d7
Revert call to setCheckModelPermissions()
2013-05-25 13:56:02 +12:00
Sean Harvey
9c1a69ae08
Merge pull request #755 from patbolo/restored-page-correct-title
...
FIX Correct page title shown when restoring a page, instead of html of t...
2013-05-24 18:45:38 -07:00
jean
698a75d903
FIX Correct page title shown when restoring a page, instead of html of tree node
2013-05-25 11:37:26 +12:00
Will Rossiter
ae494b01bc
Merge pull request #259 from chillu/pulls/perms-opt-in
...
FIX: Respect model permissions in AssetAdmin
2013-05-24 15:44:55 -07:00
Russell Michell
9281ebc647
BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit() were unable to click on SiteTree items in the CMS.
...
- The 'disabled' attribute in <li> will now only render if the author _really_ can't do _anything_
2013-05-23 14:48:24 +12:00
Fred Condo
cd81d327ac
Return 410 for successfullyinstalled after install files are gone
...
It was possible to append '/successfullyinstalled' to any SilverStripe
URL (with the cms module present), and the code would run, including
republishing the 404 page.
Now, if the install.php file is gone, this controller method throws the
410 (Gone) status code. The 410 status is chosen rather than 404 to
mitigate the likelihood that crawlers such as the Googlebot will follow
stray links to this URI.
2013-05-21 15:11:57 -07:00
Ingo Schommer
b2e9353755
Merge pull request #701 from tractorcow/3.1-api-updaterelativelink
...
API Added SiteTreeExtension::updateRelativeLink
2013-05-17 05:05:03 -07:00
Mateusz Uzdowski
bccd2f8e51
API Add a missing alternatePreviewLink hook for SiteTree extensions.
2013-05-17 15:00:08 +12:00
Mateusz Uzdowski
6117057c59
Update doRollback messages to work well with the new reverts.
...
Currently reverts are not creating the new versions anymore - they are
simply copying the Version over. Remove incorrect message about new
version creation and remove the "cancel draft changes" message that's
not correct.
2013-05-16 08:43:12 +12:00
Sean Harvey
a681b8e4ab
BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link
2013-05-14 00:06:09 +12:00
Will Rossiter
7c68414fe7
FIX: Rename search locale variable to avoid conflicts with locale switcher.
...
Fixes http://open.silverstripe.org/ticket/6204
2013-05-11 19:31:02 +12:00
Simon Welsh
be25c302ac
FIX Escape the sitetree_link shortcode return value
2013-05-10 14:05:06 +12:00
Damian Mooyman
61312a5d7f
API Added SiteTreeExtension::updateRelativeLink
...
Updated SiteTreeExtension PHPDoc
Refactored out Translatable extension in RelativeLink
2013-05-10 12:22:22 +12:00
Sean Harvey
c7ebf76757
Page history panel: show appropriate message when viewing latest version
2013-05-07 17:14:28 +12:00
Sean Harvey
b4f2e35b32
Updating text for permission description to be accurate for 3.x
2013-04-30 17:58:47 +12:00
Ingo Schommer
c0302bc24d
Merge remote-tracking branch 'origin/3.1'
2013-04-29 08:59:11 +02:00
Ingo Schommer
878cf541b9
Better UI feedback on VirtualPage states ( fixes #1594 )
2013-04-16 11:56:33 +02:00
Ingo Schommer
2227ed3629
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:26:24 +02:00
Ingo Schommer
d7435cde71
Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix
...
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570 )
2013-04-08 07:58:49 -07:00
Ingo Schommer
da515b8f65
FIX Use SSViewer.theme_enabled in CMS logic
2013-04-08 19:29:09 +12:00
Will Rossiter
6e2906d01e
API: remove static related classes, now staticpublisher module
2013-04-06 17:26:15 +13:00
Loz Calver
ea446f2ade
Better error message when attempting to enter a blank URL Segment ( fixes silverstripe/silverstripe-cms#1570 )
2013-04-05 14:06:32 +01:00
Ingo Schommer
51c00e33e6
Merge remote-tracking branch 'origin/3.1'
2013-03-27 12:12:21 +01:00
Ingo Schommer
18201c05af
Fixed Config usage in ErrorPage
2013-03-27 12:00:55 +01:00
Ingo Schommer
8eb3840325
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00