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 |
|
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 |
|