Daniel Hensby
eeec7be996
Merge branch '3'
2015-11-10 10:55:37 +00:00
Daniel Hensby
0f0e4e85a5
Merge branch '3.2' into 3
2015-11-10 10:55:06 +00:00
Daniel Hensby
0572ce7a9a
Merge branch '3.1' into 3.2
2015-11-10 10:54:37 +00:00
Damian Mooyman
df6cbb20f7
Merge pull request #108 from dhensby/pulls/keep-htaccess
...
.gitignore re-organisation
2015-11-10 23:34:11 +13:00
Daniel Hensby
b28f567d30
Remove local IDE cache folders from .gitignore
...
These are environment specific and who's to judge which are worthy and which aren't. Devs should ignore this at an environment level: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
2015-11-10 10:30:16 +00:00
Daniel Hensby
b73a8cc724
Reorganise .gitignore file
2015-11-10 10:30:15 +00:00
Daniel Hensby
04088a13ea
Merge pull request #106 from nickspiel/patch-1
...
Allowing SVGs in the assets directory
2015-10-29 17:32:56 +00:00
Nick Spiel
6346004398
Allowing SVGs in the assets directory
...
This should be combined with a PR I have started on silverstripe-framework https://github.com/silverstripe/silverstripe-framework/pull/4669
2015-10-08 17:35:42 +11:00
Daniel Hensby
5e20faa72a
Merge remote-tracking branch 'silverstripe/3.2' into 3
...
Conflicts:
composer.json
2015-07-20 15:20:19 +01:00
Ingo Schommer
b5a1b91358
Merge remote-tracking branch 'origin/3'
2015-07-16 21:36:29 +12:00
Damian Mooyman
00d26d5f2d
Merge pull request #102 from sminnee/prefer-stable-releases
...
Prefer stable packages while still allowing dev ones. Fixes #100
2015-07-08 11:11:30 +12:00
Sam Minnee
ea72c5def0
Prefer stable packages while still allowing dev ones. Fixes #100
...
Although the original ticket recommended increasing our
minimum-stability, this change gives us the best of both worlds.
- Where stable packages are available and meet the requirements, they
will be used.
- Where stable packages aren’t available or they don’t meet the
dependency requirements, non-stable packages are still allowed.
As part of this I have also tightened up the silverstripe-themes req
version, as “*” is an anti-pattern. The versioning of the theme has
rightly split off from the versioning of the framework; it looks like
3.1.* is what we should expect.
Arguably, we could set the dependency to ~3.1, but in this case I think
it’s fine to be conservative.
2015-07-03 17:34:58 +01:00
Daniel Hensby
e90f8ccd6c
Merge pull request #99 from SpiritLevel/patch-3
...
Update min php version
2015-06-25 13:38:31 +01:00
Daniel Hensby
d73fc01638
Merge pull request #98 from SpiritLevel/patch-2
...
Updated minimum php version
2015-06-25 13:38:13 +01:00
Daniel Hensby
87424a68a9
Merge pull request #97 from SpiritLevel/patch-1
...
DOCS: updated min php version
2015-06-25 13:38:01 +01:00
David Alexander
357ab55b18
Update min php version
2015-06-25 12:44:12 +12:00
David Alexander
dec0b889ad
Updated minimum php version
2015-06-25 12:42:57 +12:00
David Alexander
8b01500530
DOCS: updated min php version
...
updated minimum php version to 5.3.3 in doc block
2015-06-25 12:16:03 +12:00
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
