e650c43da7
Merge branch '4.1' into 4.2
2019-04-21 10:30:58 +12:00
1b31ffa28a
Revert "Update development dependencies"
...
This reverts commit 1a55336552
2019-02-19 05:25:35 +07:00
1a55336552
Update development dependencies
2019-02-19 10:53:35 +13:00
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
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
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
e279f35abf
TravisCI / fix silverstripe/posgresql version
2019-02-01 16:05:37 +13:00
127c62a0c9
Merge branch '4.1' into 4.2
2019-01-28 14:09:19 +13: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
84aaa17461
Merge branch '4.1' into 4.2
2018-11-21 09:11:20 +01: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
986a2f951a
Update composer.json version constraint
2018-08-04 08:59:12 +02:00
539b58d7aa
Merge tag '4.2.1' into 4.2
...
Release 4.2.1
2018-07-30 17:12:06 +01:00
0307496292
Update development dependencies
2018-07-30 15:23:32 +00:00
6ad3a067c3
Merge tag '4.2.0' into 4.2
...
Release 4.2.0
2018-07-30 11:14:13 +01:00
b1cd5afe28
Update development dependencies
2018-07-24 19:22:22 +00:00
7d838b0631
Update composer dep
2018-07-24 16:47:35 +01:00
0d5daf5658
Update development dependencies
2018-06-15 15:52:39 +12:00
6a7bd05a1d
Remove obsolete branch-alias
2018-06-15 15:30:04 +12:00
97ef910478
Update installer to use new recipe versioning
2018-06-14 13:29:03 +12:00
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
a9e2af6863
FIX Remove incorrect classmap for Page and PageController
...
These files to not always exist in this path, so this autoload definition is misleading
2018-06-01 15:54:11 +12:00
9a407320ed
Merge branch '4.1' into 4
2018-05-28 18:32:48 +12: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
7cfaeccfb1
Remove empty psr-4
2018-04-13 10:15:04 +12:00
d678bd76f9
Update selenium to chromedriver
2018-04-13 09:30:04 +12:00
39f0af225f
Merge pull request #223 from open-sausages/pulls/4/appy-days
...
Shift resources into app folder
2018-04-11 15:25:06 +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
f514ba42b6
Bump recipe plugin dependency
2018-04-05 16:43:07 +12:00
0b71d14fe1
Shift resources into app folder
...
Add autoloading skeleton and classmap for Page.php / PageController.php
2018-04-05 15:17:03 +12:00
30df0f5e43
Merge remote-tracking branch 'origin/4.1' into 4
2018-02-07 16:44:41 +13:00
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
Robbie Averill
Aaron Carlino
Ingo Schommer
Robbie Averill
Serge Latyntcev
Dan Hensby
root
Damian Mooyman
aNickzz
Christopher Joe