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
6a11fbfbf8
Merge remote-tracking branch 'security/3.5.5' into 3.5
2017-09-28 17:44:53 +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
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
Daniel Hensby
a7d3d82dd7
Stay on travis precise dist for now
2017-07-25 15:56:30 +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
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
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
Daniel Hensby
a24a3af1b1
Merge branch '3.4' into 3.5
2017-05-31 00:08:11 +01:00
Daniel Hensby
a8e343b85b
Merge tag '3.5.4' into 3.5
...
Release 3.5.4
2017-05-31 00:08:11 +01:00
Daniel Hensby
df95066e50
Merge tag '3.4.6' into 3.4
...
Release 3.4.6
2017-05-31 00:07:35 +01:00
Daniel Hensby
11e2175ec8
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:02:55 +01:00
Daniel Hensby
02b5e6ea92
Merge pull request #5 from silverstripe-security/patch/3.4/SS-2017-003
...
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-28 21:36:33 +00:00
Daniel Hensby
911e491236
Merge pull request #4 from silverstripe-security/patch/3.4/SS-2017-004
...
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()
2017-05-28 22:18:35 +01:00
Daniel Hensby
61cf72c08d
[SS-2017-004] FIX Unescaped fields in CMSPageHistroyController::compare()
2017-05-25 17:22:04 +01:00
Daniel Hensby
41270fcf99
[SS-2017-003] Only allow HTTP(S) links for external redirector pages
2017-05-24 23:02:41 +01:00
Sam Minnee
14540729ca
FIX: Use framework 3.5 to test cms 3.5
2017-05-09 11:41:55 +12:00
Sam Minnee
18171f8875
Merge branch '3.4' into 3.5
2017-04-24 15:59:38 +12:00
Uncle Cheese
cfef458a00
Remove .tx folder
2017-04-24 15:57:45 +12:00
Daniel Hensby
7ac2be0802
Merge tag '3.5.3' into 3.5
...
Release 3.5.3
2017-02-23 15:11:46 +00:00
Dan Hensby
80099f24b7
Update translations
2017-02-20 17:01:15 +00:00
Damian Mooyman
12377fcc9b
Merge 3.5 into 3
2017-02-08 11:56:39 +13:00
Damian Mooyman
f35e62afc5
Merge 3.4 into 3.5
2017-02-08 11:55:10 +13:00
Damian Mooyman
db2b55c3da
Merge 3.4.5 into 3.4
2017-02-08 11:52:41 +13:00
Damian Mooyman
ba43d120cd
Update translations
2017-02-08 11:05:29 +13:00
Damian Mooyman
6fec151f2b
Update translations
2017-02-08 10:29:07 +13:00
Daniel Hensby
68b49921f9
Merge branch '3.5' into 3
2017-02-07 17:41:18 +00:00
Daniel Hensby
c088ee5332
Merge branch '3.4' into 3.5
2017-02-07 17:39:58 +00:00
Daniel Hensby
75115bc490
Merge tag 'refs/tags/3.4.4' into 3.4
...
Release 3.4.4
2017-02-07 17:39:01 +00:00
Daniel Hensby
27f8acf373
Merge pull request #1705 from dhensby/pulls/3/cleanup
...
Remove redundant label
2017-02-03 11:20:37 +00:00
Daniel Hensby
aa2d0fb247
Merge branch '3.4' into 3.5
2017-01-31 20:09:00 +00:00
Daniel Hensby
1f3802d48d
Merge remote-tracking branch 'upstream/3.4.4' into 3.4
2017-01-31 20:06:54 +00:00
Dan Hensby
9917cee7bd
Update translations
2017-01-31 11:39:08 +00:00
Damian Mooyman
ac6083c9a2
Merge pull request #1731 from trewq/asset-upload-directory-fix
...
Fix error when uploading file and ASSETS_DIR is a subdirectory
2017-01-31 15:47:16 +13:00
Brendan Halley
10d9f9080b
Fix to allow ASSETS_DIR to be a subdirectory
2017-01-31 09:46:14 +11:00
Dan Hensby
ce9b05d21d
Update translations
2017-01-26 21:02:38 +00:00
Dan Hensby
94cdea8e65
Update translations
2017-01-26 18:30:10 +00:00
Dan Hensby
47b6b2cd0e
Update translations
2017-01-25 16:46:33 +00:00
Daniel Hensby
6f05242e3b
Merge branch '3.5' into 3
2017-01-17 12:33:03 +00:00
Daniel Hensby
cb3008956f
Merge branch '3.4' into 3.5
2017-01-17 12:31:18 +00:00
Loz Calver
f26ecb2a9c
Merge pull request #1711 from dhensby/pulls/3.4/allowed-children-fix2
...
FIX Dont attempt to iterate over null in SiteTree::allowedChildren
2017-01-10 16:46:48 +00:00
Daniel Hensby
5bba7264c6
FIX Dont attempt to iterate over null in SiteTree::allowedChildren
2017-01-10 16:20:22 +00:00
