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
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
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
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
c963706a88
Merge pull request #1292 from patricknelson/issue-1288-button-type
...
FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press.
2015-10-07 12:13:07 +13:00
Patrick Nelson
332e490147
FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press (relates to framework issue at https://github.com/silverstripe/silverstripe-framework/issues/3181 ).
2015-10-06 15:08:29 -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
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
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
Damian Mooyman
e382818399
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
lang/cs.yml
lang/de.yml
lang/en.yml
lang/es.yml
lang/fr.yml
lang/id.yml
lang/it.yml
lang/lt.yml
lang/nb.yml
lang/sk.yml
lang/sr_RS@latin.yml
lang/sv.yml
2015-09-15 12:48:48 +12:00
Damian Mooyman
6e72bd2cf8
Update translations
2015-09-15 10:51:27 +12:00
Damian Mooyman
ce212972c8
Update translations
2015-09-15 10:42:32 +12:00
Damian Mooyman
105b3c60d1
Update translations
2015-09-15 10:33:25 +12:00
Damian Mooyman
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
Damian Mooyman
f2efbefb8c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
2015-09-09 14:09:00 +12:00
