Daniel Hensby
ab68119de6
Merge pull request #306 from s-en-o/patch-1
...
Fix typo
2021-06-21 15:43:17 +01:00
Seno
9487628f7a
Fix typo
2021-06-21 20:58:29 +12:00
Steve Boyd
26e55e5226
Merge branch '4.8' into 4
2021-05-21 13:45:50 +12:00
Steve Boyd
6bb9c73137
Merge pull request #303 from creative-commoners/pulls/4.8/update-composer-dep
...
MNT Update composer dep for 4.8 release
2021-05-04 16:53:04 +12:00
Maxime Rainville
c90a8d3729
MNT Update composer dep for 4.8 release
2021-05-04 16:35:51 +12:00
Bryn Whyman
221b39bb27
Merge pull request #302 from creative-commoners/pulls/4/login-forms-changelog
...
ENH Add login-forms to changelog template
2021-04-30 12:10:53 +12:00
Steve Boyd
4e1fa260ee
ENH Add login-forms to changelog template
2021-04-30 12:06:27 +12:00
Andre Kiste
69df70b045
Merge pull request #301 from creative-commoners/pulls/4/behat-framework
...
MNT Use admin behat suite instead of framework
2021-04-27 17:35:35 +12:00
Andre Kiste
4e47962d23
Merge pull request #299 from creative-commoners/pulls/4/multitab-frameworktest
...
MNT Bump frameworktest
2021-04-27 17:35:28 +12:00
Steve Boyd
5811293a74
MNT Use admin behat suite instead of framework
2021-04-27 12:44:46 +12:00
Steve Boyd
6961632875
MNT Bump frameworktest
2021-04-27 12:36:01 +12:00
Andre Kiste
37f30ca54e
Merge pull request #297 from creative-commoners/pulls/4/vfsstream
...
MNT Install vfsstream on travis
2021-04-27 12:12:15 +12:00
Steve Boyd
643a3bded3
MNT Install vfsstream on travis
2021-04-23 10:15:48 +12:00
Steve Boyd
821589a018
Merge branch '4.7' into 4
2021-01-28 12:37:14 +13:00
Steve Boyd
0ff05595bb
MNT Use frameworktest 0.3.0 for graphql 4 compatibility ( #295 )
2021-01-28 12:36:24 +13:00
Steve Boyd
9e637f7e07
Merge branch '4.7' into 4
2021-01-27 16:40:03 +13:00
Garion Herman
870ba6f55d
Merge pull request #294 from creative-commoners/pull/4.7/php8
...
MNT Update PHP8
2021-01-27 16:10:16 +13:00
Steve Boyd
3e2629a602
MNT Update PHP8
2021-01-27 11:25:31 +13:00
Steve Boyd
da876a829c
Update build status badge
2021-01-21 16:31:53 +13:00
Steve Boyd
d48994d993
Merge branch '4.7' into 4
2021-01-02 19:40:05 +13:00
Andre Kiste
b594a257ca
Merge pull request #293 from creative-commoners/pulls/4.7/travis-shared
...
MNT Travis shared config
2020-12-21 14:59:00 +13:00
Steve Boyd
7be811a914
MNT Travis shared config
2020-12-15 13:57:29 +13:00
Serge Latyntsev
523372bc15
Merge pull request #292 from creative-commoners/pulls/4.7/fix-deps
...
MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3
2020-11-11 12:21:23 +13:00
Serge Latyntcev
44728e4d9b
MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3
2020-11-11 12:06:43 +13:00
Serge Latyntsev
495b9442d5
Merge pull request #290 from creative-commoners/pulls/4/php-8-builds
...
MNT Add PHP 8 builds
2020-10-23 11:21:40 +13:00
Garion Herman
f955099b6e
MNT Add quotes to Behat config for Symfony 4 compat
2020-10-16 10:02:39 +13:00
Garion Herman
25332311ea
MNT Add $COMPOSER_ARG to dependency installation
2020-10-16 10:02:12 +13:00
Garion Herman
4ea1f7082b
MNT Add PHP 8 builds
2020-10-14 14:31:51 +13:00
Serge Latyntsev
0a57853c60
Merge pull request #289 from creative-commoners/pulls/4/use-changelog-template
...
MNT Tweak changelog template, ensure it is used by Cow
2020-10-13 13:18:18 +13:00
Garion Herman
4ddf1a901e
MNT Tweak changelog template, ensure it is used by Cow
2020-10-09 15:28:58 +13:00
Steve Boyd
1b561f8d80
Update .travis.yml
2020-10-08 10:03:28 +13:00
Manuel Thalmann
6035ccd689
FIX Add redirects to public/
for iis ( #263 )
...
FIX Add redirects to `public/` for iis
2020-09-22 09:31:34 +12:00
Steve Boyd
65b2a72843
Merge branch '4.6' into 4
2020-09-11 09:59:09 +12:00
Steve Boyd
ae68dc4299
Merge pull request #286 from creative-commoners/changelog-template
...
DOCS more information in changelog template
2020-09-11 09:56:20 +12:00
Robbie Averill
1ac80f05a8
Merge pull request #288 from open-sausages/pulls/4/ignow-dot-cow-folder-on-builds
...
BUG Don't include the .cow folders in releases
2020-09-10 09:24:24 -07:00
Maxime Rainville
80d1bdf621
BUG Don't include the .cow folders in releases
2020-09-10 20:23:58 +12:00
brynwhyman
d76bd7d66e
DOCS more information in changelog template
...
I've taken reference from the 4.6.1 change log to use the 'CMS Recipe' table. The other information is taken from the exisitng CWP change log template, see: https://github.com/silverstripe/cwp-recipe-kitchen-sink/blob/2/.changelog.md.twig
2020-09-10 16:50:43 +12:00
Garion Herman
daa0bf08ae
Merge pull request #271 from mandrew/patch-2
...
Set environment type in example
2020-07-27 10:36:02 +12:00
Michael Andrewartha
be7e4c8730
Set environment type in example
...
When running a dev/build for the first time, environment should be set to 'dev' or it won't run.
Setting this in the example gives guidance to someone building a site for the first time (or if it's been ages!)
2020-07-27 10:34:36 +12:00
Steve Boyd
fb77893766
Merge pull request #278 from open-sausages/pulls/4/make-login-forms-core-module
...
BUG Treat login-forms as a core module
2020-07-02 15:48:31 +12:00
Maxime Rainville
27231bf315
BUG Treat login-forms as a core module
2020-06-30 22:14:55 +12:00
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