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
f8678f6bc0
Merge pull request #1339 from scott1702/fix-dependencies
...
Fix composer dependencies
2015-12-03 16:15:41 +13:00
scott1702
d0ee35c540
Fix composer dependencies
2015-12-03 10:46:44 +13:00
Damian Mooyman
5353ac5315
API Refactor versioned security into core module
2015-12-02 17:37:35 +13:00
Ingo Schommer
4f53a5db40
Merge pull request #1337 from open-sausages/pulls/4.0/fix-generated-files
...
API Update ErrorPage to use FilesystemGeneratedAssetHandler
2015-12-02 08:57:47 +13:00
Damian Mooyman
c50dc06401
API Update ErrorPage to use FilesystemGeneratedAssetHandler
2015-11-26 16:08:14 +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
Damian Mooyman
369f3dda8d
API Remove deprecated ListboxField::setMultiple()
2015-11-09 17:05:31 +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
271b5f7f15
Merge pull request #1316 from scott1702/allowed-ext
...
move allowed extensions into a sidebar
2015-11-09 10:35:28 +13:00
scott1702
e4ccd2d4bc
move allowed extensions into a sidebar
2015-11-05 19:33:58 +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
18e368448a
Merge remote-tracking branch 'origin/3'
...
Conflicts:
code/controllers/AssetAdmin.php
code/controllers/CMSMain.php
code/controllers/CMSSiteTreeFilter.php
code/controllers/LeftAndMainPageIconsExtension.php
code/controllers/ModelAsController.php
code/controllers/SilverStripeNavigator.php
code/model/ErrorPage.php
code/model/SiteTreeFileExtension.php
2015-11-03 14:23:04 +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
Ingo Schommer
e3a321b306
Merge pull request #1304 from scott1702/update-upload-button
...
Update asset admin toolbar
2015-10-30 10:27:29 +13:00
scott1702
6dc3fc1f26
Update asset admin toolbar
2015-10-30 10:05:51 +13:00
Ingo Schommer
79f23631c9
Merge pull request #1300 from open-sausages/features/dbfile-generated-files
...
Generated files API
2015-10-23 16:54:18 +13:00
Damian Mooyman
227e2ba162
API Move ErrorPage to new generated files API
2015-10-23 10:08:51 +13:00
Sam Minnée
f340130e8d
Merge pull request #1303 from open-sausages/pulls/php-5.5-min
...
Increase minimum required PHP version to 5.5
2015-10-22 10:45:07 +01:00
Ingo Schommer
d9b5895ee3
Increase minimum required PHP version to 5.5
...
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
2015-10-22 22:13:14 +13:00
Damian Mooyman
604edd8f6e
Merge pull request #1302 from kinglozzer/yaml-fix
...
FIX: Remove tab - invalid YAML
2015-10-20 09:10:22 +13:00
Loz Calver
d7dcb41b27
FIX: Remove tab - invalid YAML
2015-10-19 17:10:47 +01:00
Ingo Schommer
b487d59d02
Merge pull request #1291 from open-sausages/pulls/4.0/dbfile-file-dataobject
...
API CMS Implementation of RFC-1 Asset Abstraction (DataObject Refactoring)
2015-10-19 16:47:18 +13:00
Damian Mooyman
2bd9d00da0
API Remove filesystem sync
...
API support new asset abstraction
BUG Fix file link tracking for new asset abstraction
2015-10-19 13:42:39 +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
