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

873 Commits

Author SHA1 Message Date
Sam Minnée 171a543d73 Make installer copyright note conform to others 
Make the notice here match those on other modules.

See https://github.com/silverstripe/silverstripe-framework/pull/5610
 2016-05-30 14:36:08 +12:00
Damian Mooyman ea4333fec6 Merge 3 into master 2016-05-18 17:30:22 +12:00
Hamish Friedlander bede06a1aa Merge pull request #124 from open-sausages/pulls/3/http-default-code 
API Enable friendly error HTTP code by default for new projects
 2016-05-18 15:37:54 +12:00
Damian Mooyman c55777c9af API Enable friendly error HTTP code by default for new projects 2016-05-18 15:17:43 +12:00
Daniel Hensby 00016f6378 Merge pull request #122 from axyr/update-php-version 
update required php version
 2016-05-14 11:20:46 +01:00
Sam Minnee 23cf0b8e8d Merge branch '3.3' into 3 2016-05-13 16:53:04 +12:00
Sam Minnee 9c42bb7b4d Merge remote-tracking branch 'origin/3.2' into 3.3 2016-05-13 16:50:35 +12:00
Sam Minnee ff589cb4e3 Merge remote-tracking branch 'origin/3.1' into 3.2 2016-05-13 16:50:09 +12:00
Martijn van Nieuwenhoven 3687ef8cb3 update required php version 
as in framework and cms
 2016-05-13 00:01:34 +02:00
Damian Mooyman 639092d333 Merge 3.1 into master 
# Conflicts:
#	composer.json
 2016-05-11 17:54:40 +12:00
Damian Mooyman 2aa2d9a7f0 Merge pull request #121 from sminnee/revert-ext-tidy 
Revert "Require php-tidy for dev dependencies (#87)"
 2016-05-11 17:46:13 +12:00
Sam Minnee 70be958cee Revert "Require php-tidy for dev dependencies (#87)" 
This reverts commit bb24a9192e.

Fixes https://github.com/silverstripe/silverstripe-installer/issues/120
 2016-05-11 17:35:51 +12:00
Damian Mooyman 1a5652d81c Merge 3 into master 
# Conflicts:
#	composer.json
 2016-05-11 14:33:39 +12:00
Damian Mooyman 4920218155 Merge 3.3 into 3 2016-05-11 14:02:09 +12:00
Damian Mooyman 0a3570808a Merge 3.2 into 3.3 2016-05-11 13:59:52 +12:00
Damian Mooyman 4ba8fda822 Merge 3.1 into 3.2 
# Conflicts:
#	composer.json
 2016-05-11 13:55:23 +12:00
Daniel Hensby bb24a9192e Require php-tidy for dev dependencies (#87) 2016-05-08 22:05:19 +12:00
Daniel Hensby cc7a2aeb1e FIX Add framework/admin tests (#118) 2016-05-06 07:43:27 +12:00
Ingo Schommer f52cfeef87 Merge pull request #117 from open-sausages/pulls/4.0/include-asset-admin 
API Include asset-admin module in installer
 2016-05-04 19:36:29 +12:00
Damian Mooyman 8d2cc913e9 API Include asset-admin module in installer 
Requires https://github.com/silverstripe/silverstripe-asset-admin/pull/132
 2016-05-03 15:47:17 +12:00
Daniel Hensby 3c8fc9177c
Merge branch '3' 2016-04-26 02:40:35 +01:00
Daniel Hensby 8e7d591075
Merge branch '3.3' into 3 2016-04-26 02:05:25 +01:00
Daniel Hensby 1c1b277c93
Merge 3.2 into 3.3 2016-04-26 02:04:36 +01:00
Daniel Hensby 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
Damian Mooyman 8366d22a19 API Replace old assets/.htaccess with better default 2016-02-26 14:05:55 +13:00
Daniel Hensby 38fa596239 Bumping PHPUnit version 2016-01-25 15:09:58 +00:00
Damian Mooyman c7327814b5 Alias 3 branch as 3.4 2015-12-23 14:25:24 +13:00
Jono Menz 0ef455f2b7 Merge pull request #111 from schellmax/patch-1 
Added siteconfig installation requirement
 2015-12-07 11:38:45 -08:00
Matthias Schelling 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
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