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,710 Commits 29 Branches 403 Tags 28 MiB
7d9ca4fac5
Commit Graph

2292 Commits

Author SHA1 Message Date
Daniel Hensby
af4b546050
Merge branch '3.3' into 3 2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3 2016-04-26 01:50:03 +01:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2 
Conflicts:
	code/reports/SideReport.php
 2016-04-26 00:09:19 +01:00
Patrick Nelson
000bf09354 FIX for #1447 to ensure proper type-safe checking of file_put_contents() in ErrorPage->writeStaticPage() 2016-04-06 17:34:55 -07:00
Daniel Hensby
9d62d9d381 FIX Link tracking not escaping # Fixes #1409 2016-03-21 15:22:00 +00:00
Jake Bentvelzen
68694c01b7 Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page. 2016-03-15 10:48:46 +11:00
Daniel Hensby
bc31d9ca9c FIX Use Controller::join_links() in Reports 2016-03-10 16:39:00 +00:00
Andrew Mc Cormack
e6078be52e Update SiteTree.php 
Minor type fix
 2016-03-07 20:37:29 +00:00
micmania1
7c5f29ce19 Removed dependency for translatable module 2016-03-03 23:11:49 +00:00
Damian Mooyman
2734f1a18e Merge remote-tracking branch 'origin/3.3' into 3 2016-02-24 17:35:46 +13:00
Damian Mooyman
208497ea42 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	lang/en.yml
#	lang/lt.yml
 2016-02-24 17:32:58 +13:00
Andrew Aitken-Fincham
644c807031 BUG Use correct formaction for doRollback exemption #1378 2016-02-17 10:20:38 +13:00
Damian Mooyman
2ad490c3e2 BUG Prevent folders deleted on the filesystem from breaking asset interface 2016-02-09 13:03:40 +13:00
Damian Mooyman
531e7d4c3b Merge pull request #1384 from dhensby/pulls/modeladmin-reading-mode 
Removing stage reading mode as it will be set in LeftAndMain
 2016-02-04 11:16:34 +13:00
appchecker
8e40b41460 Fix typo 2016-02-02 20:19:23 +03:00
Daniel Hensby
5f10d66e71 Removing stage reading mode as it will be set in LeftAndMain 2016-02-02 13:43:56 +00:00
Damian Mooyman
3d0178ebc0 BUG Use correct formaction for doRollback exemption 2016-01-27 15:38:48 +13:00
Daniel Hensby
b1b403cd08 FIX Borders on CMS Actions 2016-01-26 14:42:41 +00:00
Daniel Hensby
0eb4b8e256 Merge pull request #1314 from kinglozzer/hide_ancestor 
FIX: Setting hide_ancestor=true causes a random page type to be hidden
 2016-01-25 11:57:04 +00:00
Loz Calver
fb43e59b00 FIX: Setting hide_ancestor=true causes a random page type to be hidden 2016-01-25 09:18:35 +00:00
Damian Mooyman
19c24bb2df Merge remote-tracking branch 'origin/3.3' into 3 2016-01-25 15:58:35 +13:00
Damian Mooyman
b54d2f1f7f Merge pull request #1353 from sb-relaxt-at/1334-sitetree-classdropdown-bugfix 
Adding context parameter to canCreate-check in getClassDropdown
 2016-01-22 17:41:27 +13:00
Damian Mooyman
abc5556520 BUG Fix legacy breadcrumbs appearing on page save 
Fixes #1358
 2016-01-20 15:29:51 +13:00
Damian Mooyman
7c4e6f4b60 BUG prevent "Home page" being selected when no selection was made 
Fixes #1351
 2016-01-20 14:44:11 +13:00
Damian Mooyman
c3e82a4838 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	javascript/lang/src/fi.js
 2016-01-19 17:10:41 +13:00
Damian Mooyman
e706b147cc Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:33 +13:00
Damian Mooyman
f4d22d6cfe Merge pull request #1354 from sminnee/remove-trailing-whitespace 
MINOR: Remove trailing whitespace
 2016-01-13 09:30:01 +13:00
Loz Calver
d637141487 FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359) 2016-01-11 16:44:55 +00: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
Loz Calver
54e8c71a4d Use setFailover() in ContentController (closes silverstripe/silverstripe-framework#4821) 2016-01-06 15:24:17 +00:00
Stephan Bauer
b30d33585f BUG Adding context parameter to canCreate-check in getClassDropdown of SiteTree (fixes #1334) 2016-01-05 11:00:43 +01: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
Damian Mooyman
15685d85ab Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 14:10:52 +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
b624eb98f1 FIX: Setting target for unwritten VirtualPage breaks write 
The VirtualPage inherits the ID of the target page, which is undesirable if the VirtualPage hasn’t been written yet - it will trick write() into thinking that the record already exists in the database
 2015-11-18 09:14:16 +00:00
Loz Calver
2983d823d1 FIX: Ensure VirtualPage forwards request/response data to virtual controllers (fixes #1329) 2015-11-18 09:14:11 +00:00
Ingo Schommer
7a5b30a05d Extension hooks for "restore to stage" and "archive" 2015-11-16 10:23:24 +13:00
Damian Mooyman
0cabc22a57 Revert 7e2838c81c 2015-11-11 09:14:39 +13:00
Damian Mooyman
b26c3a3b4e Restore deprecated reports 2015-11-10 17:17:56 +13:00
Ingo Schommer
21df7069d0 Extension hooks for "restore to stage" and "archive" 2015-11-10 15:30:15 +13:00
Damian Mooyman
748866ec0f Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	code/controllers/CMSMain.php
	code/model/ErrorPage.php
 2015-11-03 13:11:26 +13:00
Damian Mooyman
bc669311dd Merge pull request #1297 from patricknelson/issue-586-delete-validation-3.2 
FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary.
 2015-10-16 17:18:16 +13:00
Patrick Nelson
75dc391df9 FIX for #586 and possible fix for #736 and relates to #2449: Don't perform validation upon deletion, since it isn't necessary. Cleaned up type hint. 2015-10-09 15:36:21 -04:00
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
f291c5f365 fixing phpdoc blocks to refering to Objects to built-in types of PHP 2015-09-28 22:31:31 +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
b7ad568644 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-09 14:50:28 +12:00