a861ed0bfdff8bb6327973a9061e48747088c13a: Automated merge with http://hg.mozilla.org/labs/weave
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 23:36:06 -0700 - rev 44863
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Automated merge with http://hg.mozilla.org/labs/weave
0587eb06d2906f087672ab7791f0f264f30a1293: Modified sharing.js to obey the new sharing api.
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 23:36:00 -0700 - rev 44862
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Modified sharing.js to obey the new sharing api.
16d47211c135e2bf0e8441062d4ed9c576f09937: fix capitalization
Myk Melez <myk@mozilla.org> - Mon, 30 Jun 2008 23:29:28 -0700 - rev 44861
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
fix capitalization
4be408186e63be8f2151704dca3e18e71fc6166c: merge upstream changes
Dan Mills <thunder@mozilla.com> - Mon, 30 Jun 2008 23:26:49 -0700 - rev 44860
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
merge upstream changes
24533ce49adc4a507909b2cbb66c0ec077b040ee: fix cookie command logging; skip cookie commands for items we don't have
Dan Mills <thunder@mozilla.com> - Mon, 30 Jun 2008 23:26:35 -0700 - rev 44859
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
fix cookie command logging; skip cookie commands for items we don't have
8da2fa569698701d8d7e16dbc1ba6f30cece81d3: continue if there is an edit command for an item we don't have (just print a warning)
Dan Mills <thunder@mozilla.com> - Mon, 30 Jun 2008 23:25:51 -0700 - rev 44858
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
continue if there is an edit command for an item we don't have (just print a warning)
8e299aa505a0163cb820ca453d0e4ba5b4ff5125: fix a missing yield, split up a couple of lines for clarity
Dan Mills <thunder@mozilla.com> - Mon, 30 Jun 2008 23:25:15 -0700 - rev 44857
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
fix a missing yield, split up a couple of lines for clarity
5ebe63d818b085c03e37d8d5dcc3538bf748aca9: bug 442849: correct inconsistencies and grammar nits in wizard text
Myk Melez <myk@mozilla.org> - Mon, 30 Jun 2008 22:58:51 -0700 - rev 44856
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
bug 442849: correct inconsistencies and grammar nits in wizard text
53e3b399ac9fc324fcf782f66204f524fd45b944: image update
Maria Emerson <memerson@mozilla.com> - Mon, 30 Jun 2008 21:05:18 -0700 - rev 44855
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
image update
527b831a048471b73148ae759b16af4385284cf0: Fixed a todo in test_bookmark_sharing, still more left to do as jono's modifications to the bookmark sharing API change.
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 19:27:39 -0700 - rev 44854
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Fixed a todo in test_bookmark_sharing, still more left to do as jono's modifications to the bookmark sharing API change.
2f8daaa87bcb88331a8c269fa136d27c0fb623c0: Merge
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Mon, 30 Jun 2008 18:50:19 -0700 - rev 44853
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Merge
7fef0f8aeb36535cbc7f9cbec005c09f426ebc1a: Added test_bookmark_sharing to version control; note this doesn't pass right now (and in fact the main test is commented out.)
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Mon, 30 Jun 2008 18:50:06 -0700 - rev 44852
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Added test_bookmark_sharing to version control; note this doesn't pass right now (and in fact the main test is commented out.)
c60b095c113bf6ebbef560cc4fd6d5f6214cf319: update URLs to services.mozilla.com/
Dan Mills <thunder@mozilla.com> - Mon, 30 Jun 2008 18:49:46 -0700 - rev 44851
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
update URLs to services.mozilla.com/
bc5e449c14c65dbb34d28edd49c36c4078ebd203: Automated merge with http://hg.mozilla.org/labs/weave
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 18:09:35 -0700 - rev 44850
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Automated merge with http://hg.mozilla.org/labs/weave
d92c8d0e45044bb187792897542296665d47301f: Added documentation for Service._getKeypair().
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 18:09:30 -0700 - rev 44849
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Added documentation for Service._getKeypair().
160a7147243ae4d363a32265b138c31d4fff00b3: reverted back to original weave logo, increased wizard height for linux problem, added passphrase verification
Maria Emerson <memerson@mozilla.com> - Mon, 30 Jun 2008 18:00:55 -0700 - rev 44848
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
reverted back to original weave logo, increased wizard height for linux problem, added passphrase verification
220fe9d0125e8e7a556618adb9da5906cfc52663: The auto-login at startup no longer unconditionally syncs; if the login fails, the sync is now aborted.
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 17:55:48 -0700 - rev 44847
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
The auto-login at startup no longer unconditionally syncs; if the login fails, the sync is now aborted.
1dffa440e5dde7591d3f833c26daac2eeae52aca: Fixed a bug from r5a5113a0a405 that caused some syncing unit tests to fail.
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 16:55:38 -0700 - rev 44846
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Fixed a bug from r5a5113a0a405 that caused some syncing unit tests to fail.
daf0258221d871eee58aac9d9cb56798f7d24575: Added a Service.verifyPassphrase() method. Also, Service.login() now checks to ensure that the user's passphrase is valid, and if it's not, it throws an exception.
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 16:50:19 -0700 - rev 44845
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Added a Service.verifyPassphrase() method. Also, Service.login() now checks to ensure that the user's passphrase is valid, and if it's not, it throws an exception.
0e5fb6366d1b2c7f2d520ad6d849c1e56654c066: Automated merge with http://hg.mozilla.org/labs/weave
Atul Varma <varmaa@toolness.com> - Mon, 30 Jun 2008 15:54:21 -0700 - rev 44844
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Automated merge with http://hg.mozilla.org/labs/weave
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip