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
Ingo Schommer
a31512afc8
Remove obsolete tutorial theme ( fixes #60 )
2014-02-03 08:11:28 +13:00
Ingo Schommer
1098bdee31
Merge pull request #35 from colymba/3.0-htaccess-fix
...
BUGFIX #34 block vendor access only if outside themes
2013-12-19 16:39:35 -08:00
Ingo Schommer
6ba8838239
Merge pull request #59 from oddnoc/yaml-syntax
...
Correct YAML syntax
2013-12-19 16:17:22 -08:00
Fred Condo
d80afcf5b6
Correct YAML syntax
2013-12-19 15:04:46 -08:00
Ingo Schommer
c7fe54d082
Merge pull request #56 from gordonbanderson/3.1
...
Addition of gpx and kml files to 3.1
2013-11-22 04:32:41 -08:00
Will Rossiter
50dff80399
Merge pull request #55 from jonom/patch-1
...
Removed misleading comments and legacy requirement calls
2013-11-11 21:28:44 -08:00
Gordon Anderson
72e8ae0b87
Addition of geographical file formats (gpx,kml)
2013-11-12 11:39:12 +07:00
Gordon Anderson
68b8b08b2c
Addition of geographic files (gpx, kml)
2013-11-12 11:37:26 +07:00
jonom
e0ce35217c
Removed misleading comments and legacy requirement calls
...
The instructions in the init() function seem to be at odds with the current documentation which suggests that it is preferable to include requirements in PHP code rather than in templates.
Also the requirement calls here are supposedly included so that older themes still work - but how old are we talking? I would assume that these older themes would not be compatible with SS3.1, and the bundled Simple theme does not need these requirement calls in the init() function, making them redundant.
I am guessing that the Installer is primarily used by people just getting started with SilverStripe, so ideally this bundled example Page.php should provide a clear pathway to best practice SS development, rather than supporting out-dated code.
2013-11-11 09:22:36 +07:00
Ingo Schommer
1e729183c8
Show snippets in behat.yml defaults, more dev friendly
...
They should be hidden in CI, but its more of a cleanliness
activity, while snippets are a great time saver for devs
that they shouldn't need to go hunting for via CLI params.
2013-10-21 13:17:43 +02:00
