Ingo Schommer
cfba4cbe36
Fixed core dependency to 4.x-dev
...
Likely caused by repeated unreviewed merges from 4.4 (and 4.3) onto the 4 branch here (e.g. through fa67bc614b
2019-04-30 09:21:53 +12:00
Robbie Averill
83f78fc40e
Merge branch '4.4' into 4
2019-04-21 10:33:04 +12:00
Robbie Averill
c9a4efe29d
Merge branch '4.3' into 4.4
2019-04-21 10:32:21 +12:00
Robbie Averill
d0521e1664
Merge branch '4.2' into 4.3
2019-04-21 10:32:11 +12:00
Robbie Averill
e650c43da7
Merge branch '4.1' into 4.2
2019-04-21 10:30:58 +12:00
Robbie Averill
c0d9fd4869
Remove obsolete branch alias
2019-04-21 10:30:43 +12:00
Robbie Averill
810f719f86
Revert "NEW Add Roave Security advisories to composer"
...
This reverts commit a302acfa5a
2019-02-26 09:19:08 +11:00
Robbie Averill
1b31ffa28a
Revert "Update development dependencies"
...
This reverts commit 1a55336552
2019-02-19 05:25:35 +07:00
Aaron Carlino
1a55336552
Update development dependencies
2019-02-19 10:53:35 +13:00
Ingo Schommer
6e42093c9d
Merge pull request #250 from creative-commoners/pulls/4.1/split-framework-tests
...
Split framework tests from assets and versioned to prevent time limits being exceeded
2019-02-04 09:04:54 +13:00
Robbie Averill
c8451b9071
Split framework tests from assets and versioned to prevent time limits being exceeded
...
Also removed an unneeded editorconfig block which is duplicated and adds PHP 7.2 and 7.3 into the builds
2019-02-02 12:15:17 +03:00
Robbie Averill
a9e1e328ca
Merge pull request #248 from open-sausages/pulls/4.2/fix-tests
...
TravisCI / fix silverstripe/posgresql version
2019-02-01 09:19:02 +02:00
Serge Latyntcev
e279f35abf
TravisCI / fix silverstripe/posgresql version
2019-02-01 16:05:37 +13:00
Robbie Averill
e8614b59bb
Bump postgres version in Travis builds to match silverstripe/framework@4.4
2019-01-31 11:43:39 +02:00
Serge Latyntcev
9fe50bb42b
Merge branch '4.3' into 4
2019-01-28 14:14:23 +13:00
Serge Latyntcev
2473e05496
Merge branch '4.2' into 4.3
2019-01-28 14:09:54 +13:00
Serge Latyntcev
127c62a0c9
Merge branch '4.1' into 4.2
2019-01-28 14:09:19 +13:00
Serge Latyntsev
824bd2cf91
Merge pull request #244 from open-sausages/pulls/4.1/behat-install
...
FIX / Installer tests
2019-01-28 12:11:58 +13:00
Maxime Rainville
0f02f2364f
MINOR Make installer default to using _resources ( #242 )
2019-01-16 21:34:13 +13:00
Maxime Rainville
f04beea2f3
Merge pull request #246 from Firesphere/patch-1
...
Add Roave Security advisories to composer
2019-01-08 10:07:45 +13:00
Simon Erkelens
a302acfa5a
NEW Add Roave Security advisories to composer
...
Add Security Advisories as dev requirement to
- Prevent installation of known breached libraries
- Give devs the option to remove it if they might want to
2019-01-08 09:37:34 +13:00
Serge Latyntcev
3d841a409c
FIX / Behat tests
...
Most of the modules stop exporting metadata files (behat.yml among those) to packagist
Thus when travis runs behat tests it cannot find configuration for the test suites
2018-12-18 16:38:40 +13:00
Robbie Averill
b66e851dda
Merge branch '4.3' into 4
2018-11-21 09:12:30 +01:00
Robbie Averill
3abeb18858
Merge branch '4.2' into 4.3
...
# Conflicts:
# composer.json
2018-11-21 09:12:10 +01:00
Robbie Averill
84aaa17461
Merge branch '4.1' into 4.2
2018-11-21 09:11:20 +01:00
Robbie Averill
d0890776e8
Merge branch '4.0' into 4.1
2018-11-21 09:11:04 +01:00
Robbie Averill
fcd4052a07
Update Slack integration token
2018-11-21 09:10:41 +01:00
Robbie Averill
90f54ccfe9
Merge pull request #240 from JorisDebonnet/patch-4
...
Correct typo
2018-10-17 21:56:44 +02:00
JorisDebonnet
fa3c87f61e
Correct typo
2018-10-17 18:05:20 +02:00
Robbie Averill
fa67bc614b
Bump branch alias and root version in Travis to 4.4.x-dev
2018-10-15 14:54:38 +02:00
Robbie Averill
05fd5a9a96
Bump branch alias and root version in Travis to 4.4.x-dev
2018-10-15 14:44:14 +02:00
Robbie Averill
caf0bc12f7
Merge branch '4.3' into 4
2018-10-15 14:43:00 +02:00
Aaron Carlino
c24d4c73c3
Remove obsolete branch-alias
2018-10-15 16:31:48 +13:00
Dan Hensby
986a2f951a
Update composer.json version constraint
2018-08-04 08:59:12 +02:00
Daniel Hensby
eba91f9bec
Merge branch '4.2' into 4
...
# Conflicts:
# composer.json
2018-07-30 17:14:31 +01:00
Daniel Hensby
539b58d7aa
Merge tag '4.2.1' into 4.2
...
Release 4.2.1
2018-07-30 17:12:06 +01:00
root
0307496292
Update development dependencies
2018-07-30 15:23:32 +00:00
Daniel Hensby
15f8011493
Merge branch '4.2' into 4
...
# Conflicts:
# composer.json
2018-07-30 11:23:08 +01:00
Daniel Hensby
6ad3a067c3
Merge tag '4.2.0' into 4.2
...
Release 4.2.0
2018-07-30 11:14:13 +01:00
root
b1cd5afe28
Update development dependencies
2018-07-24 19:22:22 +00:00
Daniel Hensby
7d838b0631
Update composer dep
2018-07-24 16:47:35 +01:00
Robbie Averill
baf63747b4
Bump Postgres version to 2.1.x-dev for SilverStripe 4.2+
2018-06-29 16:39:17 +12:00
Robbie Averill
28da082fa1
Merge pull request #232 from open-sausages/pulls/4.3/increment-travis-version-to4.3.x-dev
...
Increment travis root version to 4.3.x-dev
2018-06-29 16:38:38 +12:00
Maxime Rainville
1431370940
Increment travis root version to 4.3.x-dev
2018-06-26 17:49:01 +12:00
Damian Mooyman
5e4ad34162
Fix incorrect base recipe dependency
2018-06-15 16:47:59 +12:00
Damian Mooyman
f5b659cb4f
Merge remote-tracking branch 'origin/4.2' into 4
2018-06-15 16:06:14 +12:00
Damian Mooyman
0d5daf5658
Update development dependencies
2018-06-15 15:52:39 +12:00
Damian Mooyman
6a7bd05a1d
Remove obsolete branch-alias
2018-06-15 15:30:04 +12:00
Damian Mooyman
97ef910478
Update installer to use new recipe versioning
2018-06-14 13:29:03 +12:00
Damian Mooyman
d178ebdb9e
Merge pull request #230 from creative-commoners/pulls/4/remove-classmap
...
FIX Remove incorrect classmap for Page and PageController
2018-06-05 12:08:10 +12:00
