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
824bd2cf91
Merge pull request #244 from open-sausages/pulls/4.1/behat-install
...
FIX / Installer tests
2019-01-28 12:11:58 +13:00
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
d0890776e8
Merge branch '4.0' into 4.1
2018-11-21 09:11:04 +01:00
fcd4052a07
Update Slack integration token
2018-11-21 09:10:41 +01:00
dc4b512afb
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
2018-05-28 17:57:27 +12:00
743f9c649e
Merge remote-tracking branch 'origin/3.6' into 4.0
...
# Conflicts:
# .cow.json
# .gitignore
# composer.json
2018-05-28 17:54:29 +12:00
cd6a22c78f
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:47:06 +12:00
ec5093feb6
Merge pull request #3 from silverstripe-security/pulls/4.0/ss-2018-014
...
[SS-2018-014] Remove jar, css and js from file extension whitelist
2018-05-14 17:20:31 +12:00
be96858e85
[SS-2018-014] Remove jar, dotm, potm, xltm from file extension whitelist, hard-code CSS and JS for TinyMCE support
2018-05-14 17:20:03 +12:00
c6ff9b1245
Merge pull request #2 from silverstripe-security/pulls/4.0/ss-2018-012
...
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:36 +12:00
f9c03fa623
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:12 +12:00
9d8193d19c
Merge pull request #225 from open-sausages/pulls/4.0/selenium-upgrade
...
Update selenium to chromedriver
2018-04-13 10:50:50 +12:00
d678bd76f9
Update selenium to chromedriver
2018-04-13 09:30:04 +12:00
b18d3752b6
Merge pull request #224 from aNickzz/patch-1
...
Update .gitignore
2018-04-11 10:44:24 +12:00
26f4ef722d
Update .gitignore
...
Update to match #213
2018-04-10 16:34:40 +09:30
b6730c5c9c
Update root composer version for 4.1 branch
2018-02-07 16:43:17 +13:00
7fb7f885f9
Update branch alias
2018-02-07 16:42:25 +13:00
b060892992
BUG Fix routing error for public assets
...
Port of https://github.com/silverstripe/recipe-core/pull/14 to installer
2018-02-07 13:57:17 +13:00
81045f46c2
Update development dependencies
2018-02-05 17:15:37 +13:00
a892272cc5
Shift public resources into public folder ( #220 )
2018-01-12 16:28:15 +13:00
9ca6c3a89b
Merge pull request #219 from open-sausages/pulls/4.0/no-dev-should-be-needed-here
...
Enhancement add test for a `--no-dev` build
2018-01-08 13:44:37 +13:00
4d60f01d2d
Enhancement add test for a `--no-dev` build
2017-12-22 15:27:43 +13:00
decd8bb446
Merge branch '4.0' of github.com:silverstripe/silverstripe-installer into 4
2017-12-21 13:40:09 +13:00
bb1944f64d
Merge pull request #218 from open-sausages/pulls/4.0/its-a-travis-tee-with-behat
...
FIX travis OS build version so that behat will function
2017-12-21 12:02:27 +13:00
dd75e68f86
FIX travis OS build version so that behat will function
2017-12-20 21:40:27 +13:00
1f67410858
Merge pull request #214 from open-sausages/pulls/4.1/composer-does-prefer-dist
...
Feature update composer with --prefer-source flag so that tests are included
2017-12-19 14:28:49 +13:00
e06e3c4e83
Update travis.yml
2017-12-19 12:07:44 +13:00
ccece4bf1c
Feature update composer with --prefer-source flag so that tests are included
2017-12-11 12:27:53 +13:00
45b3cb6a43
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:18:51 +13:00
75984719db
Ignore modules
2017-12-06 16:22:20 +13:00
68fdb0684e
Add .cow.json to 3.5 branch
2017-12-06 15:42:10 +13:00
c30abae60c
Merge pull request #213 from aNickzz/patch-2
...
Ignore (almost) everything in the assets folder
2017-12-01 14:30:09 +13:00
2d90647410
Update .gitignore
...
Uploading files directly through the Files LeftAndMain drops them directly into the assets folder by default. This will help prevent those files accidentally ending up in git.
2017-11-30 22:03:34 +10:30
0bf0f44403
Merge pull request #210 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:59:51 +13:00
b1875ea1af
Loosen PHPUnit constraints
2017-11-17 11:37:41 +00:00
c9787b772d
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# .cow.json
# composer.json
2017-11-16 10:47:38 +13:00
19e8849eaf
Merge pull request #209 from martinduparc/patch-1
...
Update README.md
2017-11-10 15:53:08 +13:00
d3fc0d4571
Merge pull request #208 from dhensby/pulls/4.0/this-is-ss4
...
DOCS update comments for supported versions
2017-11-10 15:52:12 +13:00
76965d53aa
Update README.md
...
Fixed links
2017-11-07 10:21:33 -05:00
ee92941f87
DOCS update comments for supported versions
2017-11-07 12:58:43 +00:00
d6c528b8bc
Fix test paths
2017-10-25 16:20:00 +13:00
8dc64d17d0
Merge pull request #204 from open-sausages/pulls/4.0/update-plugin
...
Update recipe-plugin to 1.0
2017-10-25 11:21:34 +13:00
35a17cc9c0
Update recipe-plugin to 1.0
2017-10-25 11:14:32 +13:00
46ca9bf59d
Update 4.1 dependencies
2017-10-12 10:17:25 +13:00
d6c07093ce
Update branch alias
2017-10-12 10:16:42 +13:00
8fa7c9a27a
Update test paths
2017-10-11 17:48:36 +13:00
ed0e2297a4
Remove obsolete branch-alias
2017-10-11 17:31:50 +13:00
33aa9ab719
Merge pull request #203 from open-sausages/pulls/4.0/better-beta4-upgrade
...
Move files to recipe-core
2017-10-10 16:59:22 +13:00
64211f1b1d
Move files to recipe-core
2017-10-10 15:41:25 +13:00
Robbie Averill
Serge Latyntsev
Robbie Averill
Damian Mooyman
aNickzz
Christopher Joe
Daniel Hensby
Martin D
Daniel Hensby
Chris Joe