Daniel Hensby
a20f4f29f6
Merge branch '3.6' into 3
2017-11-25 18:21:15 +00:00
Daniel Hensby
b2f6456922
Merge branch '3.5' into 3.6
2017-11-25 18:20:22 +00:00
Damian Mooyman
246775b97e
Merge pull request #2030 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:57:48 +13:00
Daniel Hensby
39edaedc8f
Loosen PHPUnit constraints
2017-11-17 11:45:41 +00:00
Damian Mooyman
992381e285
Merge pull request #2003 from dhensby/pulls/3.5/composer-autoload
...
Add composer autoloading support to 3.x
2017-11-02 11:42:33 +13:00
Daniel Hensby
9e31c3240b
Add composer autoloading support to 3.x
2017-10-25 17:58:53 +01:00
Daniel Hensby
7c289a8b04
Merge branch '3.6' into 3
2017-10-20 11:04:02 +01:00
Daniel Hensby
9e903f801f
Merge branch '3.5' into 3.6
2017-10-20 11:03:25 +01:00
Daniel Hensby
4887eae1b6
Merge pull request #2000 from open-sausages/pulls/3.5/you-cannot-see-what-you-cannot-see
...
FIX revert to this button after archiving
2017-10-20 10:58:35 +01:00
Christopher Joe
a73d5b4177
FIX revert to this button after archiving
2017-10-20 10:01:56 +13:00
Aaron Carlino
9ae6fbffe1
SiteTree check if in DB before delete children
2017-10-17 10:59:27 +13:00
Damian Mooyman
0d1c6b9f0c
Merge pull request #1988 from open-sausages/pulls/3/hierarchy-cascading-deletes
...
Move cascading delete to onAfterDelete for SiteTree
2017-10-17 09:20:23 +13:00
Aaron Carlino
528fd49ced
SiteTree check if in DB before delete children
2017-10-16 16:41:47 +13:00
Daniel Hensby
0f2ff54557
Merge pull request #1990 from jason-zz/patch-1
...
BUG UploadField overwriteWarning isn't working in AssetAdmin
2017-10-13 14:31:55 +01:00
Jason
fd39faeefd
BUG UploadField overwriteWarning isn't working in AssetAdmin
...
When UploadField overwriteWarning is enabled, no overwrite warning message for uploading file in non-root folder. This fix will let CMSFileAddController know the current folder when 'fileexists' AJAX request is called.
2017-10-13 11:00:17 +01:00
Damian Mooyman
a0a5979eb6
Merge pull request #1983 from kinglozzer/fr-7420-page-icons
...
Fix: TreeDropdownField showing broken page icons (fixes silverstripe/framework#7420 )
2017-10-05 13:48:25 +13:00
Loz Calver
24e190ea82
Fix: TreeDropdownField showing broken page icons ( fixes silverstripe/silverstripe-framework#7420 )
2017-10-04 17:02:48 +01:00
Daniel Hensby
be34b9b61c
Merge branch '3.6' into 3
2017-09-28 17:45:41 +01:00
Daniel Hensby
50a9a5de6b
Merge branch '3.5' into 3.6
2017-09-28 17:45:22 +01:00
Daniel Hensby
f8d0dc4ff7
Merge remote-tracking branch 'security/3.6.2' into 3.6
2017-09-28 17:45:18 +01:00
Daniel Hensby
6a11fbfbf8
Merge remote-tracking branch 'security/3.5.5' into 3.5
2017-09-28 17:44:53 +01:00
Daniel Hensby
32c74a86e2
Merge branch '3.5.5' into 3.6.2
2017-09-20 16:34:42 +01:00
Daniel Hensby
d99a80cef9
Merge pull request #6 from silverstripe-security/patch/3.5/authenticator-fix
...
FIX Default LoginForm generated from default_authenticator
2017-09-20 11:37:40 +01:00
Daniel Hensby
0aac4ddb7e
FIX Default LoginForm generated from default_authenticator
2017-09-12 15:59:05 +01:00
Daniel Hensby
636bf45b5f
Merge branch '3.6' into 3
2017-08-24 13:14:47 +01:00
Daniel Hensby
a308ab327b
Merge branch '3.5' into 3.6
2017-08-24 13:14:22 +01:00
Daniel Hensby
5512711471
Merge pull request #1936 from andrewandante/BUGFIX/backport_namespaced_page_icon
...
sanitize class names for cms icons
2017-08-24 12:47:14 +01:00
Andrew Aitken-Fincham
b78c163362
sanitize class names for cms icons
2017-08-24 12:12:37 +01:00
Damian Mooyman
cc56e5a648
Merge pull request #1881 from robbieaverill/pulls/3.7/version-provider
...
NEW Add version provider configuration
2017-08-24 14:04:37 +12:00
Daniel Hensby
156debbac4
Merge branch '3.6' into 3
2017-07-25 15:57:48 +01:00
Daniel Hensby
af9663f671
Merge branch '3.5' into 3.6
2017-07-25 15:57:04 +01:00
Daniel Hensby
a7d3d82dd7
Stay on travis precise dist for now
2017-07-25 15:56:30 +01:00
Daniel Hensby
799ee08251
Merge branch '3.6' into 3
2017-07-18 15:44:32 +01:00
Daniel Hensby
8e2695f140
Merge branch '3.5' into 3.6
2017-07-18 15:44:13 +01:00
Loz Calver
be0c0ef5b5
Merge pull request #1899 from dhensby/pulls/3.5/vp-render-fix
...
FIX Make sure VirtualPage renders correct templates
2017-07-18 11:10:37 +01:00
Daniel Hensby
515a7cb569
FIX Make sure VirtualPage renders correct templates
2017-07-17 20:13:13 +01:00
Daniel Hensby
b499e077b1
Merge pull request #1810 from dnadesign/fix_silverstripenavigator_versioned_subclasses
...
using static function so that subclasses of Versioned will be picked up
2017-07-17 16:16:33 +01:00
Daniel Hensby
f15476856e
Merge branch '3.6' into 3
2017-07-15 16:17:13 +01:00
Daniel Hensby
28269e3b28
Merge branch '3.5' into 3.6
2017-07-15 16:16:24 +01:00
Daniel Hensby
f511c262fd
Merge pull request #1884 from kinglozzer/archive-validation
...
Add archive to list of validation-exempt actions
2017-07-05 12:21:32 +01:00
Loz Calver
5caef27577
Add archive to list of validation-exempt actions
2017-07-05 11:42:42 +01:00
Robbie Averill
b347ab866d
NEW Add version provider configuration
2017-07-04 23:32:54 +12:00
Daniel Hensby
44e9484aa4
Merge branch '3.6' into 3
2017-06-27 13:13:04 +01:00
Daniel Hensby
aff9b7fb32
Merge tag '3.6.1' into 3.6
...
Release 3.6.1
2017-06-27 12:57:51 +01:00
Daniel Hensby
05bb2fef1b
Merge pull request #1851 from open-sausages/pulls/3.6/revert-lang-update
2017-06-15 12:50:49 +01:00
Ingo Schommer
a5a8982af6
Revert "Update translations"
...
This reverts commit 475b73357950827cb1de8a0e7b305bd6d445bba0.
It pulled updates from transifex *after* we switched translations
to 4.x only mode - which resulted in a lot of translation keys being
moved around. For example, asset-related translations went from
framework to the asset-admin module. The removal of these translations
in 3.x caused translations to go partially missing, since these new
modules are 4.x only.
See https://github.com/silverstripe/silverstripe-framework/issues/7002
2017-06-15 14:50:56 +12:00
Daniel Hensby
6b9e48aad1
Merge branch '3.6' into 3
2017-06-14 12:14:53 +01:00
Daniel Hensby
54e438fb9e
Merge branch '3.5' into 3.6
2017-06-14 12:14:02 +01:00
Damian Mooyman
1c195230bd
Merge pull request #1845 from mfendeksilverstripe/3.5
...
Count children time / memory issues fix
2017-06-08 14:59:57 +12:00
Mojmir Fendek
b442bad767
Children of the site tree are no longer listed only for the purpose of counting them. count($this->Children()) creates an array list of children which has serious performance consequences if there are lot of children present. On the other hand $this->numChildren() runs a count query which is much faster and eat’s less memory.
2017-06-08 12:19:27 +12:00
