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,978 Commits 29 Branches 403 Tags 28 MiB
60ce733cfb
Commit Graph

4978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
3d0178ebc0 BUG Use correct formaction for doRollback exemption 2016-01-27 15:38:48 +13:00
Damian Mooyman
d8bf0ab327 Merge pull request #1376 from dhensby/pulls/3/fix-action-alignment 
FIX Borders on CMS Actions
 2016-01-27 09:48:03 +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
23daa2fbe5 Merge remote-tracking branch 'origin/3.3.0' into 3.3 2016-01-25 15:48:17 +13:00
Damian Mooyman
0cc49cb27a Update translations 2016-01-25 15:06:55 +13:00
Daniel Hensby
1582f13096 Merge pull request #1372 from tractorcow/pulls/3.3/fix-treeview-refresh 
BUG Don't keep stale treeview data when refreshing Content area
 2016-01-22 15:10:15 +00: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
f80467a748 BUG Don't keep stale treeview data when refreshing Content area 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4945
 2016-01-22 16:56:18 +13:00
Daniel Hensby
0c0c46b465 Merge pull request #1371 from tractorcow/pulls/3.3/fix-addpage-parent 
BUG Fix incorrect "Add Page" button selector
 2016-01-21 22:38:09 +00:00
Damian Mooyman
e364fdb794 BUG Fix incorrect "Add Page" button selector 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4540
 2016-01-22 11:13:21 +13:00
Loz Calver
dbb8b5852f Merge pull request #1369 from tractorcow/pulls/3.3/fix-default-home 
BUG prevent "Home page" being selected when no selection was made
 2016-01-20 09:11:17 +00: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
Daniel Hensby
e9e6a9cca4 Merge pull request #1361 from kinglozzer/behat-coverage-file-link 
Add behat coverage to check that file field is reset when adding links
 2016-01-12 00:37:22 +00:00
Damian Mooyman
b1387641bf Merge pull request #1360 from kinglozzer/1359-link-tracking-regex 
FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359)
 2016-01-12 11:03:32 +13:00
Loz Calver
e19dfd628b Add behat coverage to check that file field is reset when adding links 2016-01-11 17:08:28 +00:00
Loz Calver
d637141487 FIX: preg_quote() anchors in SiteTreeLinkTracking (fixes #1359) 2016-01-11 16:44:55 +00:00
Damian Mooyman
56f1c139fd Merge pull request #1355 from kinglozzer/contentcontroller-failover 
Use setFailover() in ContentController (closes silverstripe/silverstripe-framework#4821)
 2016-01-08 12:59:11 +13:00
Sam Minnee
bf6337c59a FIX: Changes needed to respond to whitespace changes. 
I’ve made the ContentControllerTest whitespace agnostic, as it’s
possible that we change the whitespace semantics of includes in SS4
and I don’t want to make this test brittle to that.
 2016-01-07 10:34:01 +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
Loz Calver
54e8c71a4d Use setFailover() in ContentController (closes silverstripe/silverstripe-framework#4821) 2016-01-06 15:24:17 +00:00
Sam Minnee
ca4752eca3 MINOR: Add .editorconfig 
This will help ensure that tabs/spaces/trailing-space/newlines are consistent.

This file is based on the one from silverstripe-framework
 2016-01-06 12:40:22 +13: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
ec680d5989 Alias 3 branch as 3.4 2015-12-23 14:23:17 +13:00
Damian Mooyman
d387d4f311 Update translations 2015-12-23 13:22:38 +13:00
Ingo Schommer
6b3eeed463 Merge pull request #1349 from tractorcow/pulls/3/merge-bugs 
BUG Fix merge regressions in versioned tests
 2015-12-23 11:12:25 +13:00
Damian Mooyman
54ae002d19 BUG FIx merge regressions in versioned tests 2015-12-22 17:46:07 +13:00
Damian Mooyman
ad1c058616 Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 17:07:30 +13:00
Damian Mooyman
502a2abbcc Merge pull request #1331 from kinglozzer/pulls/redirectorpage-toggle-fix 
FIX: RedirectorPage toggles not working (fixes #1328)
 2015-12-22 17:01:13 +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
Damian Mooyman
15685d85ab Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 14:10:52 +13:00
Ingo Schommer
cb76ddd32f Merge pull request #1341 from open-sausages/pulls/3/fix-versioned-canview 
API Refactor versioned security into core module
 2015-12-10 10:57: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
Daniel Hensby
a3cac2cb65 Merge pull request #1330 from kinglozzer/pulls/virtualpage-request-response 
FIX: Ensure VirtualPage forwards request/response data to virtual controllers (fixes #1329)
 2015-11-18 15:06:42 +00: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
Loz Calver
97e90b8ebd FIX: RedirectorPage toggles not working (fixes #1328) 2015-11-17 16:22:49 +00:00
Damian Mooyman
a40c8e034a Update translations 2015-11-16 16:01:51 +13:00
Damian Mooyman
5925883330 Update translations 2015-11-16 15:08:39 +13:00
Damian Mooyman
b8e2b231ae Merge pull request #1326 from chillu/pulls/3/sitetree-extension-points 
Extension hooks for "restore to stage" and "archive"
 2015-11-16 10:52:48 +13:00
Ingo Schommer
7a5b30a05d Extension hooks for "restore to stage" and "archive" 2015-11-16 10:23:24 +13:00
Damian Mooyman
73377a7a92 Update translations 2015-11-11 17:06:44 +13:00
Damian Mooyman
ebed1d22e5 Update translations 2015-11-11 16:07:20 +13:00