1
0
Fork 0
Commit Graph

4931 Commits (b1248e1ff653db49cf4d37c2f54296167d629db5)

Author SHA1 Message Date
Jordi Boggiano b33da336ec Merge remote-tracking branch 'origin/master' 2014-09-30 16:28:01 +01:00
Jordi Boggiano efcdb394d3 Rename *-solve-dependencies to *-dependencies-solving 2014-09-30 16:26:55 +01:00
Jordi Boggiano 81fa284c9b Merge remote-tracking branch 'francoispluchino/installer-events' 2014-09-30 16:18:17 +01:00
Jordi Boggiano 663cda8827 Merge pull request #3142 from francoispluchino/plugin-load-only-one-time
Register plugin only one time when it's present in global and project mode
2014-09-30 15:19:55 +01:00
Jordi Boggiano 472c8a5113 Fix tests on windows, fixes #3141 2014-09-30 15:18:15 +01:00
Jordi Boggiano 1c051d9c8e Merge pull request #3318 from JJK801/master
Update symfony/process to fix hhvm issues
2014-09-30 10:27:30 +01:00
Jérémy JOURDIN 536a1fdca1 Update symfony/process to fix hhvm issues 2014-09-30 11:02:20 +02:00
Jordi Boggiano 391a5390f2 Typo fix, cheers @rdlowrey 2014-09-30 00:51:44 +01:00
Jordi Boggiano efcdd35cbf Damn 2014-09-30 00:39:21 +01:00
Jordi Boggiano 241627659e Fix formatting bug 2014-09-30 00:38:39 +01:00
Jordi Boggiano 1cbd1a7ba8 Examplify chars and reword, closes #3212 2014-09-30 00:37:28 +01:00
Jordi Boggiano 52308d7db6 Merge pull request #3309 from NAYZO/patch-1
Update 01-basic-usage.md
2014-09-30 00:34:36 +01:00
Jordi Boggiano 82f3576d07 Merge pull request #3310 from NAYZO/patch-2
Update 01-basic-usage.md
2014-09-30 00:33:26 +01:00
Jordi Boggiano f094ad3264 Merge pull request #3288 from phpPhil/patch-1
Update handling-private-packages-with-satis.md
2014-09-30 00:31:51 +01:00
Jordi Boggiano bf6ebd11c5 Merge pull request #3271 from TomasVotruba/patch-1
typo
2014-09-30 00:31:27 +01:00
Jordi Boggiano 834f70423b Merge pull request #3215 from onewheelskyward/patch-1
Updated to reflect new tap names for php in OSX homebrew.
2014-09-30 00:28:18 +01:00
Jordi Boggiano 18ab5ad6fe Merge pull request #3154 from francoispluchino/fix-phpdoc
Fix phpdoc
2014-09-30 00:06:21 +01:00
Ala Eddine Khefifi 03ee649147 Update 01-basic-usage.md 2014-09-29 11:01:02 +01:00
Ala Eddine Khefifi fc986d76c8 Update 01-basic-usage.md 2014-09-29 10:40:29 +01:00
Jordi Boggiano 31eadc6920 Merge pull request #3303 from chrisnharvey/patch-1
Adding missing closing <info> tag when re-applying stashed changes
2014-09-25 18:49:51 +01:00
Jordi Boggiano 182a936347 Merge pull request #3302 from cordoval/patch-2
note special case for ~1 cases
2014-09-25 18:49:17 +01:00
Chris Harvey 43b9ef309e Adding missing closing <info> tag when re-applying stashed changes 2014-09-25 18:39:50 +01:00
Luis Cordova 1bc6158cd8 note special case for ~1 cases
referenced from https://github.com/symfony/symfony-docs/pull/4267/files#r18030609
2014-09-25 08:27:10 -05:00
Jordi Boggiano 69afedb49c Update deps 2014-09-24 19:19:25 +01:00
Jordi Boggiano 4e774e8b2c Fix formatting 2014-09-24 19:17:54 +01:00
Jordi Boggiano e61e62908e Merge remote-tracking branch 'frederikbosch/patch-1' 2014-09-24 19:17:30 +01:00
Jordi Boggiano 91ac3e1426 Add support for unixy paths in git/hg local repo urls, closes #3294 2014-09-24 19:13:05 +01:00
Jordi Boggiano 55a6a1c3d4 Add support for nested arrays in the json manipulator, fixes #3296 2014-09-24 18:32:10 +01:00
frederik d1d40502bf ProcessExecutor::escape 2014-09-24 18:30:12 +02:00
frederik 7ae1430689 #3297 ProcessUtil class using ProcessUtil of Symfony Console 2014-09-24 17:18:15 +02:00
Nils Adermann eba04dc211 Merge pull request #3272 from bashofmann/master
Added cacheCredentials config flag for saved SVN credentials
2014-09-24 15:38:16 +02:00
Bastian Hofmann 2612dc7c15 fixed typo 2014-09-24 15:30:48 +02:00
Frederik Bosch 4c58abbb76 Update GitDownloader.php 2014-09-24 15:27:31 +02:00
Frederik Bosch 6edabc629d Update GitDownloader.php
PHP 5.3. compat.
2014-09-24 15:24:28 +02:00
Frederik Bosch f3b0890cf4 GitDownloader.php: better escaping for Windows
Compability for Windows usernames and passwords. When usernames and passwords contain characters that are rawurlencoded to a string containing a % sign (e.g. @ becomes %40), the procent was replaced with a space. Git can there not authenticate.
2014-09-24 15:16:30 +02:00
Bastian Hofmann f8023cffdf renamed cache-credentials to svn-cache-credentials 2014-09-24 13:24:54 +02:00
Bastian Hofmann b279dda1c0 Merge branch 'master' of https://github.com/composer/composer 2014-09-24 13:23:49 +02:00
Jordi Boggiano e6165e6495 Tweak rules to allow guessing based on branch aliases and avoid greedy constraints on alpha/beta/RC packages, refs #3096 2014-09-23 15:19:23 +01:00
Jordi Boggiano b7b0901f87 Allow using new code in the init command and avoid initializing the composer instance too early, refs #3096 2014-09-23 15:17:53 +01:00
Jordi Boggiano cf75ec7763 Merge remote-tracking branch 'weaverryan/require-version-select' 2014-09-22 17:48:13 +01:00
Jordi Boggiano 62b5062146 Improve sorting of plugin packages, fixes #3109, refs #2972 2014-09-22 17:04:58 +01:00
Jordi Boggiano 4d522e40fb Load auth when updating a git repo mirror, fixes #3243 2014-09-22 16:06:27 +01:00
Jordi Boggiano 1fff2afa1f Merge pull request #3292 from francoispluchino/fix-format-version-parser
Fix invalid version format
2014-09-22 15:19:53 +01:00
Jordi Boggiano 2c237fdfdf Handle files in Filesystem::copyThenRemove, fixes #3287 2014-09-22 15:09:55 +01:00
François Pluchino 6c6a623229 Fix invalid version format 2014-09-22 11:58:26 +02:00
Philipp a76436bbae Update handling-private-packages-with-satis.md 2014-09-20 12:42:36 +10:00
Jordi Boggiano 2cb64c8a72 Merge pull request #3175 from Petah/clear-cache
Clear all the caches
2014-09-18 16:58:10 +01:00
Bastian Hofmann 204fc207fa Moved config option to not save subversion credentials to repository configuration, added documentation. 2014-09-16 15:16:55 +02:00
Bastian Hofmann 0d0ed59e5c Codestyle fix 2014-09-15 13:21:33 +02:00
Ryan Weaver 895e62e859 Refactoring selection of the "recommended" version (e.g ~1.2) and adding some tests
This also modifies the behavior slightly (from a recommendation by seldaek) to always
propose the minor version of the recommendation (e.g. ~1.2 instead of ~1.2.1).
2014-09-12 11:26:51 -04:00