Daniel Hensby
|
81872c75c3
|
Update phpunit deps to match framework
|
2018-05-25 11:02:21 +01: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 bb24a9192e.
Fixes https://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 |
|
Daniel Hensby
|
1c1b277c93
|
Merge 3.2 into 3.3
|
2016-04-26 02:04:36 +01:00 |
|
Damian Mooyman
|
c7327814b5
|
Alias 3 branch as 3.4
|
2015-12-23 14:25:24 +13:00 |
|
Jono Menz
|
0ef455f2b7
|
Merge pull request #111 from schellmax/patch-1
Added siteconfig installation requirement
|
2015-12-07 11:38:45 -08:00 |
|
Matthias Schelling
|
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 |
|
Daniel Hensby
|
0f0e4e85a5
|
Merge branch '3.2' into 3
|
2015-11-10 10:55:06 +00:00 |
|
Daniel Hensby
|
0572ce7a9a
|
Merge branch '3.1' into 3.2
|
2015-11-10 10:54:37 +00:00 |
|
Damian Mooyman
|
df6cbb20f7
|
Merge pull request #108 from dhensby/pulls/keep-htaccess
.gitignore re-organisation
|
2015-11-10 23:34:11 +13:00 |
|
Daniel Hensby
|
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 |
|
Daniel Hensby
|
b73a8cc724
|
Reorganise .gitignore file
|
2015-11-10 10:30:15 +00:00 |
|
Daniel Hensby
|
04088a13ea
|
Merge pull request #106 from nickspiel/patch-1
Allowing SVGs in the assets directory
|
2015-10-29 17:32:56 +00:00 |
|
Nick Spiel
|
6346004398
|
Allowing SVGs in the assets directory
This should be combined with a PR I have started on silverstripe-framework https://github.com/silverstripe/silverstripe-framework/pull/4669
|
2015-10-08 17:35:42 +11:00 |
|
Daniel Hensby
|
5e20faa72a
|
Merge remote-tracking branch 'silverstripe/3.2' into 3
Conflicts:
composer.json
|
2015-07-20 15:20:19 +01:00 |
|