tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,892 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

4892 Commits

Author SHA1 Message Date
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
Daniel Hensby 577a024109
Remove redundant label 2017-01-04 15:55:32 +00:00
Damian Mooyman a26607ca56 Merge 3.5 into 3 
# Conflicts:
#	lang/en.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/hr.yml
#	lang/it.yml
 2016-12-22 13:24:17 +13: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
Daniel Hensby 0b952e277e
Merge branch '3.5' into 3 2016-12-19 11:56:55 +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 4a1cf3d4fb
Merge branch '3.5' into 3 2016-11-28 14:02:13 +00:00
Daniel Hensby ca76b9488f
Merge branch '3.4' into 3.5 2016-11-28 14:01:01 +00:00
Daniel Hensby caab36068f
Merge tag '3.5.0' into 3.5 
Release 3.5.0
 2016-11-28 13:57:54 +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
Dan Hensby de19c643fb Update translations 2016-11-28 12:35:17 +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 285c4921a7 Update translations 2016-11-21 13:51:27 +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
Damian Mooyman 682e6070e5 BUG Correct response code generated from error pages 2016-11-21 17:58:53 +13:00
Nathan a5b33ab916 Correcting an issue where page controller methods 
would end up with the error page response code, causing them to not work. This code only looks to be causing issues from what I can see.

An example is an autocomplete that is populated using a method on page controller. The moment you end up on a 404 error page, the autocomplete will attempt to populate and end up with a 404 response.
 2016-11-21 15:43:37 +11:00
Dan Hensby 34b0cdb124 Update translations 2016-11-18 15:14:39 +00:00
Daniel Hensby 366b96a004
Merge branch '3.4' into 3.5.0 2016-11-15 12:02:07 +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
Damian Mooyman 02b9de93c3
Increment 3 alias to 3.6 2016-11-14 10:05:34 +13: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