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
Damian Mooyman
5353ac5315
API Refactor versioned security into core module
2015-12-02 17:37:35 +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
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
Damian Mooyman
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
Loz Calver
2a7a5ac9fc
Merge pull request #1268 from scott1702/font-icons
...
Update font icons to use new library
2015-08-28 10:31:18 +01:00
Damian Mooyman
b26b6c3eca
Update translations
2015-08-26 13:56:19 +12:00
Loz Calver
a382dd1cfc
Merge pull request #1269 from sminnee/travis-disable-irc
...
MINOR: Remove IRC notifications of travis builds.
2015-08-25 09:07:20 +01:00
Sam Minnee
8a3e84ba1c
MINOR: Remove IRC notifications of travis builds.
...
Companion to https://github.com/silverstripe/silverstripe-framework/pull/4535
2015-08-25 18:12:22 +12:00
scott1702
c028278957
Update font icons to use new library
2015-08-25 15:08:09 +12:00
Damian Mooyman
1ada2dab1d
Merge pull request #1264 from scott1702/filtered-tree
...
Update the filtered tree styling
2015-08-25 14:50:36 +12:00
scott1702
4f05c4c4f8
Update the filtered tree styling
2015-08-25 13:02:20 +12:00
Sam Minnée
da348f74e8
Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions
...
BUG block adding children from archived pages
2015-08-24 17:04:46 +12:00
Sam Minnée
a650d6ad39
Merge pull request #1266 from tractorcow/pulls/3.2/packages
...
Fix missing packages
2015-08-24 17:04:43 +12:00
Damian Mooyman
a3f789c2b5
Update translations
2015-08-24 16:29:40 +12:00
Damian Mooyman
46180f671e
Fix missing packages
2015-08-24 16:14:33 +12:00
Damian Mooyman
6c17397322
BUG block adding children from archived pages
...
Fixes #1260
2015-08-24 15:16:09 +12:00
Sam Minnée
4db4db05af
Merge pull request #1263 from ss23/fix_812_oldpageredirector
...
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
2015-08-21 17:26:09 +12:00
Stephen Shkardoon
b87f5473d9
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
...
Previously, we would be limited by the way allParams will return 3 parameters
at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
2015-08-21 00:29:37 +12:00
Daniel Hensby
ab59113612
Fixing core release for travis
2015-08-18 00:09:02 +01:00
Sean Harvey
e5a4cdb302
Merge pull request #1261 from dhensby/pulls/remove-nightly
...
Removing hhvm-nightly as its not supported on travis
2015-08-18 10:07:16 +12:00
Daniel Hensby
4039805ac2
Removing hhvm-nightly as its not supported on travis
2015-08-17 16:53:42 +01:00
Daniel Hensby
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
Daniel Hensby
80aca3a511
Merge branch '3.1' into 3.2
2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1
Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children
...
* antons--773-nested-virtual-pages-allowed_children:
Issue #773 - $allowed_children not allowing nested virtual pages
2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6
Issue #773 - $allowed_children not allowing nested virtual pages
...
Additional check to see if a 'VirtualPage' has a page attached to it
2015-08-06 10:47:23 +01:00
