1
0
Fork 0
Commit Graph

595 Commits (6ce20d36b6f6caa312f9d28ac8256f00e7bd361e)

Author SHA1 Message Date
Padraic Brady 6ce20d36b6 Resolve final conflicts 2015-01-29 20:34:05 +00:00
Padraic Brady 19e24c5804 Merge branch 'master' into tls-config
Conflicts:
	.travis.yml
	doc/03-cli.md
	src/Composer/Command/ConfigCommand.php
	src/Composer/Command/CreateProjectCommand.php
	src/Composer/Command/DiagnoseCommand.php
	src/Composer/Command/InstallCommand.php
	src/Composer/Command/RequireCommand.php
	src/Composer/Command/SelfUpdateCommand.php
	src/Composer/Command/ShowCommand.php
	src/Composer/Command/UpdateCommand.php
	src/Composer/Config.php
	src/Composer/Downloader/FileDownloader.php
	src/Composer/Factory.php
	src/Composer/Repository/ComposerRepository.php
	src/Composer/Repository/PearRepository.php
	src/Composer/Repository/Vcs/VcsDriver.php
	src/Composer/Util/GitHub.php
	src/Composer/Util/RemoteFilesystem.php
2015-01-29 20:31:56 +00:00
Nils Adermann 2fbce61f6a Merge pull request #3675 from Shelob9/patch-1
Add note about /usr not existing in OSX Yosemite by default.
2015-01-29 16:53:39 +01:00
Josh Pollock 76a0e818b5 Improve notice about /usr/local/bin 2015-01-28 21:33:42 -05:00
Nils Adermann 0543a32d39 Merge pull request #3610 from bd808/feature/classmap-authoritative
Add classmap-authoritative config setting
2015-01-28 11:26:28 +01:00
findstar 82831bec13 I think 'dump-autoload' command is more proper. 2015-01-28 15:07:44 +09:00
Josh Pollock 59141c8663 Add note about /usr not existing in OSX Yosemite by default.
BTW Seriously Apple?
2015-01-25 17:05:21 -05:00
Jordi Boggiano f5de5a1268 Merge pull request #3652 from hallabro/documentation-versionparser
Update documententation for version shorthand parsing
2015-01-20 10:27:47 +00:00
Jordi Boggiano dadf02f511 Merge remote-tracking branch 'tractorcow/pulls/fix-numeric-alias' 2015-01-20 10:18:29 +00:00
Jordi Boggiano af161e242e Add more troubleshooting info, refs #3457 2015-01-20 09:55:18 +00:00
Robin Hallabro ea3736522d Update documententation for version shorthand parsing 2015-01-20 09:05:40 +01:00
Damian Mooyman 7bb85ff21e Support aliases for numeric branches. Fixes #3461 2015-01-20 17:42:01 +13:00
SofHad 9d84a92163 Fixed json syntax error 2015-01-16 20:59:30 +01:00
Hannes Van De Vreken 200f867d64 "suggest" was on a wrong heading level compared to the others 2015-01-09 10:08:13 +01:00
Bryan Davis ad1f8e6c5a Add classmap-authoritative config setting
Add a "classmap-authoritative" configuration setting that can be used to
disable searching the various prefix and fallback directories for
classes that have not been registered with the
Composer\Autoload\ClassLoader class map. This setting can be used to
optimize performance by avoiding a potentially large number of
`file_exists` calls when Composer is being used in a program with
additional autoloader facilities. Use of the setting implies
"optimize-autoloader" to ensure that the most complete class map
possible is generated.

Closes #3603
2015-01-03 17:35:25 -07:00
Jordi Boggiano 8d0c1a14b3 Add --ignore-platform-reqs to create-project, refs #1426 2015-01-01 16:21:22 +00:00
Jordi Boggiano b8f4960f0d Merge remote-tracking branch 'mattsah/master' 2014-12-29 20:21:43 +00:00
Arfan 70007fee4e Typo edited.
Silly typo edit.
2014-12-21 02:18:29 +05:30
tomzx 6b5a531782 Minor fix to the HTTP Basic Authentication documentation
Replaced JSON array with JSON object since you cannot assign key values in an array.
2014-12-17 21:11:36 -05:00
Jordi Boggiano c54d6f93e3 Add --absolute to resolve absolute paths in config command, otherwise set default back to relative 2014-12-16 14:28:51 +00:00
Miodrag Tokić 12ba415f0e Fix documented Composer home variable name 2014-12-14 22:55:49 +01:00
Jordi Boggiano 901fd838f3 Merge pull request #3450 from nicolas-grekas/prefer-lowest-stable
add --prefer-lowest and --prefer-stable to update command
2014-12-14 13:02:06 +00:00
Nicolas Grekas e821ac2772 Persist prefer-lowest in composer.lock 2014-12-14 10:29:41 +01:00
Rob 2e4cb8be33 scrapping next line 2014-12-13 19:05:52 +01:00
Rob d26f817cfd rewriting some documentation sections 2014-12-13 18:59:14 +01:00
Jordi Boggiano d515577560 Fix wording, refs #3466 2014-12-13 13:37:05 +00:00
Jordi Boggiano d6d8fe5f55 Merge remote-tracking branch 'PaulSchell/patch-1' 2014-12-13 13:35:41 +00:00
Jordi Boggiano 4a3bc58adf Fix formatting 2014-12-10 15:36:16 +00:00
Jordi Boggiano fa470be001 Wording tweaks and docblock formatting, refs #2536 2014-12-08 21:30:39 +00:00
Jordi Boggiano 5c62e9b487 Merge remote-tracking branch 'cordoval/http-basic-auth' 2014-12-08 21:23:58 +00:00
Jordi Boggiano 90a69cd02e Add new arg to docs, refs #3385 2014-12-08 21:21:33 +00:00
Jordi Boggiano f363f9d370 Add support for caret (^) operator 2014-12-08 15:39:52 +00:00
Jordi Boggiano ebab9db27a Add support for hyphen ranges 2014-12-08 13:44:42 +00:00
Jordi Boggiano 69ef80124f Add support for capital X in 3.X and || for OR 2014-12-08 12:59:01 +00:00
Jordi Boggiano ca168d478b Spaces are now equivalent to comma in constraints and mean AND 2014-12-07 18:07:29 +00:00
Paul Schell 62bcc3996b Update 00-intro.md 2014-11-25 17:01:07 +01:00
Matthew J. Sahagian 14fe882b44 Added no-autoloder option to install and update 2014-11-21 13:28:44 -08:00
Olivier Laurendeau 1c5c334b48 Update remove command's documentation 2014-11-15 10:36:15 +01:00
Olivier Laurendeau af79a104d9 Update require command's documentation 2014-11-15 10:35:21 +01:00
Veres Lajos 7f64afcbe8 typo fix 2014-11-04 21:47:59 +00:00
Jordi Boggiano 751190aafd Add new github-expose-hostname to docs/schema/config command, refs #3164 2014-10-17 17:21:59 +01:00
Jordi Boggiano 2bb78708b8 Merge pull request #3246 from richardkmiller/patch-1
Very tiny but necessary edit
2014-10-17 16:09:33 +01:00
Jordi Boggiano 8a29c812e3 Fix docs 2014-10-17 15:52:44 +01:00
Jordi Boggiano 97f191a7a7 Add --ignore-platform-reqs to docs, refs #3320 2014-10-17 15:37:37 +01:00
Matthias Pigulla 579409e6c5 Update fixtures to include gar/nix (which is being replaced) and bar/baz (which has a branch-alias) 2014-10-13 12:55:00 +02:00
Matthias Pigulla 905f08e46e Add some examples for "composer" type repositories.
These can be used as examples or possibly for tests.
2014-10-11 16:23:36 +02:00
Jordi Boggiano 7ccda2b1c3 Update recommendations, refs #3095 2014-10-07 14:35:09 +01:00
Jordi Boggiano bdc60ec9c4 Merge remote-tracking branch 'amyboyd/patch-1' 2014-10-07 14:26:26 +01:00
Thomas Punt 26122cff43 Updated example to have a valid tag name. 2014-10-06 15:41:47 +01:00
Jordi Boggiano 6c0afd3fc0 Merge pull request #3191 from jakoch/master
added stof's php inline example from #3190 to doc/articles/scripts.md
2014-10-04 17:55:03 +01:00