254453f5b5
Wrap final attempt to touch a cache file in Silencer.
2016-02-16 14:01:21 +01:00
ebfceefca6
Removed long deprecated functions that were no longer referenced anywhere.
2016-02-15 22:00:54 +01:00
4fe063b2e5
Added missing deprecation warning in create-project.
2016-02-15 21:38:31 +01:00
72a3563f1e
Removed some 3 year old backward compatibility code.
2016-02-15 21:37:19 +01:00
126e71a991
Adds a --timeout parameter to run-script to override default timeout.
2016-02-15 20:47:43 +01:00
86374034b6
Removed unnecessary state from Depends command.
2016-02-15 12:48:33 +01:00
9b41495353
Options added and cleaned up.
2016-02-15 01:08:24 +01:00
e38fe67333
Rewrote DependsCommand
2016-02-15 00:49:00 +01:00
d6d0435c54
Merge pull request #4845 from curry684/pull-4690
...
Implement junctioning on Windows for path repositories
2016-02-14 19:51:23 +00:00
8db550b118
Merge pull request #4851 from curry684/pull-4431
...
Fixes in path repository handling of removed or nested sources
2016-02-14 19:16:16 +00:00
39ccb929b1
Merge pull request #4801 from balbuf/balbuf/find-provider-break-early
...
Break early when a provider name is matched
2016-02-14 19:12:04 +00:00
02952c3bdc
Add missing </error> tag, refs #4878
2016-02-13 17:48:31 +00:00
d347e1efca
Minor tweaks refs #4878
2016-02-13 17:44:01 +00:00
e4ede0c582
Merge remote-tracking branch 'bozerkins/force-to-reinstall-package-when-missing-vcs-metadata'
2016-02-13 16:55:44 +00:00
d9a7d4c93a
Merge pull request #4850 from astehlik/issue-validate_event
...
Trigger event in validate command
2016-02-13 16:35:04 +00:00
8ed894cf99
Fix usage of symfony console for sf<2.8, fixes #4913
2016-02-13 15:33:04 +00:00
25e089eee9
Allow force-lazy-providers for any repo, still an experimental flag that should not be used though
2016-02-12 14:03:59 +00:00
b6b416111e
Fixed http check
2016-02-11 14:46:38 +01:00
4f5b4aff9c
Undid CS changes
2016-02-11 14:29:37 +01:00
da44f46b9c
Code style fixes
2016-02-11 14:17:45 +01:00
ef60478926
Added secure-http flag, defaults to true
2016-02-11 14:15:03 +01:00
6d1ebba75e
Merge pull request #4904 from curry684/issue-4903
...
Ignore empty path repositories
2016-02-11 11:17:41 +00:00
c8b4978f5a
Merge pull request #4906 from curry684/platform-editor
...
Prefer 'editor' on a system that supports alternatives
2016-02-11 11:01:26 +00:00
93ce87a84e
Prefer 'editor' on a system that supports alternatives.
2016-02-11 09:24:42 +01:00
ff6700f9ee
Ignore empty path repositories per issue #4903
2016-02-11 08:57:16 +01:00
0ea2890ed6
Update install instructions
2016-02-10 18:41:18 +00:00
8808638ea9
Make sure cache clearing works easily in all cases
2016-02-10 15:36:42 +00:00
09a6a19257
Avoid decoding gzip responses after a redirect, fixes #4897
2016-02-10 15:24:49 +00:00
2378c9e308
Remove dead code
2016-02-10 15:10:32 +00:00
477da3a448
Fix clearCache in case of download failure
2016-02-10 15:06:22 +00:00
502c5431a2
Add hashing of the complete URL for cache entries of dist downloads for extra safety
2016-02-10 14:51:23 +00:00
2609cfdd1d
Always set bin-dir into PATH before calling scripts, fixes #4852 , closes #4898
2016-02-10 14:11:05 +00:00
d9d3de8861
Be sure that configuration file can be manipulated by actual user
2016-02-09 09:20:25 +01:00
6eb50623e6
Merge remote-tracking branch 'hfcorriez/compressed_archiver'
2016-02-08 19:03:10 +00:00
990c07e4db
Merge branch 'master' of https://github.com/composer/composer into sort-suggestions
2016-02-07 14:45:26 +01:00
017a9af672
Merge branch 'master' of https://github.com/composer/composer into pull-4690
2016-02-07 14:45:15 +01:00
80bf5b75fc
Merge branch 'master' of https://github.com/composer/composer into pull-4431
2016-02-07 14:44:36 +01:00
9a57de574d
Merge pull request #4886 from curry684/issue-4885
...
Ensure exception is thrown when classmaps are requested for corrupted files
2016-02-06 15:53:14 +00:00
7e17fec3b8
Merge pull request #2585 from jaypea/ziparchiver
...
added ZipArchiver to actually compress zip files
2016-02-06 15:49:24 +00:00
0b55a0ca91
Can't use error_clear_last as it was introduced in PHP7.
2016-02-06 02:58:36 +01:00
6a53b1df42
Further reorganized messy checking code.
2016-02-06 02:40:16 +01:00
bb08f76ad9
Use error_get_last to verify why php_strip_whitespace would return an empty string.
2016-02-06 02:32:08 +01:00
43551bc537
Add `composer exec` command
2016-02-05 20:22:54 -05:00
86fc85fe56
Add a comment explaining the use of @ instead of Silencer in this specific situation.
2016-02-06 02:04:48 +01:00
c2d9960898
Ensure exception is thrown when classmaps are requested for corrupted or binary files. Refs #4885
2016-02-06 02:00:54 +01:00
101fca9071
Merge pull request #4837 from cs278/openssl-version-warning
...
Warning if OpenSSL does not support TLSv1.2
2016-02-05 22:46:05 +00:00
baabc612f6
adjust message, skip test
...
currently we have no way to put dynamic values or wildcards in EXPECT-OUTPUT
2016-02-05 13:21:30 +01:00
94daeca57b
add test and adjust rule error message
2016-02-05 11:59:05 +01:00
54c079b559
Fixed Windows detection based on #4873 and suppressed some console output in removeJunction.
2016-02-05 11:27:41 +01:00
582e4796a3
Merge branch 'master' of https://github.com/composer/composer into pull-4690
2016-02-05 11:24:30 +01:00
e0fad1f55b
Implemented interactive user confirmation on source package update failure
...
Removed unnecessary options for installation
Removed unnecessary exception
2016-02-04 23:01:21 +02:00
79ac2cac82
Merge pull request #4817 from alcohol/repro-4795
...
Bug #4795
2016-02-04 12:40:23 +00:00
2e1cdccac0
Merge pull request #4875 from cs278/openssl-platform-version
...
Handle OpenSSL's many patch releases
2016-02-04 11:43:55 +00:00
be5719eb53
Merge remote-tracking branch 'upstream/master' into repro-4795
...
* upstream/master: (98 commits)
Fallback to zlib extension to unpack gzip on non Windows systems
Zip extension does not provide zlib support
Unified all Windows tests throughout the code.
Added Platform utility and unit test for it.
Remove warnings for non-writable dirs, refs #3588
[doc] add -H flag to sudo commands
use full json content to determine reference, closes #4859
typos
Make sure COMPOSER_AUTH is also loaded in Config, refs #4546
Use proper defaults for IO authentications
Add verbosity input support to IOInterface
Update SolverTest.php
Update broken-deps-do-not-replace.test
Update SolverProblemsException.php
Cleaned up check+conversion that was no longer required.
Cleaner notation for expected exceptions in fixtures.
Introduced more generic, less invasive way to test for exceptions in fixtures, more in line with how phpunit works.
Included unit test for circular root dependencies.
Expanded InstallerTest to support expecting Exceptions by supplying "EXCEPTION" as "--EXPECT--"
Clarified error message and added braces.
...
2016-02-04 12:43:37 +01:00
16215c1937
Merge pull request #4877 from cs278/zip-zlib-muddle
...
zlib suggest and fallback on non Windows
2016-02-04 11:15:49 +00:00
57e33fcad7
Merge pull request #4873 from curry684/platform-tests
...
Windows platform tests unified
2016-02-04 11:12:36 +00:00
644aa517d5
Merge pull request #4863 from alcohol/issues-4859
...
bugfix for issue #4859 - path repo does not update when composer.json is adjusted
2016-02-04 10:58:59 +00:00
581ce91f90
Implemented new option (ignore-missing-metadata) for composer install command
...
The command allows to slightly change how repository updates are handled during install
In the previous version composer failed to updated if .git|.svn|.hg folder was missing from the package
In the current version, with the option enabled, if the update fails for exactly this reason,
it'll try to remove the package completely and install it from remote
2016-02-04 03:16:39 +02:00
a77e2fb093
Removed code duplication with abstract hasMetadataRepository method
...
which checks if vcs metadata is present in the package
Fixed a bug with -vvv mode. When .git folder is missing from package
in normal mode, -v mode, -vv mode the program throws the exception about missing .git folder
in -vvv mode an exception about inability to read logs
2016-02-04 03:11:18 +02:00
e4877473cf
Fallback to zlib extension to unpack gzip on non Windows systems
2016-02-04 00:49:56 +00:00
0818a6ed54
Previous attempt would cause 0.9.8aa == 0.9.8b
2016-02-04 00:28:42 +00:00
f6f273c4b6
Improve OpenSSL library description
2016-02-04 00:28:42 +00:00
e9e2514b5e
Handle OpenSSL version after 26 patch releases
...
e.g. https://github.com/openssl/openssl/blob/OpenSSL_0_9_8zh/crypto/opensslv.h#L33
2016-02-04 00:28:42 +00:00
0dab63e050
Unified all Windows tests throughout the code.
2016-02-03 22:39:16 +01:00
f2a2b18367
Added Platform utility and unit test for it.
2016-02-03 22:25:43 +01:00
8771eca527
Merge remote-tracking branch 'curry684/issue-4767'
2016-02-03 17:00:30 +00:00
d93f7b8a10
Remove warnings for non-writable dirs, refs #3588
2016-02-03 14:57:32 +00:00
47aa87ea97
use full json content to determine reference, closes #4859
2016-02-03 13:25:10 +01:00
b20cc22ebb
Improved output of SuggestsCommand by correctly filtering installed platform requirements if suggested.
2016-02-03 00:14:16 +01:00
b71c67239d
Made NTFS junction detection more reliable and added unit tests for the junction functions.
2016-02-02 23:44:01 +01:00
1b1462317c
Merge branch 'master' of https://github.com/composer/composer into pull-4690
2016-02-02 22:51:22 +01:00
0e584aa980
resolve issue
2016-02-02 10:45:57 +01:00
05caf8349c
Fixed bug potentially causing broken sites and solved #4431 along the way.
2016-01-30 01:13:37 +01:00
298e7a218a
Trigger event in validate command
...
This allows plugins to run additional validations.
2016-01-29 17:33:16 +01:00
cc75946ef2
typos
2016-01-29 17:13:44 +01:00
7c3e621102
Make sure COMPOSER_AUTH is also loaded in Config, refs #4546
2016-01-29 12:58:17 +00:00
2617ec5d28
Use proper defaults for IO authentications
2016-01-29 12:51:23 +00:00
49d7d65933
Add verbosity input support to IOInterface
2016-01-29 10:14:12 +00:00
1b97d07bca
Processed PR feedback
2016-01-29 10:12:32 +01:00
8d57c3e743
Update SolverProblemsException.php
2016-01-28 19:56:25 -06:00
d6589ac151
Rewrote SuggestsCommand
2016-01-28 23:01:04 +01:00
358cb3f4fc
Fixed exception text and some warnings.
2016-01-28 01:06:05 +01:00
5489586436
Fully implemented junctioning on Windows for path repositories.
2016-01-28 00:56:02 +01:00
e515eb84e9
Add NTFS junction support to Util\Filesystem.
2016-01-28 00:33:11 +01:00
3a750193fd
skip diag. which are only for phar mode
2016-01-27 16:43:12 +01:00
0a25bb0bf3
Simplify for PHP 5.3
2016-01-27 08:57:28 +00:00
7b6ccde97a
Clarified error message and added braces.
2016-01-27 09:09:29 +01:00
b1de2c52a3
Add --no-plugins option to remove/require
2016-01-27 00:48:17 +01:00
a48159b283
Bail out if root package attempts to include itself.
2016-01-26 23:39:39 +01:00
3979abc638
Add warning if OpenSSL does not support TLSv1.2 or TLSv1.1
2016-01-26 22:05:35 +00:00
593b88e414
Let users configure *any auth* via COMPOSER_AUTH and add it to the docs, refs #4546
2016-01-26 19:09:57 +00:00
e513f27674
Merge remote-tracking branch 'firoxer/envvar_auth'
2016-01-26 18:59:55 +00:00
ae14e0f086
Add ssh2 protocol default ports, fixes #4835
2016-01-26 16:53:41 +00:00
13b50799d1
fix: missing parentheses
2016-01-26 18:19:58 +03:00
618e7f98b2
Force base error reporting level to include everything
2016-01-26 15:05:57 +00:00
4e00635298
Fix error handling support, fixes #4833
2016-01-26 15:04:13 +00:00
f829a160fb
use a proper tmp directory
...
this test failed on OSX before, trying to create a directory at the root of the filesystem
2016-01-26 14:32:04 +01:00
1818b95149
CS fixes
2016-01-26 13:07:18 +00:00
5c944d45ac
Merge pull request #4827 from curry684/issue-4203
...
Added more graceful warning suppression utility
2016-01-26 12:31:18 +00:00
c2e768b8ad
Made Silencer invocations safer against exceptions.
2016-01-26 13:27:24 +01:00
5672f67475
Merge pull request #4829 from curry684/issue-4726
...
Globbing while resolving path repositories now normalizes to slashes
2016-01-26 12:18:47 +00:00
fff5074bbf
Fix additionalOptions getting dropped when SAN and redirect handling are combined, refs #4782
2016-01-26 10:44:06 +00:00
03e0d65f37
Allow stream wrapper usage in config dirs, fixes #4788
2016-01-25 23:40:16 +00:00
84fed02df1
Globbing while resolving path repositories now normalizes to slashes for predictable cross-platform behaviour. Fixes #4726
2016-01-26 00:33:47 +01:00
76c1645a0e
Merge remote-tracking branch 'upstream/master' into issue-4203
2016-01-25 23:38:13 +01:00
18cd4f966b
Added silencer utility to more gracefully handle error suppression without hiding errors or worse. Fixes #4203 , #4683
2016-01-25 23:37:54 +01:00
e0ff9598c3
Tweak wording a bit, refs #3177
2016-01-25 22:24:34 +00:00
4d9bab4b86
Merge remote-tracking branch 'singles/missing-extension-ini-hint'
2016-01-25 22:22:41 +00:00
c5cb2327cf
Merge remote-tracking branch 'bamarni/config-repo-options'
2016-01-25 21:28:22 +00:00
5b41eaad3a
Bundle pubkeys and fail hard if validation can not happen
2016-01-25 19:43:48 +00:00
59975e3aaa
Add missing keys class
2016-01-25 19:43:48 +00:00
f4bcf7590b
Fix array syntax
2016-01-25 19:43:48 +00:00
3ef22258e5
Add key fingerprints for easier comparison and debugging via diagnose
2016-01-25 19:43:48 +00:00
a9be7c83f1
Add verification of signatures when running self-update
2016-01-25 19:43:48 +00:00
bdb97e7527
Reuse new TlsHelper for CA validation, refs #4798
2016-01-25 19:17:56 +00:00
1ea810d40b
Merge remote-tracking branch 'cs278/san-support'
2016-01-25 18:53:45 +00:00
78ffe0fd08
Avoid checking CA files several times
2016-01-25 18:34:52 +00:00
e727f9f5fe
[Config command] allow to pass options when adding a repo
2016-01-25 19:25:10 +01:00
901e6f1d0e
Fix output and handling of RFS::copy() and extract redirect code into its own method, refs #4783
2016-01-25 17:55:29 +00:00
a574d5ef76
Merge remote-tracking branch 'cs278/follow-redirects'
2016-01-25 17:26:05 +00:00
e2e07a32c3
Fixes to vuln detection
2016-01-24 20:54:43 +00:00
bc8b7b0f78
Remove left behind debug code
2016-01-24 19:41:14 +00:00
b32aad8439
Do not set TLS options on local URLs
2016-01-24 19:10:11 +00:00
74aa73e841
The origin may not be the remote host
2016-01-24 19:09:35 +00:00
304c268c3b
Tidy up and general improvement of sAN handling code
...
* Move OpenSSL functions into a new TlsHelper class
* Add error when sAN certificate cannot be verified due to
CVE-2013-6420
* Throw exception if PHP >= 5.6 manages to use fallback code
* Add support for wildcards in CN/sAN
* Add tests for cert name validation
* Check for backported security fix for CVE-2013-6420 using
testcase from PHP tests.
* Whitelist some disto PHP versions that have the CVE-2013-6420
fix backported.
2016-01-24 19:02:50 +00:00
7e2a015e9b
Provide support for subjectAltName on PHP < 5.6
2016-01-24 19:02:29 +00:00
837fa805ec
Code tweaks, refs #4124
2016-01-22 19:09:44 +00:00
ddd140fd1c
Rollback plugin api version to 1.0.0 for now, add warning about requiring 1.0.0 exactly
2016-01-22 19:09:03 +00:00
5ec6988218
Fixed docs and removed implementation detail
2016-01-22 13:54:59 +00:00
aa45a48283
Refactoring
...
- changed "SPI" into something more familiar, like "implementation"
- throw exceptions on invalid implementation types or invalid class names
- use null instead of false when querying
- refactored the tests accordingly
2016-01-22 13:51:32 +00:00
ec8229ffa3
Remove @since
2016-01-22 13:51:32 +00:00
2051d74774
Added Capable plugins for a more future-proof Plugin API
...
Plugins can now present their capabilities to the PluginManager, through which it can act accordingly, thus making Plugin API more flexible, BC-friendly and decoupled.
2016-01-22 13:51:32 +00:00
5b85ee409c
add missing array-replace-recursive
2016-01-22 14:29:29 +01:00
d6be2a693b
switch to array-replace-recursive
2016-01-22 14:27:08 +01:00
2393222826
more appropriate name
2016-01-22 09:20:43 +01:00
474541e9aa
apply comments
...
- add capath to json schema
- simplify factory
- hash_file and sha256 for CA checking
- remove exception as scenario should not occur
- remove executable bit from CA file
- make CA file also group/world writable (we overwrite invalid content anyway)
to avoid permission errors as much as possible
2016-01-22 09:14:37 +01:00
33f823146b
Account for ports in URL
2016-01-22 01:48:16 +00:00
34f1fcbdcb
Drop downgrade warning
2016-01-22 01:47:05 +00:00
c232566e52
add a hash to make sure CA file gets recreated if the content changes
2016-01-21 16:02:44 +01:00
cef97904d0
dont rewrite temp CA file if it already exists
...
and make it readable by everyone the first time we create it
2016-01-21 15:07:51 +01:00
4482a1dca0
also wrong array
2016-01-20 21:53:49 +01:00
f79255df29
make sure passed options are merged into defaults before checking
2016-01-20 21:35:06 +01:00
94947ee772
merge isset() calls
2016-01-20 21:29:55 +01:00
b95b0c2ab6
wrong array
2016-01-20 21:27:26 +01:00
008cce8d85
add back sanity checks
2016-01-20 21:24:13 +01:00
c1488f65bf
a quick stab at adding capath
2016-01-20 21:20:18 +01:00
395d115d9b
Resolve all dirs before initializing them, fixes #4802
2016-01-20 11:17:40 +00:00
f1cf5d64dd
createPackage() method should use the $class argument it accepts
2016-01-20 01:34:37 -05:00
c1b9b082a4
Break early when a provider name is matched
2016-01-20 01:29:32 -05:00
dd3216e93d
Refactor to use new helper methods for headers
2016-01-19 22:19:17 +00:00
8a8ec6fccc
Too many redirects is not an error in PHP, return the latest response
2016-01-19 22:06:38 +00:00
33471e389f
Pass redirect count using options
...
Removing the risk it might be preserved between requests.
2016-01-19 22:06:27 +00:00
e830a611ec
Handle other path redirects
2016-01-19 22:06:27 +00:00
ffab235edd
Remove code preventing protocol downgrades
2016-01-19 22:06:27 +00:00
ce1eda25f3
Follow redirects inside RFS only when required by PHP version
2016-01-19 22:06:27 +00:00
73662c725a
Don't let PHP follow redirects it doesn't validate certificates
2016-01-19 22:06:04 +00:00
09417cae50
Composer gives .ini hints about missing extensions
2016-01-19 21:02:40 +01:00
b39b113fc3
Handle envvar auth credentials as a JSON blob
...
As well as move the handling to a proper place
2016-01-19 20:53:07 +02:00
aaee6dc0b0
Simplify envvar credential parsing
2016-01-19 20:53:07 +02:00
e9cac53f90
Allow fetching auth credentials from an envvar
...
When an environmental variable named "COMPOSER_AUTH" is set
as $USERNAME:$PASSWORD, it is automatically used for authentication
e.g. when fetching packages from Satis.
The envvar credentials are of lower priority than URL credentials.
Fixes #4285
2016-01-19 20:53:07 +02:00
546730dcf3
Show CA files being used in debug mode, refs #4792
2016-01-19 17:34:29 +00:00
4dd388074e
Merge pull request #4790 from filbertkm/updatecommand
...
Remove unused import in UpdateCommand
2016-01-19 12:24:00 +00:00
f9fadb187e
Fix undefined var $auth issue
2016-01-19 12:04:23 +00:00
40baa3ff05
Use COMPOSER_HOME if defined instead of falling back to HOME, fixes #4789
2016-01-19 10:54:14 +00:00
0a662a7e42
Remove unused import in UpdateCommand
2016-01-18 19:46:58 -05:00
96ff17c520
Cleanups of XDG support, refs #1407
2016-01-18 18:26:05 +00:00
3e9efcfb85
Merge remote-tracking branch 'ntoniazzi/master'
2016-01-18 17:52:46 +00:00
41d8fdfda8
Restore "Avoid loading plugins that do not match the current plugin api even during installation" but fixed
...
This reverts commit 0118d69603
2016-01-18 15:34:08 +00:00
a13b06725e
Add support for if-modified-since on lazy repos and turning packagist into a lazy provider repo
2016-01-18 14:03:10 +00:00
1d08f83976
Only clone if needed
2016-01-18 12:29:14 +00:00
33c123e8c2
Fix passing of options to remotefilesystem in composer repo
2016-01-18 12:28:03 +00:00
876f143418
Forward repo options correctly to the RemoteFilesystem even if we get one injected, fixes #4786
2016-01-18 10:50:49 +00:00
22d8b5dff4
fix possible caBundle error
2016-01-18 08:59:12 +01:00
0118d69603
Revert "Avoid loading plugins that do not match the current plugin api even during installation"
...
This reverts commit 21f5933e0121f5933eCloses auraphp/Aura.Intl#20
2016-01-17 15:08:25 -05:00
21f5933e01
Avoid loading plugins that do not match the current plugin api even during installation
2016-01-17 16:08:27 +00:00
8375af268c
Use fixed CN_match for github hosts, fixes #4782
2016-01-17 13:41:56 +00:00
42f49b3b97
fix missing import
2016-01-16 20:47:49 +01:00
b839c7ef1c
Fix code to work with old php, fixes #4779 #4780
2016-01-16 17:59:59 +00:00
974fb4ac66
Only pass remotefilesystem when needed, fixes #4779
2016-01-16 17:45:40 +00:00
d7c61c50ad
Merge branch 'tls-config'
2016-01-16 16:55:19 +00:00
fb848d2e07
Code cleanups
2016-01-16 16:50:28 +00:00
72fae0bf70
Declare CN_match/SNI_server_name only for php <5.6
2016-01-16 16:28:04 +00:00
449f68deae
Remove dangerous CN_match fallback
2016-01-16 16:26:14 +00:00
a0398286ba
Wording fixes
2016-01-16 16:18:00 +00:00
2491679ba3
Remove override of renderException, refs #4774
2016-01-16 11:24:04 +00:00
d2e97eecb2
Replace preg_match by strpos
2016-01-10 20:43:33 +00:00
03299ff075
Suggest https in docs where it makes sense, closes #4056
2016-01-10 20:34:53 +00:00
e4eee227e0
Fix old-php support
2016-01-10 20:25:22 +00:00
c1cc6bfecf
Avoid doing too many loads of the remotefilesystem
2016-01-10 20:06:10 +00:00
fc4d94f160
Code clarity and updates from the getcomposer.org installer
2016-01-10 17:59:08 +00:00
cb53bd04cb
Remove a few instances of RemoteFilesystem that were not needed
2016-01-10 17:07:54 +00:00
86a911150b
Update bundled CAfile and other cleanups
2016-01-10 16:54:44 +00:00
f8dff0867c
Remove --disable-tls/--cafile flags and rely solely on config options plus some wording clarifications
2016-01-10 16:37:11 +00:00
5d015defb8
Merge remote-tracking branch 'origin/master' into tls-config
2016-01-10 16:10:22 +00:00
b056d9ae42
Avoid double xdebug warning with global command
2016-01-10 13:02:20 +00:00
633e9f91a1
Small tweaks for consistency, refs #3639
2016-01-10 12:35:39 +00:00
721acf3c93
Merge remote-tracking branch 'SofHad/update-interactive'
2016-01-10 12:09:10 +00:00
bda2c0f9b7
Re-enable include path even when classmap authoritative is present, refs #4556
2016-01-09 19:12:26 +00:00
e05207dbad
Merge remote-tracking branch 'bp1222/save-loads'
2016-01-09 19:10:39 +00:00
e8bc9232e0
Add explanation about match args in the "no installed package" output, refs #4663
2016-01-09 18:22:59 +00:00
Niels Keurentjes