Commit Graph

387 Commits

Author SHA1 Message Date
Daniel Hensby
f55cfcff49 Adding compose alias 2017-02-01 12:04:15 +00:00
Ingo Schommer
9c0c049b64 Merge remote-tracking branch 'origin/2.4' into post-2.4
Conflicts:
	composer.json
2013-08-07 21:54:34 +02:00
Ingo Schommer
69889ec786 Updated SS logo sample file 2013-08-07 20:36:28 +02:00
Sam Minnee
77ef39fedd FIX: Put self.version in composer dependencies.
Now that https://github.com/composer/composer/pull/1883 is in Composer, self.version
will work as a requirement for framework & cms.  This will simplify the release
process a great deal.
2013-08-07 14:40:34 +02:00
Ingo Schommer
c76cce5e4a Merge pull request #47 from hafriedlander/fix/flush_24
FIX Include flushtoken when install redirects to successfullyinstalled
2013-08-03 04:56:38 -07:00
Hamish Friedlander
f27fb07e4d FIX Include flushtoken when install redirects to successfullyinstalled 2013-08-02 10:53:35 +12:00
Ingo Schommer
d640f826d0 Removed @stable markers from 2.4 dev branch 2013-03-27 16:00:14 +01:00
Ingo Schommer
9d73194e22 Restored custom sapphire installer-path in composer.json
Most likely a merge error...
2013-03-01 12:08:14 +01:00
Ingo Schommer
0e0ce2e1e3 API Defaulting composer core dependencies to to @stable
Required to ensure correct operation of
"composer create-project silverstripe/installer my-path 2.4.10"
(checkout with tags).
2013-02-20 11:04:04 +01:00
Ingo Schommer
8fca40e104 Merge remote-tracking branch 'origin/2.4' into post-2.4
Conflicts:
	build.xml
	install.php
2013-02-20 10:44:07 +01:00
Ingo Schommer
23523175f3 API Filter composer files in IIS and Apache rules (fixes #8011)
They can expose version information, so shouldn't be accessible
through the web. The better solution of course is to move
to a public/ subfolder application structure.
2013-02-15 19:13:41 +01:00
Ingo Schommer
52590b9019 Removed @stable tags from release branch
Same as 3.0.x-dev, they're only relevant for tags,
not for branches.
2012-12-07 00:42:44 +01:00
Ingo Schommer
738d9dbff6 Added phing support 2012-12-05 11:58:43 +01:00
Ingo Schommer
736856fbd7 Removed composer.lock 2012-12-05 01:11:21 +01:00
Ingo Schommer
08c349574b Added composer.lock for 2.4.9 2012-12-05 01:11:21 +01:00
Ingo Schommer
9c254cd72b Added @stable markers to composer.json 2012-12-05 01:10:13 +01:00
Ingo Schommer
2ea9f262e8 Support for composer-created themes dir structure
Due to git limitations, we can't check out the blackcandy
"parent" theme into themes/blackcandy/ directly, since that
would require sharing paths with git repositories of other themes.
2012-12-04 17:21:29 +01:00
Sam Minnee
c80265981e Relaxed composer version requirements so that stable releases can be created.
Note that once sapphire, cms, and framework actually provide a stable version, '@stable' should put onto the end of the relevant require clauses.
2012-12-04 11:17:55 +13:00
Ingo Schommer
66914a81f5 Merge remote-tracking branch 'origin/2.4' into post-2.4
Conflicts:
	composer.json
2012-11-28 15:48:23 +01:00
Ingo Schommer
9fa3c52169 Exclude vendor/ folder from default phpunit run
Once we start placing SS modules in vendor/,
we need to find a smarter solution...
2012-11-28 15:47:28 +01:00
Ingo Schommer
a2501ad209 Fixed bootstrap.php path in phpunit.xml.dist 2012-11-09 11:48:34 +01:00
Ingo Schommer
f8e860fac1 Removed .mergesources.yml, not used since the dark SVN days 2012-11-08 14:03:14 +01:00
Ingo Schommer
157a275855 Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-08 14:02:28 +01:00
Ingo Schommer
6ca54bc437 Merge remote-tracking branch 'origin/2.4' into post-2.4
Conflicts:
	build.xml
2012-11-02 18:37:49 +01:00
Ingo Schommer
5779b89382 Fallback CSS includes for theme subfolder in install.php
Themes can't "share" the "themes/" toplevel folder if checked out directly via git, or indirectly via composer. That's a problem for themes like blackcandy, which have nested subthemes. The theme autoloading already handles this transparently, but we need to adjust the installer which is also using blackcandy.
2012-11-01 16:59:05 +01:00
Ingo Schommer
5f3b70f6d3 Added composer.json
Once we've got the packagist.org listings sorted out,
we should no longer require the custom vcs entries.
2012-11-01 16:41:38 +01:00
Ingo Schommer
0318d35ac1 Reverted setting build artifact to parent directory, deleting olds
It goes against the directory isolation in build environments,
which shouldn't produce state outside of their own folder
(e.g. in terms of TeamCity build artifacts).

Removing existing files, to avoid double archiving
on subsequent runs.
2012-10-30 18:12:51 +01:00
Ingo Schommer
cceee896b6 Release script feedback 2012-10-30 17:10:05 +01:00
Ingo Schommer
570744f658 phing upload-release (modified copy from master) 2012-10-16 11:18:22 +02:00
Ingo Schommer
039a37230f MINOR Fixed phpunit bootstrap relative path 2012-05-29 15:57:55 +02:00
Ingo Schommer
b7c8737de6 SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 15:05:22 +02:00
Ingo Schommer
5b677c6ba3 SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 15:05:00 +02:00
Ingo Schommer
1b90766e8b MINOR Replaced INSTALL, UPGRADING and ChangeLog files with a more consistent README 2011-10-19 09:12:03 +02:00
Ingo Schommer
0816c3b07f MINOR Replaced INSTALL, UPGRADING and ChangeLog files with a more consistent README 2011-10-19 09:11:52 +02:00
Ingo Schommer
4adccf7ca7 MINOR Excluding tests from release pacakges 2011-10-18 22:59:26 +02:00
Ingo Schommer
9574fe42ed MINOR Excluding tests from release pacakges 2011-10-18 22:59:16 +02:00
Ingo Schommer
9b4ed2c8b6 MINOR Excluding docs from release, as they bring the package size from 5mb to 8mb 2011-10-18 16:43:35 +02:00
Ingo Schommer
b90376869a MINOR Excluding docs from release, as they bring the package size from 5mb to 8mb 2011-10-18 16:43:27 +02:00
Ingo Schommer
c5eaff4a16 MINOR gitignore 2011-10-18 16:35:00 +02:00
Ingo Schommer
5fbfb0797d MINOR gitignore 2011-10-18 16:34:07 +02:00
Ingo Schommer
624c6d29c8 MINOR Creating release archives in parent folder by default, to avoid archiving the archive by accident 2011-10-18 16:33:08 +02:00
Ingo Schommer
1bad9b3023 MINOR gitignore 2011-10-18 16:32:46 +02:00
Ingo Schommer
0337650f35 MINOR Creating release archives in parent folder by default, to avoid archiving the archive by accident 2011-10-18 16:32:33 +02:00
Ingo Schommer
3e694be734 MINOR Correct release archive name 2011-10-18 15:34:02 +02:00
Ingo Schommer
76b3c00ead MINOR Moving theme dirs when release packaging 2011-10-18 15:34:02 +02:00
Ingo Schommer
fb2cde19e9 MINOR Correct release archive name 2011-10-18 15:33:48 +02:00
Ingo Schommer
0ea71af868 MINOR Moving theme dirs when release packaging 2011-10-18 15:33:48 +02:00
Ingo Schommer
0bab1907d1 MINOR Merged back /tools 2011-10-18 14:56:17 +02:00
Ingo Schommer
a04fdf4974 MINOR Merged back /tools 2011-10-18 14:55:56 +02:00
sharvey
54e8eefef2 BUGFIX #6321 Whitelisted file extensions with uppercase extensions blocked by case sensitive FilesMatch directive in assets/.htaccess (does not affect IIS 7.x which uses web.config)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@115816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00