Chris Joe
41b87ab2d5
Merge pull request #198 from open-sausages/pulls/4.0/adjust-timeout
...
Adjust behat timeout for asset-admin tests
2017-09-29 12:03:02 +13:00
Damian Mooyman
0cf5924277
Update .travis.yml
2017-09-29 10:03:30 +13:00
Damian Mooyman
2c81adf3e6
Adjust behat timeout for asset-admin tests
2017-09-29 09:45:55 +13:00
Chris Joe
9e6114c151
Merge pull request #195 from sminnee/gimme-more-files
...
FIX: Include .env.example and .editorconfig in git export
2017-09-06 15:24:55 +12:00
Chris Joe
40c6fcf18f
Merge pull request #197 from open-sausages/pulls/4.0/recipe-info
...
Provide information related to recipe
2017-08-14 23:05:50 +12:00
Saophalkun Ponlu
26cd654dbb
Provide information related to recipe
2017-08-14 17:15:42 +12:00
Damian Mooyman
4df28ad121
Added archive config
2017-08-04 16:39:39 +12:00
Sam Minnee
424b1c04dd
FIX: Include .env.example and .editorconfig in git export
...
The “export” downloads of the installer should include these two files
as they are of use to regular developers.
* .editorconfig encourages the use of our standard code format
* .env.example is a helper for new developers
2017-07-31 17:36:33 +12:00
Damian Mooyman
980bf834b7
Fix recipe plugin version constraint
2017-07-25 11:13:55 +12:00
Chris Joe
dd2ebad5dc
Merge pull request #193 from open-sausages/pulls/4.0/recipe-concept
...
API Convert installer to recipe
2017-07-24 15:13:35 +12:00
Damian Mooyman
2d04b844b7
API Convert installer to recipe
2017-07-24 14:45:14 +12:00
Damian Mooyman
d3de9e075f
Merge pull request #191 from nfauchelle/patch-1
...
Update .gitignore
2017-07-07 22:05:01 +12:00
Nick
afb523424e
Update .gitignore
...
Add in another module which is managed by composer
2017-07-07 21:02:29 +12:00
Damian Mooyman
f9bc5a3fc0
Merge pull request #190 from robbieaverill/patch-1
...
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 14:46:24 +12:00
Robbie Averill
5284ca65b0
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 12:41:02 +12:00
Christopher Joe
adca3aea68
Update composer alias
2017-07-06 09:03:09 +12:00
Damian Mooyman
7b68ac77ab
Remove obsolete branch-alias
2017-07-03 16:53:55 +12:00
Daniel Hensby
1e7d9f9a15
Merge pull request #185 from robbieaverill/patch-1
...
FIX Delete Page_Controller from SS4 compat branch
2017-06-27 23:38:47 +01:00
Robbie Averill
b8750d9399
FIX Delete Page_Controller from SS4 compat branch
...
I assume this turned up in a merge-up - having this around breaks breaks things. Should be PageController now.
2017-06-28 10:05:38 +12:00
Daniel Hensby
69441aba44
Merge branch '3'
2017-06-27 13:27:40 +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
Damian Mooyman
c9c9cf7d58
Merge pull request #182 from jonom/master
...
Added errorpage module requirement
2017-06-27 14:30:48 +12:00
Ingo Schommer
333d3a5408
Merge pull request #183 from open-sausages/pulls/4.0/app-object
...
Remove unneeded globals
2017-06-22 22:58:14 +12:00
Damian Mooyman
a74e513a29
Remove unneeded globals
2017-06-20 17:20:00 +12:00
Jono Menz
4f68a04730
Added errorpage module
2017-06-15 16:02:13 -07: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
Chris Joe
5aa694953e
Merge pull request #180 from open-sausages/pulls/4.0/remove-dummy
...
Remove redundant dummy file in assets
2017-06-08 10:49:28 +12:00
Damian Mooyman
bf76193e13
Remove redundant dummy file in assets
2017-06-06 11:45:15 +12: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
Chris Joe
0e85f88204
Merge pull request #178 from open-sausages/pulls/4.0/add-behat-tests
...
API Add pgsql + behat tests to installer
2017-05-25 12:57:55 +12:00
Damian Mooyman
2e94a11c8b
API Add pgsql + behat tests to installer
2017-05-23 14:50:12 +12:00
Damian Mooyman
d406fa365f
Merge pull request #179 from nfauchelle/ignore-modules-handled-by-composer
...
Add in the module folders which come from the default install
2017-05-22 21:17:05 +12:00
Nick
aa1c2ce05a
Add in the module folders which come from the default SilverStripe composer.json. Since we ignore the /vendor/ folder we should ignore these items as well since composer will maintain them
2017-05-22 20:44:14 +12:00
Damian Mooyman
d9f28b2017
Merge pull request #177 from nfauchelle/psr-2-adjustments
...
Update the PHP files to PSR-2 spec
2017-05-15 09:15:09 +12:00
Nick
d3ed3f7476
Update the PHP files to PSR-2 spec
2017-05-14 21:48:27 +12:00
Damian Mooyman
f54ff29a02
API Remove BlockUntrustedIPs
2017-05-11 09:31:23 +12: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
Damian Mooyman
df40d5f8c6
Update for behat 3
2017-05-05 17:21:32 +12:00
