Commit Graph

369 Commits

Author SHA1 Message Date
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
sharvey
d39cefddfd ENHANCEMENT Installer now checks for magic_quotes_gpc being turned off. This option turned on can cause issues with serialized data in cookies when unserializing (from r115264)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@115265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey
f84a15de87 BUGFIX Fixed conflicting check of mysite directory with recommendation of removal of _config.php in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@115169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey
51514c06d5 BUGFIX Installer should check asp_tags is disabled, as it can cause issues with SilverStripe
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@114823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey
6cb667c530 ENHANCEMENT PHP requirements in installer now check for date.timezone correctly being set for PHP 5.3.0+. This option is *required* to be set starting with 5.3.0 and will cause an error during installation if not
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@114467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey
e0dbb69637 MINOR Installer now writes "SetEnv HTTP_MOD_REWRITE On" in .htaccess to be consistent with the original .htaccess file that comes with the phpinstaller project
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113984 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
6c3e5ca132 MINOR Fixed undefined variable $groupList
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113967 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
8c315023b2 MINOR Re-use variable instead of check temp folder again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
014e2edded ENHANCEMENT Split temp directory check and writability into two checks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
9d39d17859 BUGFIX Installer now checks temporary directory is writable, in addition to it being available.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
0e1f485dc1 ENHANCEMENT #6206 Installer additional checks for module existence by checking _config.php exists, in addition to the directory
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sminnee
a0f92459eb BUGFIX #6197 simon_w: Fixed Internal Server Error when accessing assets on Apache without mod_php.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
wrossiter
805ceb7005 MINOR: reverted previous commit. Note to self dont work on sunday nights, sigh
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
wrossiter
218cfffe21 BUGFIX: check DisplaySignatures on the thread rather than post. #5409
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
fba76de203 ENHANCEMENT Installer now has a fallback for mod_rewrite detection by setting an environment variable in .htaccess when "<IfModule mod_rewrite.c>" directive is satisfied
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112973 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey
84cbba8bed MINOR Clearer message when rewrite doesn't work during installation
MINOR Fixed missing end to anchor tag


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sminnee
b0caa5c680 BUGFIX: Enhance the protection of the assets/ directory in both IIS and Apache by including a file type whitelist.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey
debce7cdc6 MINOR Remove whitespace from generated _config.php file in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey
6a7a1145bb ENHANCEMENT Installer exposes database type in "Database support" configuration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112247 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00