Commit Graph

736 Commits

Author SHA1 Message Date
Simon Welsh
0b59ef4026 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-07-01 13:00:52 +12:00
Simon Welsh
4fd75527dc Block access to .yaml files as well as .yml 2013-07-01 12:59:31 +12:00
Ingo Schommer
623685aedc Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-03 10:32:30 +02:00
Ingo Schommer
93f206a125 Revert composer.lock addition, unclear usage, breaks builds
Partially reverts e9f13512dc

This caused two issues in Travis builds:
 * CMS builds were using
outdated framework dependencies. Example: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/7718686
 * Modules weren't building
at all because the info in the lock file overwrote the custom
composer.json. Example: https://travis-ci.org/silverstripe/silverstripe-translatable/jobs/7726954

In addition, I don't agree with having lock files on release branches
(as opposed to tags), since it forces us to permantently update lock
files or work with stale dependencies even when on branches
(most likely not the developers intention).
2013-06-03 10:27:04 +02:00
Sean Harvey
f283290e2a Merge pull request #42 from sminnee/composer-post-install
NEW: Added post-install and post-update dev/build call.
2013-05-29 21:57:55 -07:00
Sam Minnee
c88c6af039 Merge branch '3.0' into 3.1 2013-05-30 16:28:36 +12:00
Sam Minnee
e9f13512dc git commit -m "FIX: Move install composer.json to use self.version.
Now that Composer has been fixed, self.version can be used as a dependency for framework
and cms in installer.  This simplifies our composer.json, and meanst that we can commit
composer.lock into the repo, as required.  An annoying piece of our release process has
been solved!
2013-05-30 16:27:27 +12:00
Sam Minnee
26147bb962 NEW: Added post-install and post-update dev/build call.
With this change, composer will automatically call dev/build after an update or install
command.  The main reason that this is 3.1-only is that previous releases would have
necessitated the use of 'sudo -u www-data', which is too environment-specific.

One thing that this may cause problems with is 'composer create-project' in an environment
without a _ss_environment file.  It will call dev/build, and dev/build will throw an
error.  That should be fixed in a subsequent commit.
2013-05-30 16:23:35 +12:00
Ingo Schommer
16c72aacb6 Merge pull request #41 from uniun/HTML5-video-file-types
HTML5 video file types.
2013-05-29 08:36:26 -07:00
Elvinas
7403a844e0 HTML5 video file types. 2013-05-27 21:32:04 +03:00
Simon Welsh
dbe882c11e Merge pull request #40 from NightJar/hackfest_may_2013
case insensitive the assets/ allowed extensions for Apache
2013-05-25 01:09:47 -07:00
Nightjar
04be573187 case insensitive the assets/ allowed extensions for Apache 2013-05-25 19:43:13 +12:00
Ingo Schommer
0975787f00 Updated github path 2013-05-17 00:51:03 +02:00
Ingo Schommer
16380f68bf Updated github path 2013-05-17 00:49:19 +02:00
Ingo Schommer
a11f4be84a Merge pull request #39 from sminnee/composer-uses-self-version
FIX: Put self.version in composer dependencies.
2013-05-13 02:19:26 -07:00
Sam Minnee
bf81f0394a 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.

Ultimately, the release of rc1 will be the place to test that, but it seems appropriate
to get this in there for that.

If it succeeds with 3.1-rc1, I'd suggest we backport to 3.0 and 2.4.
2013-05-13 21:07:57 +12:00
Ingo Schommer
b23c744f41 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 16:55:44 +02:00
Ingo Schommer
c929a5944d Updated behat.yml to reflect changes in behat-extension module 2013-05-09 16:00:50 +02:00
Sam Minnée
08b3685927 Merge pull request #36 from chillu/pulls/require-dev
Remove require-dev section, composer doesn't handle it well
2013-05-07 02:54:56 -07:00
Ingo Schommer
345a32ec3e Remove require-dev section, composer doesn't handle it well
Any "composer require <module>" call will first call
a "composer update". This *automatically* includes dev requirements,
without providing a way to turn off this behaviour.
A workaround would be "composer require --no-update <module> && composer update --no-dev <module>",
but that drastically reduces the usefulness of the command
for our target audience (moderately technical devs).

In the end, the small faction of devs needing the dev dependencies
also know how to install them on their own. And having a local phpunit
build actually gets in the way more than it helps in case you have
it installed through PEAR already (can get really weird when using the
PEAR provided "phpunit" binary, but the autoloader finds the composer managed classes).
2013-05-07 10:51:47 +02:00
Ingo Schommer
1aca785e6d Merge pull request #29 from chillu/pulls/gitattributes
Ignore build-related files in "git archive" (fixes #8167)
2013-04-18 09:32:56 -07:00
Sean Harvey
b0188e9bfd Merge pull request #32 from sunnysideup/patch-1
IIS 7.5 does not like forward slash at the end of silverstripe-cache
2013-04-02 19:56:14 -07:00
Nicolaas
5c91cc1f61 IIS 7.5 does not like forward slash at the end of silverstripe-cache
IIS 7.5 does not like forward slash at the end of silverstripe-cache
2013-04-03 15:54:31 +13:00
Ingo Schommer
b466217548 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-04-02 02:03:40 +02:00
Ingo Schommer
2e4913d351 Contribution guidelines, new bugtracker links 2013-04-02 01:52:32 +02:00
Ingo Schommer
27f63fe19f Updated bugtracker links 2013-04-02 01:19:15 +02:00
Sam Minnee
fbb4d1c42b FIX: Update Page/Page_Controller statics to match new 3.1 expectations. 2013-03-25 14:38:58 +13:00
Ingo Schommer
bac9e2fc00 Added mysite/_config/config.yml, removed obsolete PHP config (#8317) 2013-03-21 20:02:42 +01:00
Ingo Schommer
f8762ef204 Removed MySQLDatabase::set_connection_charset() from default config
Its now part of the core default YAML settings
2013-03-15 18:01:50 +01:00
Ingo Schommer
41761472b2 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	composer.json
2013-03-08 10:54:49 +01:00
Will Rossiter
3c88359698 Include a higher timeout value to avoid timeouts.
Checking out framework can often take longer than the default
(300 seconds). This gives a 10min limit to creating a new project.
2013-03-06 20:22:48 +13:00
Ingo Schommer
b737ad1341 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-20 13:26:08 +01:00
Ingo Schommer
3c6ef63734 Merge branch '3.0.5' into 3.0 2013-02-20 12:17:01 +01:00
Ingo Schommer
4e885dd297 Forcing stable flags for release 2013-02-20 01:44:23 +01:00
Hamish Friedlander
becc5baa34 API Block all yaml files by default, to reduce the change of information leakage 2013-02-17 22:16:11 +01:00
Ingo Schommer
98135df7d3 Prevent YAML access in IIS by default (fixes #8233)
Since SS3 keeps values in configuration, direct access
to known paths might expose them
2013-02-17 21:04:58 +01:00
Ingo Schommer
494bfc7863 Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	build.xml
	composer.json
	install.php
	phpunit.xml.dist
2013-02-15 19:19:23 +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
377a68848e Ignore build-related files in "git archive" (fixes #8167)
This is useful for keeping standard "composer create-project"
checkouts clean. Unless they use "--keep-vcs", in which case
.gitattributes is (correctly) ignored.

This has the side effect that archive-checkouts can't
run phing or phpunit scripts, but I think that's
acceptable.
2013-01-14 18:32:43 +01:00
Sean Harvey
5d78b046bb Merge pull request #27 from halkyon/htaccess_fix
Fixing .htaccess to ignore rewriting PHP files directly
2013-01-06 17:24:55 -08:00
Ingo Schommer
40b536654e Updated composer.json 2012-12-11 18:00:47 +01:00
Ingo Schommer
694f3ff350 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	composer.json
2012-12-11 02:04:34 +01:00
Ingo Schommer
10d447e15a API Removed 'make getallmodules', use composer instead 2012-12-11 02:03:49 +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
fbc03f1fe2 Removed @stable flags from composer.json (release tag only)
They used to require manual editing of the composer.json
file in order to do a proper dev checkout. In the end,
the choice between release tag and dev branch should
be handled by composer already via the --stability flag.
2012-12-07 00:31:42 +01:00
Ingo Schommer
7d6c43e821 Added 'buildtools' to dev requirements in composer 2012-12-07 00:29:57 +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