Commit Graph

4635 Commits

Author SHA1 Message Date
Damian Mooyman
80959dc441 Update translations 2016-02-29 15:01:10 +13:00
Damian Mooyman
e6f9e71a0f Update translations 2016-02-29 14:57:30 +13:00
Damian Mooyman
a89debb962 Update translations 2016-02-27 20:38:19 +13:00
Damian Mooyman
be980a50fc Update translations 2016-02-27 20:35:10 +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
af02352c8c Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-24 16:55:12 +13:00
Damian Mooyman
4c3761f42c Update translations 2016-02-24 15:20:40 +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
2ac0a555ea Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-19 12:49:10 +13:00
Damian Mooyman
33bf5f9519 Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman
42cedb70b9 Update translations 2016-02-19 10:21:02 +13:00
Damian Mooyman
13f21231d6 Merge pull request #1396 from andrewandante/3.1-rollback-exemption
BUG Use correct formaction for doRollback exemption #1378
2016-02-17 16:29:58 +13:00
Andrew Aitken-Fincham
644c807031 BUG Use correct formaction for doRollback exemption #1378 2016-02-17 10:20:38 +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
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
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
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
73377a7a92 Update translations 2015-11-11 17:06:44 +13:00
Damian Mooyman
ebed1d22e5 Update translations 2015-11-11 16:07:20 +13:00
Daniel Hensby
8fb8c1e93c Merge pull request #1321 from silverstripe/revert-1319-pulls/3.2/sitetree-extension-points
Revert 7e2838c81c
2015-11-10 22:59:24 +00:00
Damian Mooyman
0cabc22a57 Revert 7e2838c81c 2015-11-11 09:14:39 +13:00
Ingo Schommer
995680f4bb Merge pull request #1320 from tractorcow/pulls/3.2/deprecated-reports
Restore deprecated reports
2015-11-10 17:43:33 +13:00
Damian Mooyman
b26c3a3b4e Restore deprecated reports 2015-11-10 17:17:56 +13:00
Damian Mooyman
7e2838c81c Merge pull request #1319 from chillu/pulls/3.2/sitetree-extension-points
Extension hooks for "restore to stage" and "archive"
2015-11-10 16:12:24 +13:00
Ingo Schommer
21df7069d0 Extension hooks for "restore to stage" and "archive" 2015-11-10 15:30:15 +13:00
Sam Minnée
3dbe5f278d Merge pull request #1315 from tractorcow/pulls/cms-tests
BUG Ensure CMSMainTest uses correct siteconfig
2015-11-09 11:57:20 +13:00
Damian Mooyman
c6c650f136 BUG Ensure CMSMainTest uses correct siteconfig
BUG Prevent CMSAddPageController invoking Security::LoginForm code during error handling
2015-11-05 16:47:58 +13:00
Damian Mooyman
54b8389b8a Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	code/model/ErrorPage.php
	lang/fa_IR.yml
2015-11-03 11:11:29 +13:00
Damian Mooyman
b302a9a9be Merge pull request #1296 from patricknelson/issue-1294-errorpage-fatal-3.1
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-19 07:59:47 +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
Damian Mooyman
a791ceecf5 Merge pull request #1295 from patricknelson/issue-1294-errorpage-fatal
FIX for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
2015-10-16 17:16:01 +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
Damian Mooyman
d8915115f8 Update translations 2015-10-06 18:33:16 +13:00
Damian Mooyman
aab9999390 Merge pull request #1281 from kinglozzer/pulls/sitetree-settings-toggles
FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280)
2015-10-06 11:53:12 +13:00
Damian Mooyman
65492d8de0 Merge pull request #1283 from spekulatius/fixing-phpdoc-blocks
fixing phpdoc blocks to refering to Objects to built-in types of PHP
2015-10-06 11:46:37 +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
Loz Calver
052aba17ac FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280) 2015-09-23 14:53:07 +01:00
Damian Mooyman
0df0f35278 Update translations 2015-09-18 14:21:19 +12:00