Robbie Averill
074c9dc45c
Merge branch '4.6' into 4
...
# Conflicts:
# .travis.yml
2020-06-23 09:52:47 -07:00
Robbie Averill
63830aec7f
Merge pull request #285 from creative-commoners/pulls/4.6/travis
...
Update travis 4.6
2020-06-23 09:49:30 -07:00
Steve Boyd
5877d0ecce
Update travis
2020-06-23 17:16:31 +12:00
Andre Kiste
9f2a17337a
Merge pull request #283 from creative-commoners/pulls/4/add-frameworktest
...
Require frameworktest
2020-06-16 14:48:25 +12:00
Steve Boyd
ffd0a85bd3
Require frameworktest
2020-06-16 12:42:59 +12:00
Maxime Rainville
d6bcc27fb5
Prep installer 4.6 branch. ( #279 )
...
API Bump requirements for recipe-cms to 4.6.x, require frameworktest for asset-admin behat test
2020-05-28 17:11:08 +12:00
Garion Herman
46f687ab5a
Merge branch '4.5' into 4
2020-03-03 15:20:24 +13:00
Robbie Averill
3f9e2618c2
Merge pull request #275 from creative-commoners/pulls/4.5/php-7.4-builds
...
Update Travis config to include PHP 7.4 builds
2020-02-26 16:15:14 +11:00
Garion Herman
6851935652
Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat
2020-02-26 16:45:52 +13:00
Garion Herman
02ca9d772a
Update Travis config to include PHP 7.4 builds
2020-02-26 14:58:21 +13:00
Steve Boyd
6bb01369f5
Merge pull request #270 from creative-commoners/pulls/4.5/remove-source-link-from-readme
...
DOC Update README with valid links to documentation
2020-02-03 17:01:23 +13:00
Steve Boyd
c921509259
Merge pull request #272 from creative-commoners/pulls/4.5/rc-changelog-message
...
DOC Adjust changelog template for RC releases
2020-01-16 13:29:23 +13:00
Garion Herman
966f7343d5
DOC Adjust changelog template for RC releases
2020-01-15 11:44:26 +13:00
Garion Herman
e5840dfbeb
DOC Update README with valid links to documentation
2020-01-06 10:46:35 +13:00
Robbie Averill
03cab91539
Merge pull request #257 from open-sausages/pulls/4/login-forms
...
NEW Add silverstripe/login-forms
2019-12-10 19:52:31 -08:00
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
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
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
