Commit Graph

1141 Commits

Author SHA1 Message Date
Damian Mooyman
b18d3752b6
Merge pull request #224 from aNickzz/patch-1
Update .gitignore
2018-04-11 10:44:24 +12:00
aNickzz
26f4ef722d
Update .gitignore
Update to match #213
2018-04-10 16:34:40 +09:30
Damian Mooyman
f514ba42b6
Bump recipe plugin dependency 2018-04-05 16:43:07 +12:00
Damian Mooyman
0b71d14fe1
Shift resources into app folder
Add autoloading skeleton and classmap for Page.php / PageController.php
2018-04-05 15:17:03 +12:00
Damian Mooyman
30df0f5e43
Merge remote-tracking branch 'origin/4.1' into 4 2018-02-07 16:44:41 +13:00
Damian Mooyman
b6730c5c9c
Update root composer version for 4.1 branch 2018-02-07 16:43:17 +13:00
Damian Mooyman
7fb7f885f9
Update branch alias 2018-02-07 16:42:25 +13:00
Damian Mooyman
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
Damian Mooyman
81045f46c2 Update development dependencies 2018-02-05 17:15:37 +13:00
Damian Mooyman
a892272cc5 Shift public resources into public folder (#220) 2018-01-12 16:28:15 +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
Christopher Joe
decd8bb446 Merge branch '4.0' of github.com:silverstripe/silverstripe-installer into 4 2017-12-21 13:40:09 +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
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
Damian Mooyman
e06e3c4e83
Update travis.yml 2017-12-19 12:07:44 +13:00
Christopher Joe
ccece4bf1c Feature update composer with --prefer-source flag so that tests are included 2017-12-11 12:27:53 +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
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