Commit Graph

1052 Commits

Author SHA1 Message Date
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
Damian Mooyman 4df28ad121
Added archive config 2017-08-04 16:39:39 +12:00
Sam Minnee 424b1c04dd FIX: Include .env.example and .editorconfig in git export
The “export” downloads of the installer should include these two files
as they are of use to regular developers.

 * .editorconfig encourages the use of our standard code format
 * .env.example is a helper for new developers
2017-07-31 17:36:33 +12:00
Damian Mooyman 980bf834b7 Fix recipe plugin version constraint 2017-07-25 11:13:55 +12:00
Chris Joe dd2ebad5dc Merge pull request #193 from open-sausages/pulls/4.0/recipe-concept
API Convert installer to recipe
2017-07-24 15:13:35 +12:00
Damian Mooyman 2d04b844b7
API Convert installer to recipe 2017-07-24 14:45:14 +12:00
Damian Mooyman d3de9e075f Merge pull request #191 from nfauchelle/patch-1
Update .gitignore
2017-07-07 22:05:01 +12:00
Nick afb523424e Update .gitignore
Add in another module which is managed by composer
2017-07-07 21:02:29 +12:00
Damian Mooyman f9bc5a3fc0 Merge pull request #190 from robbieaverill/patch-1
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 14:46:24 +12:00
Robbie Averill 5284ca65b0 Add editorconfig rule for composer.json to be allowed four spaces 2017-07-06 12:41:02 +12:00
Christopher Joe adca3aea68 Update composer alias 2017-07-06 09:03:09 +12:00
Damian Mooyman 7b68ac77ab Remove obsolete branch-alias 2017-07-03 16:53:55 +12:00
Daniel Hensby 1e7d9f9a15 Merge pull request #185 from robbieaverill/patch-1
FIX Delete Page_Controller from SS4 compat branch
2017-06-27 23:38:47 +01:00
Robbie Averill b8750d9399 FIX Delete Page_Controller from SS4 compat branch
I assume this turned up in a merge-up - having this around breaks breaks things. Should be PageController now.
2017-06-28 10:05:38 +12:00
Daniel Hensby 69441aba44
Merge branch '3' 2017-06-27 13:27:40 +01:00
Daniel Hensby 61bf3af041
Merge branch '3.6' into 3 2017-06-27 13:10:11 +01:00
Daniel Hensby 6eadd1e6a4
Merge tag '3.6.1' into 3.6
Release 3.6.1
2017-06-27 12:56:12 +01:00
Damian Mooyman c9c9cf7d58 Merge pull request #182 from jonom/master
Added errorpage module requirement
2017-06-27 14:30:48 +12:00
Ingo Schommer 333d3a5408 Merge pull request #183 from open-sausages/pulls/4.0/app-object
Remove unneeded globals
2017-06-22 22:58:14 +12:00
Damian Mooyman a74e513a29
Remove unneeded globals 2017-06-20 17:20:00 +12:00
Jono Menz 4f68a04730 Added errorpage module 2017-06-15 16:02:13 -07:00
Daniel Hensby b2db7dc990 Merge pull request #1 from silverstripe-security/patch/3.6.0/SS-2017-017
[SS-2017-017] FIX SVG uploads disabled by default
2017-06-14 14:43:37 +01:00
Chris Joe 5aa694953e Merge pull request #180 from open-sausages/pulls/4.0/remove-dummy
Remove redundant dummy file in assets
2017-06-08 10:49:28 +12:00
Damian Mooyman bf76193e13
Remove redundant dummy file in assets 2017-06-06 11:45:15 +12:00
Daniel Hensby d0de968167
Merge branch '3.6' into 3 2017-05-30 23:50:37 +01:00
Daniel Hensby f589adb0b9
Merge branch '3.5' into 3.6 2017-05-30 23:49:40 +01:00
Daniel Hensby ed34be06c1
Merge tag '3.6.0' into 3.6
Release 3.6.0
2017-05-30 23:49:34 +01:00
Daniel Hensby 1aac471131
Merge branch '3.4' into 3.5 2017-05-30 23:48:39 +01:00
Daniel Hensby f7cb994ab6
Merge tag '3.5.4' into 3.5
Release 3.5.4
2017-05-30 23:48:37 +01:00
Daniel Hensby d07a18a643
Merge tag '3.4.6' into 3.4
Release 3.4.6
2017-05-30 23:47:06 +01:00
Daniel Hensby a32988fc04
Merge remote-tracking branch 'security/3.5.4' into 3.6.0 2017-05-29 01:29:55 +01:00
Daniel Hensby 6475ac9e7d
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:03:15 +01:00