1b1646022e0114de88b5986c8824bb88a1d78d92: In async.js, renamed 'object' to 'thisArg', which makes the code clearer and easier to understand.
Atul Varma <varmaa@toolness.com> - Fri, 06 Jun 2008 17:46:34 -0700 - rev 44540
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
In async.js, renamed 'object' to 'thisArg', which makes the code clearer and easier to understand.
4c2365963536b1e87b7a2ac0ddd565cd4a0b095c: Resolved conflicts with Chris's changes (to use the username, unhashed, as the name of the server-side sharing directory)
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Fri, 06 Jun 2008 17:43:15 -0700 - rev 44539
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Resolved conflicts with Chris's changes (to use the username, unhashed, as the name of the server-side sharing directory)
aa201e65171eaaae43e6ac050d3bb4cc0535357b: Moved _createShare and _share() from engines.js to BookmarkEngine class in engines/bookmarks.js. The identity of the folder to be shared is now passed from the share dialog box (share.xul) into BookmarkEngine._share().
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Fri, 06 Jun 2008 17:33:44 -0700 - rev 44538
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Moved _createShare and _share() from engines.js to BookmarkEngine class in engines/bookmarks.js. The identity of the folder to be shared is now passed from the share dialog box (share.xul) into BookmarkEngine._share().
87cd69d5f6553d7baad3a99717ba28fe1e0de368: - turning in the bookmarks sharing UI, although it's still not fully functional.
chris@h-194.office.mozilla.org - Fri, 06 Jun 2008 14:40:35 -0700 - rev 44537
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
- turning in the bookmarks sharing UI, although it's still not fully functional.
ad1748dbbb90504c3e4889b0e28a01a94ce95881: - this check in will break everyone temporarily, as it involves the changes necessary to shift us from sha1(email) to usernames, and to enable sharing on the server.
chris@h-194.office.mozilla.org - Fri, 06 Jun 2008 14:18:50 -0700 - rev 44536
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
- this check in will break everyone temporarily, as it involves the changes necessary to shift us from sha1(email) to usernames, and to enable sharing on the server. - we are also changing the default preferences on the trunk to point to the new staging server at https://sm-labs01.mozilla.org:81 that has been modified to support usernames - everyone will need to create a new account and this will be streamlined within the startup function, which will now kick off on first run (we'll check in the updated setup wizard shortly) - this checkin also cleans up a number of strings
d80192ae088cc173c26fb68e477b3459484e954d: Fix linux builds (bug 433922, r=thunder)
Anant Narayanan <anant@kix.in> - Thu, 05 Jun 2008 17:21:53 -0700 - rev 44535
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Fix linux builds (bug 433922, r=thunder)
01761fa83cc2ba4f302d4490a542d563cfda4896: bug 437523: fix NS_ERROR_FAILURE on nsIJSON.decode in JsonFilter_afterGET
Myk Melez <myk@mozilla.org> - Thu, 05 Jun 2008 16:25:55 -0700 - rev 44534
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
bug 437523: fix NS_ERROR_FAILURE on nsIJSON.decode in JsonFilter_afterGET
ef3a83d752957688a6a44221a3c4cb9e0f6f86d7: Re-disabled test_xmpp_simple.js; it shouldn't be run without a local jabber server (and it wasn't, until I accidentally comitted my local change enabling the test.
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Thu, 05 Jun 2008 12:18:16 -0700 - rev 44533
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Re-disabled test_xmpp_simple.js; it shouldn't be run without a local jabber server (and it wasn't, until I accidentally comitted my local change enabling the test.
e00bfcb9653f72b107d5822ae8fe62cdcb643aba: merge upstream changes
Dan Mills <thunder@mozilla.com> - Thu, 05 Jun 2008 23:11:20 +0900 - rev 44532
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
merge upstream changes
eb356e98057c910692513a6901fa4f73e71c70dc: create objects for the various server resources (these will later abstract away the actual resources); fix a bug where we were reversing the order of resource filters on every GET request
Dan Mills <thunder@mozilla.com> - Thu, 05 Jun 2008 16:17:32 +0900 - rev 44531
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
create objects for the various server resources (these will later abstract away the actual resources); fix a bug where we were reversing the order of resource filters on every GET request
482492ceba9cd65386ca4fac555c04d971cac834: Bug 436303: Fix misspelling
Dan Mills <thunder@mozilla.com> - Wed, 04 Jun 2008 23:07:07 +0900 - rev 44530
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Bug 436303: Fix misspelling
522883c8ec9e5d3eaba327320f280c0017e05933: log stack traces from sync exceptions
Dan Mills <thunder@mozilla.com> - Mon, 02 Jun 2008 13:02:04 +0900 - rev 44529
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
log stack traces from sync exceptions
d2186276217db78f6f1e57e04363f09470fe4eb2: Merged
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Wed, 04 Jun 2008 20:30:56 -0700 - rev 44528
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
Merged
62c65454e9a35283c16a6aa34add06e674d0fdee: The menu icon of a bookmark folder now changes when that folder is being shared out with others.
jonathandicarlo@jonathan-dicarlos-macbook-pro.local - Wed, 04 Jun 2008 20:30:37 -0700 - rev 44527
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
The menu icon of a bookmark folder now changes when that folder is being shared out with others.
68f9eab7d3badcc2a55555c1747599801cb503ed: imported patch xmpp-transport-fault-tolerance-and-test
Dietrich Ayala <dietrich@mozilla.com> - Wed, 04 Jun 2008 18:34:37 -0700 - rev 44526
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
imported patch xmpp-transport-fault-tolerance-and-test
fcfc54883a06b44e4f7a8df69b4db72c3a218d8f: xmpp-stream-error-handling
Dietrich Ayala <dietrich@mozilla.com> - Wed, 04 Jun 2008 17:36:37 -0700 - rev 44525
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
xmpp-stream-error-handling
1c020f5a90dfd17eaabcbe20bcb6c7ece5b6dadd: [mq]: xmpp-reconnect
Dietrich Ayala <dietrich@mozilla.com> - Wed, 04 Jun 2008 17:00:02 -0700 - rev 44524
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
[mq]: xmpp-reconnect
19f5eaf95247b22d9d06cb28cbf02d2e61f3d95a: [mq]: xmpp-disconnect
Dietrich Ayala <dietrich@mozilla.com> - Wed, 04 Jun 2008 14:02:47 -0700 - rev 44523
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
[mq]: xmpp-disconnect
5ec3f2a0678306326884e0ac981e4751a5e191ff: bug 436696: make sure we pass a valid URI to nsITaggingService::getTagsForURI when the bookmark record doesn't include a URI so the method doesn't throw and hork bookmarks sync
Myk Melez <myk@mozilla.org> - Wed, 04 Jun 2008 13:40:53 -0700 - rev 44522
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
bug 436696: make sure we pass a valid URI to nsITaggingService::getTagsForURI when the bookmark record doesn't include a URI so the method doesn't throw and hork bookmarks sync
2b4fdc8bd8d5360415319a40e8b786889f71c621: [mq]: xmpp-cleanup
Dietrich Ayala <dietrich@mozilla.com> - Wed, 04 Jun 2008 12:14:28 -0700 - rev 44521
Push 14033 by edward.lee@engineering.uiuc.edu at Wed, 23 Jun 2010 22:21:35 +0000
[mq]: xmpp-cleanup
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip