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 |
|
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
|
63186c87fe
|
Merge pull request #162 from open-sausages/pulls/4.0/fix-release-constraints
Lock dependency-constraint prior to beta
|
2017-04-05 16:30:11 +12:00 |
|
Damian Mooyman
|
f9f61cbce2
|
BUG Fix cow release config
|
2017-04-05 16:11:19 +12:00 |
|
Chris Joe
|
d839245a73
|
Merge pull request #168 from open-sausages/pulls/4.0/combine-tests
Add combined test suite for installer
|
2017-04-05 15:16:50 +12:00 |
|
Damian Mooyman
|
f3d64abd55
|
Add combined test suite for installer
Remove teamcity config from default install
Partial implementation of #164
Fixes #166
|
2017-04-04 16:39:12 +12:00 |
|
Loz Calver
|
c2c184cbb9
|
Merge pull request #165 from dhensby/pulls/4/test-update
Update PHPUnit XML configs to remove SS TestListener
|
2017-03-30 10:42:27 +01:00 |
|
Daniel Hensby
|
57582636fa
|
Update PHPUnit XML configs to remove SS TestListener
|
2017-03-30 10:35:21 +01:00 |
|
Damian Mooyman
|
e6b713a323
|
Merge pull request #163 from sminnee/license-file
FIX: Split licence into separate file to match standard.
|
2017-03-29 17:35:08 +13:00 |
|
Sam Minnee
|
639631013f
|
FIX: Split licence into separate file to match standard.
|
2017-03-29 12:45:25 +13:00 |
|
Ingo Schommer
|
345c225527
|
Merge pull request #160 from open-sausages/pulls/4.0/campaign-admin
Add campaign admin module
|
2017-03-28 17:51:04 +13:00 |
|
Damian Mooyman
|
41c2f8c82e
|
Add campaign admin module
|
2017-03-28 13:32:45 +13:00 |
|
Damian Mooyman
|
3a1b9a82f5
|
Add versioned module
|
2017-03-28 10:35:25 +13:00 |
|
Damian Mooyman
|
2809247c24
|
Lock dependency-constraint prior to beta
Fixes https://github.com/silverstripe/silverstripe-framework/issues/6737
|
2017-03-27 10:00:41 +13:00 |
|
Loz Calver
|
2768e6ca6b
|
Merge pull request #161 from dhensby/pulls/phpunit
Update PHP min version and PHPUnit version
|
2017-03-24 11:28:22 +00:00 |
|
Daniel Hensby
|
d2c8e3c65f
|
Update PHP min version and PHPUnit version
|
2017-03-25 00:20:44 +13:00 |
|
Damian Mooyman
|
33087bcc8d
|
Add assets as module
|
2017-03-23 09:24:14 +13:00 |
|
Daniel Hensby
|
a8eda2ab05
|
Merge pull request #157 from open-sausages/pulls/4.0/fix-devs
Fix dev dependencies for root project
|
2017-03-16 16:42:33 +13:00 |
|
Daniel Hensby
|
0e7f29b5db
|
Merge pull request #153 from Zauberfisch/patch-1
Block common log file names in .htaccess
|
2017-03-16 16:38:15 +13:00 |
|
Damian Mooyman
|
61e5b3836e
|
Fix dev dependencies for root project
|
2017-03-16 16:01:15 +13:00 |
|
Ingo Schommer
|
aacbae8107
|
Merge pull request #156 from open-sausages/pulls/4.0/admin-module
Add admin module to root installer
|
2017-03-15 12:02:20 +13:00 |
|
Damian Mooyman
|
94f3c609b2
|
Add admin module to root installer
|
2017-03-10 15:17:14 +13:00 |
|
Damian Mooyman
|
9da75efec8
|
Alias 3 as 3.6
|
2017-03-06 11:13:04 +13:00 |
|
Damian Mooyman
|
18a5348caa
|
Merge pull request #110 from spekulatius/patch-1
tab -> space in editorconfig
|
2017-03-01 13:00:09 +13:00 |
|
Damian Mooyman
|
9c68dc0276
|
Merge pull request #155 from open-sausages/pulls/4.0/circular-deps
Fix remove the wildcard After condition in config.yml
|
2017-02-28 15:32:18 +13:00 |
|
Christopher Joe
|
ac685e4d38
|
Fix remove the wildcard After condition in config.yml
|
2017-02-28 15:30:46 +13:00 |
|