cee6828abbb87e3fc1757c28f30f8ad3cbd4eb60: Automated merge with http://hg.mozilla.org/labs/weave
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 17:05:25 -0700 - rev 44752
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
e1e0000282fc38df40835ed0b77c4dfaa476e9ac: Bookmark sync test now attempts to add a bookmark on the second computer, then re-sync on the first computer and ensure that the bookmark is copied over.
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 17:05:20 -0700 - rev 44751
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Bookmark sync test now attempts to add a bookmark on the second computer, then re-sync on the first computer and ensure that the bookmark is copied over.
f1ab267f94f2f1fce5ee2571c27b3568eedd8eeb: Branch merge
Anant Narayanan <anant@kix.in> - Wed, 25 Jun 2008 16:34:50 -0700 - rev 44750
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Branch merge
ca4b2222c3f26422804100ac478b4409169b1fbb: Change default server URL to services.mozilla.com
Anant Narayanan <anant@kix.in> - Wed, 25 Jun 2008 16:34:28 -0700 - rev 44749
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Change default server URL to services.mozilla.com
d081cddcf9fc761a403d49c00b89280579559a5f: Merged
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Wed, 25 Jun 2008 15:55:13 -0700 - rev 44748
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Merged
44649eec63a04eb86e6c27a30861d5b4e607af3b: Set up bookmarkEngine._incomingShareOffer to use Myk's new Notification stuff to offer a notification to the user, asking them to accept or reject the incoming share.
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Wed, 25 Jun 2008 15:54:33 -0700 - rev 44747
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Set up bookmarkEngine._incomingShareOffer to use Myk's new Notification stuff to offer a notification to the user, asking them to accept or reject the incoming share.
9b5c0dee9187f08a27054047ddc2e7d4c0e50222: fixed interaction details, all login/verify cases work correctly, final screen creates account and syncs correctly
Maria Emerson <memerson@mozilla.com> - Wed, 25 Jun 2008 15:44:35 -0700 - rev 44746
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
fixed interaction details, all login/verify cases work correctly, final screen creates account and syncs correctly
e7e4defa3d6804a9fb95693f410243bec2054502: Added a number of "real" bookmark sync tests; see test_bookmark_syncing.js for information.
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 14:30:53 -0700 - rev 44745
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Added a number of "real" bookmark sync tests; see test_bookmark_syncing.js for information.
f6c3e10b97b0a72f27085258634e749e3da91e04: bug 436636: a system for showing various kinds of notifications in one consolidated location
Myk Melez <myk@mozilla.org> - Wed, 25 Jun 2008 13:51:39 -0700 - rev 44744
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
bug 436636: a system for showing various kinds of notifications in one consolidated location
ba8a1fe19d4e3fff21217b1ee096be41a8d74eff: the tabs engine needs a constant
Myk Melez <myk@mozilla.org> - Wed, 25 Jun 2008 13:51:32 -0700 - rev 44743
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
the tabs engine needs a constant
2e74a95c7ea521e63a59d6caf57e958bf66c191a: The share/stop sharing menu item is now added only to normal bookmark folders: Not to the main bookmark menu or to magic folders like 'recently tagged' or whatever.
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Wed, 25 Jun 2008 11:58:04 -0700 - rev 44742
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
The share/stop sharing menu item is now added only to normal bookmark folders: Not to the main bookmark menu or to magic folders like 'recently tagged' or whatever.
662d4ae544362ffaa98afd32ca70bf479b0b43f1: Another automated merge. I'm kind of confused at this point, so I hope I'm not breaking anything by mis-merging.
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 04:45:22 -0700 - rev 44741
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Another automated merge. I'm kind of confused at this point, so I hope I'm not breaking anything by mis-merging.
28fbf7bce40aa896291642b6cdb859fd6afde4bd: Automatic merge.
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 04:44:25 -0700 - rev 44740
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Automatic merge.
bd3accb2fccae83cde40c1b902e4a2bf7d01a61a: Changed AsyncException so that it dynamically subclasses the exception it's wrapping, and adds an 'asyncStack' property to allow access to the asynchronous call stack. This, along with my previous few commits, makes the processing of stack traces in our code much more streamlined, and also allows our debugging output to be more informative, as stack information is now logged from the point at which an exception was thrown, rather than the point at which it was caught.
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 04:43:07 -0700 - rev 44739
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Changed AsyncException so that it dynamically subclasses the exception it's wrapping, and adds an 'asyncStack' property to allow access to the asynchronous call stack. This, along with my previous few commits, makes the processing of stack traces in our code much more streamlined, and also allows our debugging output to be more informative, as stack information is now logged from the point at which an exception was thrown, rather than the point at which it was caught. Also renamed some things in async.js to be more descriptive and easier-to-understand, albeit a bit more verbose.
13571441ff63672cef23d1608c1ef7f7fcc17fef: Made exception logging routines more informative and added logtests for them.
Atul Varma <varmaa@toolness.com> - Wed, 25 Jun 2008 00:13:36 -0700 - rev 44738
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Made exception logging routines more informative and added logtests for them.
16328ae5765cd45fb7ab622502abc48f57bd4a9a: Fixed something that I should've changed in my last commit; also removed a call to Utils.stackTrace() that shouldn't have been made.
Atul Varma <varmaa@toolness.com> - Tue, 24 Jun 2008 19:58:50 -0700 - rev 44737
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Fixed something that I should've changed in my last commit; also removed a call to Utils.stackTrace() that shouldn't have been made.
50370911ef24d4c2f00751d6375e28a51d7e7103: fix login calls, do login and sync on final screen, add try again link to server errors throughout
Maria Emerson <memerson@mozilla.com> - Wed, 25 Jun 2008 04:43:13 -0700 - rev 44736
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
fix login calls, do login and sync on final screen, add try again link to server errors throughout
83a955a47d0404e8f5a43e0f11f91a39361efc15: bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
Myk Melez <myk@mozilla.org> - Wed, 25 Jun 2008 01:56:17 -0700 - rev 44735
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
fb21be8385f75574c34f6c699b8de2abf06473d7: bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
Myk Melez <myk@mozilla.org> - Tue, 24 Jun 2008 17:45:37 -0700 - rev 44734
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
bug 441446: set mozBackgroundRequest on XMPP request object when created rather than when used, since it only needs to be set once
3d03b79e0ba7609f2da3ed9824959c82ed5bd588: Split account verification out from login(), make wizard work for using an existing account, related code cleanup/simplification
Justin Dolske <dolske@mozilla.com> - Wed, 25 Jun 2008 00:22:53 -0700 - rev 44733
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Split account verification out from login(), make wizard work for using an existing account, related code cleanup/simplification
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip