Robbie Averill
fcd4052a07
Update Slack integration token
2018-11-21 09:10:41 +01:00
Robbie Averill
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
Robbie Averill
cd6a22c78f
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:47:06 +12:00
Robbie Averill
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
Robbie Averill
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
Robbie Averill
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
Damian Mooyman
f9c03fa623
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:12 +12:00
Robbie Averill
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
Damian Mooyman
d678bd76f9
Update selenium to chromedriver
2018-04-13 09:30:04 +12:00
Damian Mooyman
81045f46c2
Update development dependencies
2018-02-05 17:15:37 +13:00
Damian Mooyman
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
Christopher Joe
4d60f01d2d
Enhancement add test for a --no-dev build
2017-12-22 15:27:43 +13:00
Damian Mooyman
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
Christopher Joe
dd75e68f86
FIX travis OS build version so that behat will function
2017-12-20 21:40:27 +13:00
Damian Mooyman
45b3cb6a43
Merge remote-tracking branch 'origin/3.5' into 3.6
2017-12-06 17:18:51 +13:00
Damian Mooyman
75984719db
Ignore modules
2017-12-06 16:22:20 +13:00
Damian Mooyman
68fdb0684e
Add .cow.json to 3.5 branch
2017-12-06 15:42:10 +13:00
Damian Mooyman
c30abae60c
Merge pull request #213 from aNickzz/patch-2
...
Ignore (almost) everything in the assets folder
2017-12-01 14:30:09 +13:00
aNickzz
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
Damian Mooyman
0bf0f44403
Merge pull request #210 from dhensby/pulls/3.5/phpunit-loosen-constraint
...
Loosen PHPUnit constraints
2017-11-20 13:59:51 +13:00
Daniel Hensby
b1875ea1af
Loosen PHPUnit constraints
2017-11-17 11:37:41 +00:00
Damian Mooyman
19e8849eaf
Merge pull request #209 from martinduparc/patch-1
...
Update README.md
2017-11-10 15:53:08 +13:00
Damian Mooyman
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
Martin D
76965d53aa
Update README.md
...
Fixed links
2017-11-07 10:21:33 -05:00
Daniel Hensby
ee92941f87
DOCS update comments for supported versions
2017-11-07 12:58:43 +00:00
Damian Mooyman
d6c528b8bc
Fix test paths
2017-10-25 16:20:00 +13:00
Chris Joe
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
Damian Mooyman
35a17cc9c0
Update recipe-plugin to 1.0
2017-10-25 11:14:32 +13:00
Damian Mooyman
ed0e2297a4
Remove obsolete branch-alias
2017-10-11 17:31:50 +13:00
Chris Joe
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
Damian Mooyman
64211f1b1d
Move files to recipe-core
2017-10-10 15:41:25 +13:00
Ingo Schommer
e32b1bbd07
Merge pull request #202 from open-sausages/pulls/4/request-uri
...
Use index.php for serving content
2017-10-09 10:41:39 +01:00
Ingo Schommer
c369cd2358
Move index.php to recipe-core
...
It needs to work with installer-less projects as well
2017-10-05 08:18:51 +01:00
Ingo Schommer
bce724ca76
Use index.php for serving content
...
Removes main.php reliance. Paves the way for
serving SilverStripe from a public/ subfolder in the base path.
This requires an index.php file in the webroot,
since you can't set a RewriteRule to a path outside of the webroot
(e.g. "public/.htaccess" pointing to "../vendor/silverstripe/framework/main.php").
2017-10-05 08:09:45 +01:00
Damian Mooyman
edf6f4c1d3
Merge pull request #201 from open-sausages/pulls/4/gitignore
...
Update gitignore for vendor module move
2017-10-05 09:00:31 +13:00
Ingo Schommer
ec36574665
Update gitignore for vendor module move
...
See https://github.com/silverstripe/silverstripe-framework/issues/7405s
2017-10-04 09:54:57 +01:00
Damian Mooyman
67ed44823e
Merge pull request #200 from open-sausages/pulls/4/vendorise-me-baby
...
Support custom main.php location
2017-10-03 16:11:06 +13:00
Damian Mooyman
8ab058a3fd
Update unit test paths and asset .htaccess
2017-10-03 15:09:02 +13:00
Ingo Schommer
96045afc65
Adjust phpunit path to framework
2017-10-03 05:09:43 +13:00
Ingo Schommer
7de2e07139
Fix main.php path in install.php
2017-10-03 03:19:23 +13:00
Ingo Schommer
2d53abd2c2
Removed stylesheet from frameworkmissing file
...
If the framework is missing, there's no point referencing a stylesheet from it...
2017-10-03 03:18:51 +13:00
Ingo Schommer
e88f7654da
Fix main.php path
2017-10-03 03:18:51 +13:00
Ingo Schommer
f22d9b3735
Fix main.php path
2017-10-03 01:44:14 +13:00
Ingo Schommer
a1384f67b7
Simplify serving static assets in index.php
...
No need to perform custom file reading.
See https://github.com/laravel/laravel/blob/master/server.php#L18
and http://php.net/manual/en/features.commandline.webserver.php
2017-10-03 01:44:06 +13:00
Chris Joe
41b87ab2d5
Merge pull request #198 from open-sausages/pulls/4.0/adjust-timeout
...
Adjust behat timeout for asset-admin tests
2017-09-29 12:03:02 +13:00
Damian Mooyman
0cf5924277
Update .travis.yml
2017-09-29 10:03:30 +13:00
Damian Mooyman
2c81adf3e6
Adjust behat timeout for asset-admin tests
2017-09-29 09:45:55 +13:00
Chris Joe
9e6114c151
Merge pull request #195 from sminnee/gimme-more-files
...
FIX: Include .env.example and .editorconfig in git export
2017-09-06 15:24:55 +12:00
Chris Joe
40c6fcf18f
Merge pull request #197 from open-sausages/pulls/4.0/recipe-info
...
Provide information related to recipe
2017-08-14 23:05:50 +12:00
Saophalkun Ponlu
26cd654dbb
Provide information related to recipe
2017-08-14 17:15:42 +12:00
