916d7f3815
Fixing tests
2016-12-28 17:10:45 +00:00
7a296a541b
Merge branch '3'
2016-12-28 17:00:32 +00:00
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
6060af45c1
Merge 3.4 into 3.5
2016-12-22 13:18:30 +13:00
e4ff310a62
Merge 3.5.1 into 3.5
2016-12-22 13:17:16 +13:00
483cda95a6
Merge 3.4.3 into 3.4
2016-12-22 13:16:07 +13:00
9db49bfd62
Update translations
2016-12-19 12:21:38 +00:00
0b952e277e
Merge branch '3.5' into 3
2016-12-19 11:56:55 +00:00
36287b09d0
Update translations
2016-12-16 20:49:04 +00:00
f833bb53c3
Merge branch '3.4' into 3.5
2016-12-16 16:46:28 +00:00
bf58c5aef4
API Update to use new form submission handling ( #1691 )
2016-12-09 16:00:46 +13:00
981ca17695
Merge pull request #1675 from mikenz/patch-3
...
FIX Page History 'Comparing versions' banner missing
2016-12-08 21:29:20 +13:00
4fea439139
Merge branch 'master' into patch-3
2016-12-08 21:28:21 +13:00
e90715d6c6
Merge branch '3.4' into 3.5
2016-12-07 13:43:34 +00:00
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
224b2a4cba
BUG Fix localisation issues in CMS
2016-12-07 12:15:54 +13:00
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
95995adc98
Move travis env vars out of .travis.yml and into travis CI dashboard
2016-12-06 22:29:48 +00:00
669a7e6945
Merge pull request #1689 from ninty9notout/master
...
Removed dud Requirements breaking the RedirectorPage
2016-11-30 13:16:33 +00:00
0dd81fcbe8
Removed dud Requirements breaking the RedirectorPage
...
Also removed the dependency
2016-11-30 12:51:04 +00:00
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
94697e1281
Ensure we have a ParentID before trying to limit children by page type ( fixes #1273 )
2016-11-30 11:49:13 +00:00
4a1cf3d4fb
Merge branch '3.5' into 3
2016-11-28 14:02:13 +00:00
ca76b9488f
Merge branch '3.4' into 3.5
2016-11-28 14:01:01 +00:00
caab36068f
Merge tag '3.5.0' into 3.5
...
Release 3.5.0
2016-11-28 13:57:54 +00:00
21d9b7cdf1
Merge branch '3.3' into 3.4
2016-11-28 13:57:38 +00:00
5d3519976e
Merge tag '3.4.2' into 3.4
...
Release 3.4.2
2016-11-28 13:57:34 +00:00
5355831de9
Merge branch '3.2' into 3.3
2016-11-28 13:56:51 +00:00
5d4d6ffc96
Merge tag '3.3.4' into 3.3
...
Release 3.3.4
2016-11-28 13:46:42 +00:00
4a439ad6a9
Merge tag '3.2.6' into 3.2
...
Release 3.2.6
2016-11-28 13:45:41 +00:00
de19c643fb
Update translations
2016-11-28 12:35:17 +00:00
524067caaa
Setting default branch in .codecov.yml
2016-11-24 10:58:57 +00:00
bbaec8c913
Merge pull request #1684 from open-sausages/pulls/4.0/framework-test-namespace
...
API Update tests to reflect renamed services
2016-11-23 20:11:54 +00:00
38070ab2d3
API Update tests to reflect renamed services
2016-11-23 19:28:10 +13:00
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
b2503ac004
FIX: content authors unable to duplicate top-level pages ( fixes #1685 )
2016-11-22 15:55:28 +00:00
285c4921a7
Update translations
2016-11-21 13:51:27 +00:00
aab7d30ab0
Update translations
2016-11-21 13:27:57 +00:00
f66e154a02
Update translations
2016-11-21 12:37:05 +00:00
682e6070e5
BUG Correct response code generated from error pages
2016-11-21 17:58:53 +13:00
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
c8865761d1
Synced up badges with framework
2016-11-21 16:54:17 +13:00
8b29228cf2
Added Code Coverage badge
2016-11-21 16:52:39 +13:00
0d788ddfbc
NEW: Code Coverage via CodeCov.io ( #1631 )
...
* Add phpunit.xml.dist for code coverage whitelist
* Fixed @covers with namespaces
* Increase memory_limit to allow code coverage run. phpdbg can peak to more than 1GB built-in.
Travis allows up to 3GB of useable memory:
https://docs.travis-ci.com/user/common-build-problems/#My-build-script-is-killed-without-any-error
https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
https://github.com/silverstripe/silverstripe-cms/pull/1631
2016-11-21 15:17:25 +13:00
34b0cdb124
Update translations
2016-11-18 15:14:39 +00:00
366b96a004
Merge branch '3.4' into 3.5.0
2016-11-15 12:02:07 +00:00
bb91353e65
Merge branch '3.3' into 3.4
2016-11-15 12:01:37 +00:00
b7bf426780
Merge branch '3.2' into 3.3
2016-11-15 12:01:17 +00:00
7a45957d59
Merge branch '3.1' into 3.2
2016-11-15 11:58:30 +00:00
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
Daniel Hensby
Damian Mooyman
Ingo Schommer
Daniel Hensby
Daniel Hensby
hirenpatel
Loz Calver
Nathan