Commit Graph

1180 Commits

Author SHA1 Message Date
Ingo Schommer 87ae55539e
Merge branch '4' into pulls/4/login-forms 2019-12-11 15:46:06 +13:00
Andre Kiste 8f62bb9488
Merge pull request #267 from creative-commoners/pulls/4/rfc-9344
RFC-9344 Remove branch aliases
2019-12-10 13:38:53 +13:00
Serge Latyntcev a3bc3d80c5 RFC-9344 Remove branch aliases 2019-12-09 10:58:15 +13:00
Robbie Averill 54265626f1
Merge pull request #266 from creative-commoners/recover/4
Update branch aliases
2019-11-28 16:50:18 -08:00
Serge Latyntcev 3bf4d1f34c Update branch alias, requirements and travis config 2019-11-29 12:00:14 +13:00
Serge Latyntcev e3230a7371 Remove obsolete branch-alias 2019-11-14 01:24:53 +00:00
Serge Latyntcev 56b9c16880 Merge branch '4.4' into 4 2019-11-13 15:50:30 +13:00
Serge Latyntcev 93f8699b65 Merge branch '4.3' into 4.4 2019-11-13 15:49:40 +13:00
Garion Herman b171632ccd
Merge pull request #254 from creative-commoners/pulls/4.4/release-changelog-template
Add and configure Cow changelog template
2019-10-22 13:00:41 +13:00
Garion Herman 626d7c9f99
FIX Update changelog template location config 2019-10-22 11:54:04 +13:00
Ingo Schommer d01cf63018
Merge pull request #260 from open-sausages/pulls/4.3/remove-archive
Remove cow archive metadata
2019-09-24 10:41:54 +12:00
Ingo Schommer 03c2c996c5 Remove cow archive metadata
See https://github.com/silverstripe/silverstripe-framework/issues/9232
2019-09-20 11:35:43 +12:00
Robbie Averill 0ae3823eeb
Merge pull request #259 from nfauchelle/patch-1
Update the default location for tests in a project
2019-08-25 18:38:24 +12:00
Nick 7de2991fa3
Update the default location for tests in a project
Change the path since mysite isn't used anymore, new sites have an app folder instead.
2019-08-25 12:32:26 +12:00
Robbie Averill 70580acb2b
Merge pull request #258 from open-sausages/pulls/4/xenial
Enhancement / Update travis config to use Xenial
2019-07-26 09:40:10 +02:00
Serge Latyntcev be4ff49c12 Enhancement / Update travis config to use Xenial 2019-07-26 12:56:40 +12:00
Ingo Schommer c1d94643a4
Set looser composer constraint
As per discussion with Guy on https://github.com/silverstripe/silverstripe-installer/pull/257. Will pull in stable tags via cow once they're available (on recipe release)
2019-07-16 11:23:54 +12:00
Ingo Schommer 9171342ec2 NEW Add silverstripe/login-forms
Using beta tag for now, should move to stable once the module is stable (ideally before 4.5.0)
2019-07-05 16:45:11 +12:00
Garion Herman e4acec30c8 Shift changelog template into dedicated cow config folder 2019-06-13 12:28:50 +12:00
Robbie Averill d4af206393
Merge pull request #256 from sminnee/deprecate-pdo
NEW: Change .env.example to default to MySQL native driver
2019-06-13 11:15:18 +12:00
Sam Minnee a968e7ad47 NEW: Change .env.example to default to MySQL native driver
https://github.com/silverstripe/silverstripe-framework/issues/8598
2019-06-11 16:19:50 +12:00
Ingo Schommer 09a2f6e298
Merge pull request #255 from creative-commoners/pulls/4.5/php71
API Bump minimum PHP version to 7.1
2019-06-07 14:39:36 +12:00
Robbie Averill 002cb6b61d API Bump minimum PHP version to 7.1 2019-05-23 13:59:31 +12:00
Garion Herman 0eede14f45 Add and configure Cow changelog template 2019-05-13 15:01:48 +12:00
Maxime Rainville 43b8000fd6 NEW Disable legacy resolution for new projects (#253) 2019-05-10 09:55:36 +12:00
Ingo Schommer 3e7294ea70
Bump to 4.5.x-dev
This conflicts with an earlier commit (cfba4cb), but after talking to Robbie this new commit is consistent with how we handle other recipes (CWP and core). Both ways are viable, but we've implicitly standardised on this way (set minor release constraints in the main release branch, e.g. constraint to recipe:4.5.x-dev on installer:4.x-dev)
2019-04-30 11:03:06 +12:00
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).

Note this isn't changing the branch alias, which should still point to 4.5.x-dev here.
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