Dan Mills
33bac67100
merge upstream changes
2008-07-08 16:34:52 -07:00
Dan Mills
1a6a8397c4
Bug 444119: catch errors during a lock and avoid a deadlock
2008-07-08 16:34:27 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
386784122b
Removed debugging dump statements from dav.js.
2008-07-08 14:37:51 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2895b903a2
Fixed another trivial bug in BookmarkSharingManager._stopSharing that was making it fail at sending out the xmpp notification.
2008-07-08 14:19:26 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
55ec19cf3c
Fixed some trivial bugs in BookmarkStore._wrapMountOutgoing that were preventing the outgoing share from working properly.
2008-07-08 14:15:55 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
2b8d2d7cb3
Factored the sending of xmpp notifications in bookmarkSharingManager out into a separate function, to save some duplicated code and make it easier to break xmpp stuff into a separate class later. Also made the bookmarkSharingManager cache the current weave username, which it uses a lot. Finally it now prepends /user/this._myUsername/ to server URLs to make them into absolute paths before sending them to the sharing partner over xmpp, which fixes a leftover TODO from a copule days ago.
2008-07-08 14:11:21 -07:00
Dan Mills
b0bede9548
sigh, my previous unlock change actually breaks unlock. fix fix fix.
2008-07-08 13:56:03 -07:00
Dan Mills
13c049d2de
merge upstream changes
2008-07-08 11:59:28 -07:00
Dan Mills
31a5149a4c
check that we have a local lock token before trying to delete it (or 'delete' will fail)
2008-07-08 11:58:59 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
acf0d0ded8
Merged
2008-07-08 01:18:40 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
1cf9a1dea9
Fixed a bunch of bugs in bookmark share: stuf related to server-side paths being incorrect (because the defaultPrefix in DAV was getting reset to an empty string or was getting applied wrong). Discovered that updateOutgoingShare and updateIncomingShare were both calling the same _wrapMount() function, which was incorrect, so I broke that up and fixed what parts are meant to be outgoing and which incoming.
2008-07-08 01:18:30 -07:00
Dan Mills
54a2a8a785
Bug 443385: unconditionally remove saved local token, regardless of whether the UNLOCK command succeeded; also cleans up some variable naming re: local locks in dav.js; cosmetic changes in wrap.js
2008-07-07 22:30:32 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
9cfef4be35
Fixed a whole bunch of bugs in bookmark share, mostly related to adding in needed JsonFilters for remote Resources and fixing the server paths which are passed into DAV for the keyring file and encrypted share data files. (Also fixed a minor bug in DAV itself so that mkcol won't quit right away if you pass it something that starts with a slash.)
2008-07-03 17:57:21 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
6732077b30
Merged
2008-07-01 14:41:12 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
f11ad3f3e3
Updated a couple of comments in bookmark sharing
2008-07-01 14:41:04 -07:00
Atul Varma
d70f1743f8
Automated merge with http://hg.mozilla.org/labs/weave
2008-07-01 12:03:12 -07:00
Atul Varma
7303b375dc
Refactored the exception-handling code a bit and made traces produced by async look more like they used to.
2008-07-01 12:03:05 -07:00
Myk Melez
c5d6255581
make sure nsIObserverService notifications have subjects before accessing the subjects' wrappedJSObject properties
2008-07-01 11:29:20 -07:00
Atul Varma
0013cac9d2
Automated merge with http://hg.mozilla.org/labs/weave
2008-07-01 11:12:53 -07:00
Atul Varma
71372f5452
Tracebacks for async coroutines now provide a 'best guess' for where the coroutine was at the time that an exception was thrown, by showing the frame at which the generator's last continuation callback was created.
...
Added a 'location' property to RequestException, analogous to the 'location' property of wrapped nsIExceptions, so that tracebacks can be made for the exceptions if needed.
2008-07-01 11:12:00 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
11dda58df6
Fixed yet another typo: this._sharing._share, not this._sharing.share.
2008-07-01 10:35:15 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
b7f7372c9f
Fixed typo where undefined value was getting passed into share and stopSharing: should be node.itemId, not node.id
2008-07-01 10:31:16 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
fd7f338963
Fixed missing import
2008-07-01 10:27:19 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
a410545ba4
Fixed another typo
2008-07-01 10:26:01 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
fcb7743ce0
Fixed typo in BookmarkSharingManager._bms initialization
2008-07-01 10:24:52 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
10d9360015
Merged
2008-07-01 10:18:43 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
ba7249a10a
Made _share() and _stopSharing() take bookmark item ID numbers instead of XUL nodes.
2008-07-01 10:18:35 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
aa859a7626
Made _stopSharing and _stopOutgoingShare more fault-tolerant (they will no longer die if the expected annotation is missing.
2008-07-01 09:58:00 -07:00
Dan Mills
1556cc4511
version bump (0.2.0)
2008-07-01 00:04:47 -07:00
Dan Mills
e53b8d1689
merge upstream changes
2008-06-30 23:42:00 -07:00
Dan Mills
44c908db91
save username/pass in verifyLogin, at least for now
2008-06-30 23:41:47 -07:00
Atul Varma
994e224c7d
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-30 23:36:06 -07:00
Atul Varma
e04369a218
Modified sharing.js to obey the new sharing api.
2008-06-30 23:36:00 -07:00
Myk Melez
b4026a6a34
fix capitalization
2008-06-30 23:29:28 -07:00
Dan Mills
d46d7162d6
merge upstream changes
2008-06-30 23:26:49 -07:00
Dan Mills
802f7a254d
fix cookie command logging; skip cookie commands for items we don't have
2008-06-30 23:26:35 -07:00
Dan Mills
e9d12f341f
continue if there is an edit command for an item we don't have (just print a warning)
2008-06-30 23:25:51 -07:00
Dan Mills
4c4dfecbc8
fix a missing yield, split up a couple of lines for clarity
2008-06-30 23:25:15 -07:00
Myk Melez
e4cb103b4d
bug 442849: correct inconsistencies and grammar nits in wizard text
2008-06-30 22:58:51 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
5d960d2e8f
Combined shareData and stopSharingData into one function to reuse code; made it so that if it gets called when Weave.DAV is already locked, instead of failing it sets up an observer that will trigger the share to happen as soon as the sync-succeeded or sync-failed message is received.
2008-06-30 22:30:04 -07:00
Maria Emerson
9744c24f33
image update
2008-06-30 21:05:18 -07:00
Atul Varma
63d8b214f5
Fixed a todo in test_bookmark_sharing, still more left to do as jono's modifications to the bookmark sharing API change.
2008-06-30 19:27:39 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
4bfcb30b17
Merge
2008-06-30 18:50:19 -07:00
jonathandicarlo@jonathan-dicarlos-macbook-pro.local
dae06b83f1
Added test_bookmark_sharing to version control; note this doesn't pass right now (and in fact the main test is commented out.)
2008-06-30 18:50:06 -07:00
Dan Mills
dc359f7ca3
update URLs to services.mozilla.com/
2008-06-30 18:49:46 -07:00
Atul Varma
d99bde9ec1
Automated merge with http://hg.mozilla.org/labs/weave
2008-06-30 18:09:35 -07:00
Atul Varma
07f3aacf01
Added documentation for Service._getKeypair().
2008-06-30 18:09:30 -07:00
Maria Emerson
49ae4dd579
reverted back to original weave logo, increased wizard height for linux problem, added passphrase verification
2008-06-30 18:00:55 -07:00
Atul Varma
aa2cab9380
The auto-login at startup no longer unconditionally syncs; if the login fails, the sync is now aborted.
2008-06-30 17:55:48 -07:00
Atul Varma
d7ff36daab
Fixed a bug from r5a5113a0a405 that caused some syncing unit tests to fail.
2008-06-30 16:55:38 -07:00
