Commit Graph

4839 Commits

Author SHA1 Message Date
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
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
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
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
Damian Mooyman
6060af45c1 Merge 3.4 into 3.5 2016-12-22 13:18:30 +13:00
Damian Mooyman
e4ff310a62 Merge 3.5.1 into 3.5 2016-12-22 13:17:16 +13:00
Damian Mooyman
483cda95a6 Merge 3.4.3 into 3.4 2016-12-22 13:16:07 +13:00
Dan Hensby
9db49bfd62 Update translations 2016-12-19 12:21:38 +00:00
Dan Hensby
36287b09d0 Update translations 2016-12-16 20:49:04 +00:00
Daniel Hensby
f833bb53c3
Merge branch '3.4' into 3.5 2016-12-16 16:46:28 +00:00
Daniel Hensby
e90715d6c6
Merge branch '3.4' into 3.5 2016-12-07 13:43:34 +00:00
Daniel Hensby
b3e79239aa Merge pull request #1692 from tractorcow/pulls/3.4/fix-localisation-strings
BUG Fix localisation issues in CMS
2016-12-06 23:27:31 +00:00
Damian Mooyman
224b2a4cba BUG Fix localisation issues in CMS 2016-12-07 12:15:54 +13:00
Damian Mooyman
d018d2ca2e Merge pull request #1694 from dhensby/pulls/3.4/travis-simplification
Move travis env vars out of .travis.yml and into travis CI dashboard
2016-12-07 12:08:21 +13:00
Daniel Hensby
95995adc98
Move travis env vars out of .travis.yml and into travis CI dashboard 2016-12-06 22:29:48 +00:00
Daniel Hensby
203756f94d Merge pull request #1274 from kinglozzer/pulls/1273-cancreate-can-select
Ensure we have a ParentID before trying to limit children by page type (fixes #1273)
2016-11-30 12:38:51 +00:00
Loz Calver
94697e1281 Ensure we have a ParentID before trying to limit children by page type (fixes #1273) 2016-11-30 11:49:13 +00:00
Daniel Hensby
21d9b7cdf1
Merge branch '3.3' into 3.4 2016-11-28 13:57:38 +00:00
Daniel Hensby
5d3519976e
Merge tag '3.4.2' into 3.4
Release 3.4.2
2016-11-28 13:57:34 +00:00
Daniel Hensby
5355831de9
Merge branch '3.2' into 3.3 2016-11-28 13:56:51 +00:00
Daniel Hensby
5d4d6ffc96
Merge tag '3.3.4' into 3.3
Release 3.3.4
2016-11-28 13:46:42 +00:00
Daniel Hensby
4a439ad6a9
Merge tag '3.2.6' into 3.2
Release 3.2.6
2016-11-28 13:45:41 +00:00
Daniel Hensby
73b854ca72 Merge pull request #1687 from kinglozzer/1685-cancreate-top-level
FIX: content authors unable to duplicate top-level pages (fixes #1685)
2016-11-22 16:54:47 +00:00
Loz Calver
b2503ac004 FIX: content authors unable to duplicate top-level pages (fixes #1685) 2016-11-22 15:55:28 +00:00
Dan Hensby
aab7d30ab0 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby
f66e154a02 Update translations 2016-11-21 12:37:05 +00:00
Dan Hensby
34b0cdb124 Update translations 2016-11-18 15:14:39 +00:00
Daniel Hensby
bb91353e65
Merge branch '3.3' into 3.4 2016-11-15 12:01:37 +00:00
Daniel Hensby
b7bf426780
Merge branch '3.2' into 3.3 2016-11-15 12:01:17 +00:00
Daniel Hensby
7a45957d59
Merge branch '3.1' into 3.2 2016-11-15 11:58:30 +00:00
Daniel Hensby
c857017019 Merge pull request #2 from silverstripe-security/patch/3.1/SS-2016-012
[SS-2016-012] FIX Missing ACL check on ReportAdmin
2016-11-15 11:56:10 +00:00
Dan Hensby
cca147513a Update translations 2016-11-09 11:32:19 +00:00
Daniel Hensby
ad2b2a044e
Merge branch '3.4' into 3 2016-10-16 22:43:01 +01:00
Daniel Hensby
147181e96f
Merge branch '3.3' into 3.4 2016-10-16 22:42:40 +01:00
Daniel Hensby
bc71f2de01
Merge branch '3.2' into 3.3 2016-10-16 22:42:26 +01:00
Daniel Hensby
12c0f3c1c7
Merge branch '3.1' into 3.2 2016-10-16 22:40:56 +01:00
Damian Mooyman
17a471a47a Merge pull request #1640 from dhensby/pulls/3.4/fix-history-versions
FIX History controller now shows right comparison versions
2016-10-12 09:11:45 +13:00