1c1b277c93
Merge 3.2 into 3.3
2016-04-26 02:04:36 +01:00
71971adc8f
Merge pull request #113 from tractorcow/pulls/4.0/update-assets
...
API Replace old assets/.htaccess with better default
2016-03-22 11:30:50 +00:00
8366d22a19
API Replace old assets/.htaccess with better default
2016-02-26 14:05:55 +13:00
38fa596239
Bumping PHPUnit version
2016-01-25 15:09:58 +00:00
c7327814b5
Alias 3 branch as 3.4
2015-12-23 14:25:24 +13:00
0ef455f2b7
Merge pull request #111 from schellmax/patch-1
...
Added siteconfig installation requirement
2015-12-07 11:38:45 -08:00
d55468b02e
Update README.md
...
Add 'siteconfig' module to list of required modules (as SilverStripe installation gives errors when installing without)
2015-12-06 13:53:28 +01:00
cad28ceff1
tab -> space in editorconfig
2015-11-30 17:19:01 +13:00
eeec7be996
Merge branch '3'
2015-11-10 10:55:37 +00:00
0f0e4e85a5
Merge branch '3.2' into 3
2015-11-10 10:55:06 +00:00
0572ce7a9a
Merge branch '3.1' into 3.2
2015-11-10 10:54:37 +00:00
df6cbb20f7
Merge pull request #108 from dhensby/pulls/keep-htaccess
...
.gitignore re-organisation
2015-11-10 23:34:11 +13:00
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
b73a8cc724
Reorganise .gitignore file
2015-11-10 10:30:15 +00:00
04088a13ea
Merge pull request #106 from nickspiel/patch-1
...
Allowing SVGs in the assets directory
2015-10-29 17:32:56 +00:00
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
5e20faa72a
Merge remote-tracking branch 'silverstripe/3.2' into 3
...
Conflicts:
composer.json
2015-07-20 15:20:19 +01:00
b5a1b91358
Merge remote-tracking branch 'origin/3'
2015-07-16 21:36:29 +12:00
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
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
e90f8ccd6c
Merge pull request #99 from SpiritLevel/patch-3
...
Update min php version
2015-06-25 13:38:31 +01:00
d73fc01638
Merge pull request #98 from SpiritLevel/patch-2
...
Updated minimum php version
2015-06-25 13:38:13 +01:00
87424a68a9
Merge pull request #97 from SpiritLevel/patch-1
...
DOCS: updated min php version
2015-06-25 13:38:01 +01:00
357ab55b18
Update min php version
2015-06-25 12:44:12 +12:00
dec0b889ad
Updated minimum php version
2015-06-25 12:42:57 +12:00
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
24f7cd12be
Merge remote-tracking branch 'origin/3.1' into 3.2
2015-06-19 10:50:26 +12:00
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
f7f92b3226
FIX Invalid comment syntax for web.config
...
This breaks the site on IIS
2015-06-18 11:31:19 +01:00
7b6f62968c
Set reports and siteconfig version dependency
2015-06-18 11:41:59 +12:00
750c02c15c
Alias 3 as 3.3
2015-06-18 11:25:37 +12:00
a9d4bef2a4
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
composer.json
2015-06-02 20:22:11 +12:00
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
d467b16bf2
Ensure BlockUntrustedProxyHeaders is enabled by default
2015-06-02 12:29:23 +12:00
e759ffbcdc
Enforce trusted proxy servers
2015-05-28 10:03:42 +12:00
9f686e0908
BUG Fix broken xml comment
2015-03-09 18:34:17 +13:00
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
ed05c0f509
Merge pull request #71 from silverstripe/pulls/cleanup-root-files
...
Cleanup of root files
2015-02-26 14:32:13 +13:00
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
f04263d5da
Added phpunit to dev dependencies
2015-02-26 14:29:38 +13:00
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
5d5e614b38
Added phpunit to dev dependencies
2015-02-26 14:21:47 +13:00
0ee2493db2
Merge remote-tracking branch 'origin/3.1' into 3
2015-02-20 12:03:02 +13:00
066fd84452
FIX Requests to root dir circumvent index.php
...
fixes #58
2015-02-16 16:36:23 +00:00
c9cb22f648
Merge pull request #81 from guru-digital/3.1
...
Fix #79
2015-02-16 11:34:40 +13:00
9b2b0b5c31
Fix #80
2015-01-20 13:28:05 +13:00
ef770ca42d
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
2015-01-16 10:35:26 +13:00
f834c69435
Merge remote-tracking branch 'origin/3.1' into 3
2015-01-15 18:58:01 +13:00
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
4d8ab05f90
Revert #78
...
Fixes #79
2015-01-12 17:38:50 +13:00
Daniel Hensby
Daniel Hensby
Damian Mooyman
Daniel Hensby
Jono Menz
Matthias Schelling
Peter Thaleikis
Nick Spiel
Ingo Schommer
Sam Minnee
David Alexander
Christopher Pitt
Corey Sewell