01bd5d3594a09e920709dd39077064daba79a296: merge upstream changes
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 17:28:46 -0700 - rev 44793
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
merge upstream changes
b7e38d8492281fb6f06ba52e6cd38355f1435a45: bump version to 0.1.32, storage format version (global & engine) to 3
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 17:28:30 -0700 - rev 44792
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
bump version to 0.1.32, storage format version (global & engine) to 3
caa040e41300449c53ecb84761b04ea3b7c879f8: Merged
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Thu, 26 Jun 2008 17:26:31 -0700 - rev 44791
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Merged
1ca8407589c0098910a0e3e6686194773c666dec: Removed unneeded atob() and btoa() definitions from authenticationLayer.
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Thu, 26 Jun 2008 17:26:21 -0700 - rev 44790
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Removed unneeded atob() and btoa() definitions from authenticationLayer.
5d7003b9641067711999739ca10779c37455bf99: branch merge
Maria Emerson <memerson@mozilla.com> - Thu, 26 Jun 2008 17:11:30 -0700 - rev 44789
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
branch merge
fe37a870f262c2b397da5c28d5707e4ac65b4c9b: fixed captcha screen
Maria Emerson <memerson@mozilla.com> - Thu, 26 Jun 2008 17:08:44 -0700 - rev 44788
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
fixed captcha screen
f6bff896df6ff6b8bc3aa5513eea8de9743e8a78: Merged
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Thu, 26 Jun 2008 17:01:12 -0700 - rev 44787
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Merged
bc621930f193ce578ba098667dc24f89e3a55f23: Fixed several minor bugs with bookmark sharing
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Thu, 26 Jun 2008 17:00:55 -0700 - rev 44786
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Fixed several minor bugs with bookmark sharing
1d6a9215fe5dee6cbefc5b7f32fa0858dd0db8c9: For developer release, made bookmark sharing and xmpp preferences default to false
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Thu, 26 Jun 2008 12:07:38 -0700 - rev 44785
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
For developer release, made bookmark sharing and xmpp preferences default to false
03b5bb5b81bd4c8fc107bb5b0f27261f5161c35f: Oops, forgot to revalidate logs in my last commit.
Atul Varma <varmaa@toolness.com> - Thu, 26 Jun 2008 17:00:01 -0700 - rev 44784
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Oops, forgot to revalidate logs in my last commit.
6b9b62796296e89cae7d8f96dc3337fcc5a40287: Fixed a typo, added an explicit check in test_bookmark_syncing.
Atul Varma <varmaa@toolness.com> - Thu, 26 Jun 2008 16:59:25 -0700 - rev 44783
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Fixed a typo, added an explicit check in test_bookmark_syncing.
69a9be37804d07fb26e84b533e2714769ebc6095: merge upstream changes
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 16:38:00 -0700 - rev 44782
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
merge upstream changes
7a757923e07af6978411193a676b64354672db2b: don't even try to sync when the local lock is taken
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 16:37:38 -0700 - rev 44781
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
don't even try to sync when the local lock is taken
5256cb9e1cb4cbc981c06cea13ee1dcb69f1a607: Automated merge with http://hg.mozilla.org/labs/weave
Atul Varma <varmaa@toolness.com> - Thu, 26 Jun 2008 16:28:55 -0700 - rev 44780
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Automated merge with http://hg.mozilla.org/labs/weave
f7bf0ccac44f3f4525bbb2f5ed8461e70aab407a: Added a bookmark sync test that exercises the commandLike() method by adding two identical bookmarks with different GUIDs to different profiles and then syncing.
Atul Varma <varmaa@toolness.com> - Thu, 26 Jun 2008 16:28:44 -0700 - rev 44779
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Added a bookmark sync test that exercises the commandLike() method by adding two identical bookmarks with different GUIDs to different profiles and then syncing.
36934a5b6f5fa0d565c523eb09fe01377673a9cc: Added an additional check in stores.js to prevent a strict warning from appearing.
Atul Varma <varmaa@toolness.com> - Thu, 26 Jun 2008 16:27:54 -0700 - rev 44778
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
Added an additional check in stores.js to prevent a strict warning from appearing.
760741a52fe7a261ef8c93cb05c1b0094fc4f92c: when we abort a lock request because we already hold a token, reset _lockAllowed to allow further requests for locks
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 16:26:14 -0700 - rev 44777
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
when we abort a lock request because we already hold a token, reset _lockAllowed to allow further requests for locks
cb86d2934d9e67adbacc1ec964a99c0d624fe35f: fix unit test makefile so it works on windows (no symlinks on windows, boo)
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 16:09:22 -0700 - rev 44776
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
fix unit test makefile so it works on windows (no symlinks on windows, boo)
21c85163633e0cbbd34369df2b2aa4f42b4910b0: merge upstream changes
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 15:37:55 -0700 - rev 44775
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
merge upstream changes
508508466c11e7eb6387ba262bb02a4f76dab325: disabling password sync by default due to bug 438356
Dan Mills <thunder@mozilla.com> - Thu, 26 Jun 2008 15:37:30 -0700 - rev 44774
Push 1 by root at Tue, 26 Apr 2011 22:38:44 +0000
disabling password sync by default due to bug 438356
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip