Commit Graph

1222 Commits

Author SHA1 Message Date
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 c9787b772d
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
#	.cow.json
#	composer.json
2017-11-16 10:47:38 +13: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 46ca9bf59d
Update 4.1 dependencies 2017-10-12 10:17:25 +13:00
Damian Mooyman d6c07093ce
Update branch alias 2017-10-12 10:16:42 +13:00
Damian Mooyman 8fa7c9a27a Update test paths 2017-10-11 17:48:36 +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
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