tonyair
/
silverstripe-installer
mirror of https://github.com/silverstripe/silverstripe-installer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
926 Commits 30 Branches 372 Tags 1.8 MiB
Commit Graph

926 Commits

Author SHA1 Message Date
Damian Mooyman 24f7cd12be Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:50:26 +12:00
Damian Mooyman ae3c7ebcaf Merge pull request #94 from dhensby/pulls/iis-fix 
FIX Invalid comment syntax for web.config
 2015-06-19 10:21:59 +12:00
Daniel Hensby f7f92b3226 FIX Invalid comment syntax for web.config 
This breaks the site on IIS
 2015-06-18 11:31:19 +01:00
Damian Mooyman 7b6f62968c Set reports and siteconfig version dependency 2015-06-18 11:41:59 +12:00
Damian Mooyman 750c02c15c Alias 3 as 3.3 2015-06-18 11:25:37 +12:00
Damian Mooyman a9d4bef2a4 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	composer.json
 2015-06-02 20:22:11 +12:00
Sam Minnée d92419ec10 Merge pull request #92 from tractorcow/pulls/3.1.14/fix-api 
Ensure BlockUntrustedProxyHeaders is enabled by default
 2015-06-02 12:42:56 +12:00
Damian Mooyman d467b16bf2 Ensure BlockUntrustedProxyHeaders is enabled by default 2015-06-02 12:29:23 +12:00
Damian Mooyman e759ffbcdc Enforce trusted proxy servers 2015-05-28 10:03:42 +12:00
Damian Mooyman 9f686e0908 BUG Fix broken xml comment 2015-03-09 18:34:17 +13:00
Damian Mooyman 38ee2f9a1d Merge pull request #86 from assertchris/feature/3.1/add-phpunit-to-dev-dependencies 
Added phpunit to dev dependencies
 2015-02-26 14:32:49 +13:00
Damian Mooyman ed05c0f509 Merge pull request #71 from silverstripe/pulls/cleanup-root-files 
Cleanup of root files
 2015-02-26 14:32:13 +13:00
Damian Mooyman 4b2117ab8d Merge pull request #82 from dhensby/pulls/fix-58 
FIX Requests to root dir circumvent index.php
 2015-02-26 14:29:45 +13:00
Christopher Pitt f04263d5da Added phpunit to dev dependencies 2015-02-26 14:29:38 +13:00
Damian Mooyman 8f58045f09 Merge pull request #84 from assertchris/feature/3/add-phpunit-to-dev-dependencies 
Added phpunit to dev dependencies
 2015-02-26 14:26:31 +13:00
Christopher Pitt 5d5e614b38 Added phpunit to dev dependencies 2015-02-26 14:21:47 +13:00
Damian Mooyman 0ee2493db2 Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 12:03:02 +13:00
Daniel Hensby 066fd84452 FIX Requests to root dir circumvent index.php 
fixes #58
 2015-02-16 16:36:23 +00:00
Damian Mooyman c9cb22f648 Merge pull request #81 from guru-digital/3.1 
Fix #79
 2015-02-16 11:34:40 +13:00
Corey Sewell 9b2b0b5c31 Fix #80 2015-01-20 13:28:05 +13:00
Damian Mooyman ef770ca42d Merge remote-tracking branch 'origin/3' 
Conflicts:
	composer.json
 2015-01-16 10:35:26 +13:00
Damian Mooyman f834c69435 Merge remote-tracking branch 'origin/3.1' into 3 2015-01-15 18:58:01 +13:00
Damian Mooyman 2742f63c79 Merge pull request #77 from JorisDebonnet/patch-1 
.htaccess: support for MS Office template / macro files
 2015-01-15 14:32:50 +13:00
Damian Mooyman 4d8ab05f90 Revert #78 
Fixes #79
 2015-01-12 17:38:50 +13:00
Daniel Hensby a7f82d2fee Merge pull request #78 from cjsewell/patch-1 
Add rewrite rule to enable Basic auithentication workaround for PHP running in CGI mode
 2014-12-08 18:44:33 +00:00
Corey Sewell b2ee11a7be Add rewrite rule to enable Basic auithentication workaround for PHP running in CGI mode 
See https://github.com/silverstripe/silverstripe-framework/pull/3689
 2014-12-09 07:36:46 +13:00
Will Rossiter 3a4f346a61 Merge pull request #76 from dhensby/3.1 
Adding .editorconfig
 2014-12-05 15:22:23 +13:00
JorisDebonnet 3bc40bd2bf .htaccess: support for MS Office template / macro files 
Fixes silverstripe-framework's issue 3692 (..no idea how to link that!).
 2014-12-04 21:57:08 +01:00
Daniel Hensby 4b0911d1b5 Adding .editorconfig 2014-12-04 15:49:54 +00:00
Damian Mooyman 133e9d0332 Fix alias for 3.2 2014-11-20 17:24:51 +13:00
Damian Mooyman 46fb50b4be Update branch alias for master 2014-11-20 17:19:24 +13:00
Damian Mooyman d1a090610e Update branch alias for 3 2014-11-20 17:19:04 +13:00
Damian Mooyman c77022e260 Merge pull request #73 from chillu/pulls/htaccess-doc 
Improve .htaccess commenting
 2014-11-19 08:51:18 +13:00
Ingo Schommer e1649cf74f Improve .htaccess commenting 
Done alongside improvements of the execution-pipeline.md docs.
Installer comment taken from d5723f7b0e
 2014-11-19 08:31:04 +13:00
Ingo Schommer 70f2e90efb Removed obsolete phpunit.teamcity.*.xml files 
Builds are no longer run on TeamCity for these.
 2014-09-23 18:24:47 +12:00
Ingo Schommer d2f639b1af Info about utility files, note about their removal 2014-09-23 18:22:46 +12:00
Ingo Schommer 787fc2aacf Remove Makefile, running tests through phpunit is established enough now 2014-09-23 18:16:27 +12:00
Sean Harvey c23348d5d1 Merge pull request #66 from simonwelsh/stupid-htaccess 
Don't block rewriting .php URLs
 2014-08-18 10:54:04 +12:00
Sean Harvey 40ebbb1ae0 Merge pull request #68 from dhensby/patch-1 
DOCS assets/.htaccess
 2014-08-18 10:17:40 +12:00
Daniel Hensby 69761d0949 DOCS assets/.htaccess 
Updating the docs to reflect the actual rules
 2014-08-17 15:38:39 +01:00
Simon Welsh 91d79860bd Don't block rewriting .php URLs 2014-08-16 22:01:27 +10:00
Damian Mooyman 4e6e8f1dbc Merge pull request #65 from JLeft/patch-1 
Corrected capitalisation of 'GitHub'
 2014-06-18 08:35:16 +12:00
JLeft bf642b09e0 Capitalisation of 'GitHub' 2014-06-17 13:17:05 +01:00
Ingo Schommer 0c9539942f Revert accidental commit to behat.yml (setting a specific base URL) 2014-06-16 08:51:41 +12:00
Ingo Schommer f7c23b9007 Merge remote-tracking branch 'origin/3.1' 2014-06-16 08:44:42 +12:00
Ingo Schommer 10dc891fee Removed goutte driver from Behat, not supported 
Was added way back with the original behat.yml, and then forgotten about
 2014-06-16 08:41:57 +12:00
Damian Mooyman b3acbcfa5f Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 08:52:34 +13:00
Ingo Schommer 3b3cda59d2 Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:38:26 +13:00
colymba aa07a0edd8 BUGFIX #34 Only block root vendor folder 
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.

Move to RewriteRules
 2014-02-18 22:37:49 +13:00
Sean Harvey 16c9312f29 Merge pull request #61 from silverstripe/pulls/remove-tutorial 
Remove tutorial theme
 2014-02-02 14:31:29 -08:00