Damian Mooyman
2406881d3e
Merge remote-tracking branch 'origin/3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-29 16:44:01 +13:00
Damian Mooyman
77d506547c
Update translations
2016-02-29 15:01:55 +13:00
Damian Mooyman
05a9c760f8
Update translations
2016-02-27 20:38:29 +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
Damian Mooyman
65aa5bccae
Merge remote-tracking branch 'origin/3.3.0' into 3.3
2016-02-24 17:31:47 +13:00
Damian Mooyman
a5e1a93948
Merge remote-tracking branch 'origin/3.2.2' into 3.2
2016-02-24 17:04:32 +13:00
Damian Mooyman
a5444c3eeb
Update translations
2016-02-24 16:06:03 +13:00
Damian Mooyman
4849aa828e
Update translations
2016-02-24 15:14:58 +13:00
Damian Mooyman
aeea8b55a2
Merge remote-tracking branch 'origin/3.2.2' into 3.2
2016-02-19 12:52:11 +13:00
Damian Mooyman
33bf5f9519
Update translations
2016-02-19 10:54:36 +13:00
Damian Mooyman
c43b84573b
Update translations
2016-02-09 17:45:20 +13:00
Ingo Schommer
ae017f2f4a
Merge pull request #1392 from tractorcow/pulls/3.3.0/fix-folder-edit
...
BUG Prevent folders deleted on the filesystem from breaking asset interface
2016-02-09 16:19:23 +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
cf51e46093
Merge pull request #1389 from scott1702/no-text
...
Add no-text class to search icon
2016-02-04 11:51:24 +13:00
scott1702
459ba5676c
Add no-text class to search icon
2016-02-04 10:40:11 +13:00
Daniel Hensby
4ab8bfe859
Merge pull request #1378 from tractorcow/pulls/3.2/rollback-exemption
...
BUG Use correct formaction for doRollback exemption
2016-01-27 12:02:57 +00:00
Damian Mooyman
3d0178ebc0
BUG Use correct formaction for doRollback exemption
2016-01-27 15:38:48 +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
e706b147cc
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-01-19 15:08:33 +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
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
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
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
