Daniel Hensby
1c93f7195f
Merge branch '3.7' into 3
2018-07-17 21:24:18 +01:00
Damian Mooyman
de0eb5e05d
Remove obsolete branch alias
2018-06-12 11:28:27 +12:00
Damian Mooyman
f7634f39c7
Remove obsolete branch-alias
2018-06-08 12:19:38 +12:00
Damian Mooyman
a970bdecf3
Merge remote-tracking branch 'origin/3.6' into 3
2018-06-08 12:13:18 +12:00
Robbie Averill
53ff2d0f68
Merge pull request #228 from dhensby/pulls/3/phpunit-compat
...
Update phpunit deps to match framework
2018-05-26 00:22:25 +12:00
Daniel Hensby
81872c75c3
Update phpunit deps to match framework
2018-05-25 11:02:21 +01:00
Damian Mooyman
45b3cb6a43
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:18:51 +13:00
Damian Mooyman
75984719db
Ignore modules
2017-12-06 16:22:20 +13:00
Damian Mooyman
68fdb0684e
Add .cow.json to 3.5 branch
2017-12-06 15:42:10 +13:00
Damian Mooyman
c30abae60c
Merge pull request #213 from aNickzz/patch-2
...
Ignore (almost) everything in the assets folder
2017-12-01 14:30:09 +13:00
aNickzz
2d90647410
Update .gitignore
...
Uploading files directly through the Files LeftAndMain drops them directly into the assets folder by default. This will help prevent those files accidentally ending up in git.
2017-11-30 22:03:34 +10:30
Damian Mooyman
0bf0f44403
Merge pull request #210 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:59:51 +13:00
Daniel Hensby
b1875ea1af
Loosen PHPUnit constraints
2017-11-17 11:37:41 +00:00
Daniel Hensby
61bf3af041
Merge branch '3.6' into 3
2017-06-27 13:10:11 +01:00
Daniel Hensby
6eadd1e6a4
Merge tag '3.6.1' into 3.6
...
Release 3.6.1
2017-06-27 12:56:12 +01:00
Daniel Hensby
b2db7dc990
Merge pull request #1 from silverstripe-security/patch/3.6.0/SS-2017-017
...
[SS-2017-017] FIX SVG uploads disabled by default
2017-06-14 14:43:37 +01:00
Daniel Hensby
d0de968167
Merge branch '3.6' into 3
2017-05-30 23:50:37 +01:00
Daniel Hensby
f589adb0b9
Merge branch '3.5' into 3.6
2017-05-30 23:49:40 +01:00
Daniel Hensby
ed34be06c1
Merge tag '3.6.0' into 3.6
...
Release 3.6.0
2017-05-30 23:49:34 +01:00
Daniel Hensby
1aac471131
Merge branch '3.4' into 3.5
2017-05-30 23:48:39 +01:00
Daniel Hensby
f7cb994ab6
Merge tag '3.5.4' into 3.5
...
Release 3.5.4
2017-05-30 23:48:37 +01:00
Daniel Hensby
d07a18a643
Merge tag '3.4.6' into 3.4
...
Release 3.4.6
2017-05-30 23:47:06 +01:00
Daniel Hensby
a32988fc04
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:29:55 +01:00
Daniel Hensby
6475ac9e7d
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:03:15 +01:00
Daniel Hensby
a063c1caec
Merge pull request #174 from robbieaverill/phpcs-standard-3.x
...
Add PHPCS standard for SS 3.x
2017-05-28 21:37:39 +00:00
Daniel Hensby
c25478bef7
[SS-2017-017] FIX SVG uploads disabled by default
2017-05-25 13:18:13 +01:00
Daniel Hensby
02e3e102c1
Merge branch '3.6' into 3
2017-05-08 16:20:04 +01:00
Daniel Hensby
9dfe62577b
Merge branch '3.5' into 3.6
2017-05-08 16:19:40 +01:00
Daniel Hensby
e35dd82f2d
Merge branch '3.4' into 3.5
2017-05-08 15:49:49 +01:00
Ingo Schommer
247878f03b
Merge pull request #174 from robbieaverill/phpcs-standard-3.x
...
Add PHPCS standard for SS 3.x
2017-04-28 08:27:30 +12:00
Robbie Averill
9acd97791a
Update code formatting for the SS3 PHPCS ruleset, separate Page_Controller to new file
2017-04-28 07:33:07 +12:00
Robbie Averill
451e7961d2
Add PHPCS configuration for SilverStripe 3.x
...
Based on PSR-2, allowing some exceptions like class and method naming rules and namespaces for every class
2017-04-28 07:28:40 +12:00
Daniel Hensby
8a3e352595
Aliasing 3 as 3.7.x-dev
2017-04-21 16:14:18 +01:00
Damian Mooyman
9da75efec8
Alias 3 as 3.6
2017-03-06 11:13:04 +13:00
Damian Mooyman
a54cd1fa31
Merge 3.4 into 3
...
# Conflicts:
# composer.json
2016-08-05 19:13:06 +12:00
Damian Mooyman
f299c4d18d
Remove obsolete alias
2016-07-28 14:32:15 +12:00
Damian Mooyman
675ee0a106
Alias 3 as 3.5
2016-05-19 16:09:34 +12:00
Hamish Friedlander
bede06a1aa
Merge pull request #124 from open-sausages/pulls/3/http-default-code
...
API Enable friendly error HTTP code by default for new projects
2016-05-18 15:37:54 +12:00
Damian Mooyman
c55777c9af
API Enable friendly error HTTP code by default for new projects
2016-05-18 15:17:43 +12:00
Sam Minnee
23cf0b8e8d
Merge branch '3.3' into 3
2016-05-13 16:53:04 +12:00
Sam Minnee
9c42bb7b4d
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-05-13 16:50:35 +12:00
Sam Minnee
ff589cb4e3
Merge remote-tracking branch 'origin/3.1' into 3.2
2016-05-13 16:50:09 +12:00
Damian Mooyman
2aa2d9a7f0
Merge pull request #121 from sminnee/revert-ext-tidy
...
Revert "Require php-tidy for dev dependencies (#87 )"
2016-05-11 17:46:13 +12:00
Sam Minnee
70be958cee
Revert "Require php-tidy for dev dependencies ( #87 )"
...
This reverts commit bb24a9192ehttps://github.com/silverstripe/silverstripe-installer/issues/120
2016-05-11 17:35:51 +12:00
Damian Mooyman
4920218155
Merge 3.3 into 3
2016-05-11 14:02:09 +12:00
Damian Mooyman
0a3570808a
Merge 3.2 into 3.3
2016-05-11 13:59:52 +12:00
Damian Mooyman
4ba8fda822
Merge 3.1 into 3.2
...
# Conflicts:
# composer.json
2016-05-11 13:55:23 +12:00
Daniel Hensby
bb24a9192e
Require php-tidy for dev dependencies ( #87 )
2016-05-08 22:05:19 +12:00
Daniel Hensby
cc7a2aeb1e
FIX Add framework/admin tests ( #118 )
2016-05-06 07:43:27 +12:00
Daniel Hensby
8e7d591075
Merge branch '3.3' into 3
2016-04-26 02:05:25 +01:00
