8ec23bf627
Merge pull request #261 from open-sausages/pulls/4.3/remote-archive
...
Remove cow archive metadata
2019-09-24 10:42:02 +12:00
1c3596be90
Remove cow archive metadata
...
See https://github.com/silverstripe/silverstripe-framework/issues/9232
See https://github.com/silverstripe/silverstripe-installer/pull/260 for equivalent 4.x PR
2019-09-20 11:39:12 +12:00
45b3cb6a43
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:18:51 +13:00
75984719db
Ignore modules
2017-12-06 16:22:20 +13:00
68fdb0684e
Add .cow.json to 3.5 branch
2017-12-06 15:42:10 +13:00
c30abae60c
Merge pull request #213 from aNickzz/patch-2
...
Ignore (almost) everything in the assets folder
2017-12-01 14:30:09 +13:00
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
0bf0f44403
Merge pull request #210 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:59:51 +13:00
b1875ea1af
Loosen PHPUnit constraints
2017-11-17 11:37:41 +00:00
6eadd1e6a4
Merge tag '3.6.1' into 3.6
...
Release 3.6.1
2017-06-27 12:56:12 +01:00
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
f589adb0b9
Merge branch '3.5' into 3.6
2017-05-30 23:49:40 +01:00
ed34be06c1
Merge tag '3.6.0' into 3.6
...
Release 3.6.0
2017-05-30 23:49:34 +01:00
1aac471131
Merge branch '3.4' into 3.5
2017-05-30 23:48:39 +01:00
f7cb994ab6
Merge tag '3.5.4' into 3.5
...
Release 3.5.4
2017-05-30 23:48:37 +01:00
d07a18a643
Merge tag '3.4.6' into 3.4
...
Release 3.4.6
2017-05-30 23:47:06 +01:00
a32988fc04
Merge remote-tracking branch 'security/3.5.4' into 3.6.0
2017-05-29 01:29:55 +01:00
6475ac9e7d
Merge remote-tracking branch 'security/3.4.6' into 3.5.4
2017-05-29 01:03:15 +01:00
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
c25478bef7
[SS-2017-017] FIX SVG uploads disabled by default
2017-05-25 13:18:13 +01:00
9dfe62577b
Merge branch '3.5' into 3.6
2017-05-08 16:19:40 +01:00
e35dd82f2d
Merge branch '3.4' into 3.5
2017-05-08 15:49:49 +01:00
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
9acd97791a
Update code formatting for the SS3 PHPCS ruleset, separate Page_Controller to new file
2017-04-28 07:33:07 +12:00
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
9da75efec8
Alias 3 as 3.6
2017-03-06 11:13:04 +13:00
a54cd1fa31
Merge 3.4 into 3
...
# Conflicts:
# composer.json
2016-08-05 19:13:06 +12:00
f299c4d18d
Remove obsolete alias
2016-07-28 14:32:15 +12:00
675ee0a106
Alias 3 as 3.5
2016-05-19 16:09:34 +12:00
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
c55777c9af
API Enable friendly error HTTP code by default for new projects
2016-05-18 15:17:43 +12:00
23cf0b8e8d
Merge branch '3.3' into 3
2016-05-13 16:53:04 +12:00
9c42bb7b4d
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-05-13 16:50:35 +12:00
ff589cb4e3
Merge remote-tracking branch 'origin/3.1' into 3.2
2016-05-13 16:50:09 +12:00
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
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
4920218155
Merge 3.3 into 3
2016-05-11 14:02:09 +12:00
0a3570808a
Merge 3.2 into 3.3
2016-05-11 13:59:52 +12:00
4ba8fda822
Merge 3.1 into 3.2
...
# Conflicts:
# composer.json
2016-05-11 13:55:23 +12:00
bb24a9192e
Require php-tidy for dev dependencies ( #87 )
2016-05-08 22:05:19 +12:00
cc7a2aeb1e
FIX Add framework/admin tests ( #118 )
2016-05-06 07:43:27 +12:00
8e7d591075
Merge branch '3.3' into 3
2016-04-26 02:05:25 +01:00
1c1b277c93
Merge 3.2 into 3.3
2016-04-26 02:04:36 +01:00
c7327814b5
Alias 3 branch as 3.4
2015-12-23 14:25:24 +13:00
0ef455f2b7
Merge pull request #111 from schellmax/patch-1
...
Added siteconfig installation requirement
2015-12-07 11:38:45 -08:00
d55468b02e
Update README.md
...
Add 'siteconfig' module to list of required modules (as SilverStripe installation gives errors when installing without)
2015-12-06 13:53:28 +01:00
0f0e4e85a5
Merge branch '3.2' into 3
2015-11-10 10:55:06 +00:00
0572ce7a9a
Merge branch '3.1' into 3.2
2015-11-10 10:54:37 +00:00
df6cbb20f7
Merge pull request #108 from dhensby/pulls/keep-htaccess
...
.gitignore re-organisation
2015-11-10 23:34:11 +13:00
b28f567d30
Remove local IDE cache folders from .gitignore
...
These are environment specific and who's to judge which are worthy and which aren't. Devs should ignore this at an environment level: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
2015-11-10 10:30:16 +00:00
Ingo Schommer
Ingo Schommer
Damian Mooyman
aNickzz
Daniel Hensby
Daniel Hensby
Daniel Hensby
Robbie Averill
Hamish Friedlander
Sam Minnee
Jono Menz
Matthias Schelling