376 Commits

Author SHA1 Message Date
André Cruz
481e6bc498 Bump version. v0.7.0 2013-02-01 00:36:40 +00:00
André Cruz
8aa1fb33b6 Update change log. 2013-02-01 00:36:17 +00:00
André Cruz
2c992f1ece Fix some minor issues, closes #214. 2013-02-01 00:25:13 +00:00
André Cruz
9ac919b7af Simplify util/save. 2013-02-01 00:22:31 +00:00
André Cruz
755d87338d Add --force-latest flag to allow conflict resolution, #214. 2013-01-31 23:16:27 +00:00
André Cruz
12fd86e681 Avoid escaping in the templates (no need for them in the console). 2013-01-31 23:03:43 +00:00
André Cruz
d7b465359c Use the original tags if defined in the conflict resolution messages, #214. 2013-01-31 20:27:54 +00:00
André Cruz
63ecde0ea7 Merge branch 'master' of github.com:twitter/bower 2013-01-31 20:02:47 +00:00
André Cruz
44bfa55bee Finish up conflict resolution logic, #214.
Some refactoring.
2013-01-31 20:02:30 +00:00
André Cruz
520e1c4def Fix the way errors are thrown in tests. 2013-01-31 19:58:29 +00:00
André Cruz
6a63f97ce8 Add test for resolved deps, #214. 2013-01-31 19:56:25 +00:00
André Cruz
6195281e70 Merge pull request #227 from twitter/ignore
Remove ignore paths from .json
2013-01-31 10:57:33 -08:00
David DeSandro
ad359e2659 dot option in glob for ignore 2013-01-31 13:54:54 -05:00
David DeSandro
a8a4f6fd2c push.apply to add json.ignore 2013-01-30 22:40:37 -05:00
David DeSandro
0cb38676ef test - should remove .git directory 2013-01-30 22:38:31 -05:00
André Cruz
02e3ed4588 Fix some more issues with reading package local configuration, closes #205.
Complete the tests regarding this issue.
2013-01-31 01:29:07 +00:00
André Cruz
0b2aa433c5 Merge pull request #226 from manuel-woelker/issue-205-b
manager: test for #205 (Using another name for .json file leads to unfetchable deps)
2013-01-30 16:43:01 -08:00
David DeSandro
41a992e42a add ignore json to README 2013-01-30 11:36:52 -05:00
David DeSandro
5d45b04b22 fix binding install;
add test for removing ignorables
2013-01-30 11:29:06 -05:00
David DeSandro
3b0d8b37e7 Merge branch 'master' into ignore
Conflicts:
	lib/core/package.js
2013-01-30 11:03:06 -05:00
David DeSandro
f026c6238d add package-ignorables for testing 2013-01-30 10:59:29 -05:00
David DeSandro
d6cb0736d6 use async.forEach in removeLocalPaths 2013-01-30 10:10:44 -05:00
Manuel Woelker
8488c657af manager: test for #205 (Using another name for .json file leads to unfetchable deps) 2013-01-30 12:49:03 +01:00
David DeSandro
e2b94620ad refactor removeLocalPaths with forEachPromise helper
sorta kinda cleans it up
2013-01-29 18:14:52 -05:00
David DeSandro
254dab3da7 use glob for path matching
in promise hell
2013-01-29 17:44:40 -05:00
André Cruz
42f090840c White up versions in the conflict. 2013-01-29 19:33:41 +00:00
André Cruz
e5f40350d2 Fix tests due to the way conflicts are handled, #214. 2013-01-29 19:33:19 +00:00
André Cruz
584736ad90 Fix typo in changelog. 2013-01-29 19:29:37 +00:00
André Cruz
30f2092cc2 Update CHANGELOG.md 2013-01-29 17:49:59 +00:00
André Cruz
c52ad6fb7c More fixes related with previous commit, #205. 2013-01-29 17:47:11 +00:00
André Cruz
06f6c37add Fix previous commit, #205. 2013-01-29 17:31:19 +00:00
André Cruz
00aaeb9305 Obey local packages .bowerrc config and fallback to generic one, #205. 2013-01-29 17:23:26 +00:00
André Cruz
ca9cb2f61b Fix tags being added to non-repo packages in update, fixes #197. 2013-01-29 16:12:39 +00:00
André Cruz
a8c72398ba Better error messages for invalid bowerrc files, closes #220. 2013-01-29 15:07:25 +00:00
André Cruz
01bd65f8e6 Slightly better error message. 2013-01-29 14:58:07 +00:00
André Cruz
a0c7e5df57 Print a good detail message when a conflict occurs and ways to resolve it, #214. 2013-01-29 14:42:46 +00:00
André Cruz
9240a982d6 Make errors sync when logging. 2013-01-29 14:41:50 +00:00
André Cruz
1d3d37034f Initial sketch to solve issue #214. 2013-01-29 01:35:52 +00:00
David DeSandro
913acabdd2 add removeLocalPaths 2013-01-28 17:35:18 -05:00
David DeSandro
abbeff8126 README : Add non-registered dependencies
Ref #210
2013-01-28 11:39:15 -05:00
David DeSandro
ecfb439543 use ** for bolds.
It was messing with my Markdown syntax parser 👾
2013-01-28 11:37:38 -05:00
André Cruz
53f7b6c704 Update change log. 2013-01-27 15:42:16 +00:00
André Cruz
9623f44d83 Fix mismatch issue, #214. 2013-01-27 15:27:01 +00:00
Sindre Sorhus
fe9e0dd8c1 Merge pull request #213 from risseraka/patch-1
updating ~/.bowerrc in doc
2013-01-23 08:42:24 -08:00
Adrien Risser
d5b351cd38 updating ~.bowerrc in doc 2013-01-23 16:47:09 +01:00
Sindre Sorhus
0106c10483 Merge pull request #203 from alexnormand/master
Fixed typo in "Windows users" README section
2013-01-12 14:07:33 -08:00
Alex Normand
d6e742012e fixed typo in "Windows users" README section 2013-01-12 23:03:07 +01:00
Sindre Sorhus
4dc4cfdbcf readme - improve text regarding completion 2013-01-12 14:36:36 +01:00
Sindre Sorhus
8220514307 Merge pull request #199 from jsjohns/patch-1
Fix typo.
2013-01-09 10:55:13 -08:00
Joshua Johnson
1d06f7e93c Fix typo. 2013-01-09 13:27:17 -05:00