Commit Graph

50 Commits

Author SHA1 Message Date
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
Damian Mooyman 43a855e5b5 Merge pull request #1342 from mejt/3
Added avoiding unhandled exception from Translatable extension in ContentController
2015-12-22 16:58:04 +13:00
Mateusz 68dd8cf798 Added avoiding unhandled exception from Translatable extension in ContentController 2015-12-08 08:47:50 +01:00
Damian Mooyman 5353ac5315 API Refactor versioned security into core module 2015-12-02 17:37:35 +13:00
Loz Calver 10b2fdc318 FIX: ContentController::getViewer() not returning all found templates (fixes #1244) 2015-07-24 11:50:09 +01: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
Stevie Mayhew 7ddf5fa697 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:02 +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
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
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
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
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
Stephen Shkardoon f972466880 Refactor old page redirector into an extension 2013-11-06 23:00:50 +13: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 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
Hamish Friedlander 2fae9280e5 FIX ArchiveDate enforcement 2013-08-08 17:17:35 +12: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
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
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 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 eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +01:00
Ingo Schommer b15b98345f Using new "Security.login_url" configuration value 2013-01-29 18:06:49 +01:00
Sean Harvey 33884acbc5 Removed deprecated ContentController::LangAttributes()
Use ContentLocale() instead and write attribute names suitable
to XHTML/HTML instead
2012-11-15 14:32:21 +13:00
Andrew O'Neil b31188f252 APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:08:36 +13:00
Sam Minnee 39792debb8 FIX Use RequestHandler::httpError() for all HTTP errors.
https://github.com/silverstripe/sapphire/pull/827 adds some extension points for catching HTTP errors such as 404.  This change fixes some issues where httpError() isn't used all the time.  Note that the aforementioned pull request will be necessary to ensure that it works properly.
2012-09-27 12:56:56 +12:00
Ingo Schommer df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Ingo Schommer 7525e3c977 Merge pull request #183 from adrexia/installer
BUG: Installer templates
2012-08-29 02:25:19 -07:00
Ingo Schommer cd8c3a0245 NEW Re-added SilverStripeNavigator styling 2012-08-27 11:53:57 +02:00
Naomi Guyer 4fdc76d904 BUG: Installer templates
Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
2012-08-22 13:52:33 +12:00
Sam Minnee 3fbf57245c REMOVE: Remove action handler for widgets. (Trac #7174)
The widget functionality has been moved into a module, and this URL handler was the last of the code still in the core app related to widgets.  As well as this commit, there is a related change to the silverstripe-widgets module to add this feature there: 025ee424c4
2012-06-22 14:05:27 +12:00
Sean Harvey ec3ebc91d8 MINOR Use instance methods on current Controller instance for redirect()
instead of static Director functions
2012-05-23 21:45:16 +12:00
Ingo Schommer 77e52d6344 ENHANCEMENT Url encoding URLSegments before matching them against database records in ModelAsController, to match behaviour of SiteTree with URLSegmentFilter::$default_allow_multibyte=true. Not an API change because all encodable characters have been removed by the default URLSegmentFilter already (see http://www.w3.org/International/articles/idn-and-iri/#iriproblem) 2012-05-08 23:45:26 +02:00
Ingo Schommer 7c25754cb1 ENHANCEMENT Localization of installation success screen 2012-05-03 17:53:33 +02:00
Sean Harvey 7c54c60311 MINOR Rename setModel to setDataModel due to API changes 2012-05-01 14:46:48 +12:00
Simon Welsh c4e018928e API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:56:40 +12:00
Ingo Schommer 76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Ingo Schommer de573e087d MINOR Using late static binding instead of Object::create() calls 2012-04-04 18:29:11 +02:00
Jeremy Bridson a48254a66b ENHANCEMENT:styling added to delete install files warning box 2012-04-04 13:27:01 +12:00
Sean Harvey 0ea9451014 MINOR Fixes to method arguments in cms classes for E_STRICT support. 2012-03-27 21:42:54 +13:00
Sam Minnee 4e7cb308d5 MINOR: Use Deprecation class to indicated deprecated methods in cms. 2011-10-29 17:41:06 +13:00
Stig Lindqvist d799c80cc5 API CHANGE Changed name from DataObjectSet to either ArrayList or DataList 2011-10-27 20:24:45 +02:00
ajshort a54963d954 API CHANGE: Replaced DataObjectSet instances with ArrayList. 2011-10-07 08:51:54 +02:00
Sam Minnee ddcbd650d4 BUGFIX: Fix bugs introduced by the expectation of having a DataModel. 2011-10-07 08:51:54 +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