90542900ba59dfe6dda990e94264418f1b8ef97e: bump version to 0.2.6
Dan Mills <thunder@mozilla.com> - Fri, 08 Aug 2008 15:14:04 -0700 - rev 44994
bump version to 0.2.6
5ffe9b279c9d6146adc674ed848c976bd50ab79c: merge upstream changes
Dan Mills <thunder@mozilla.com> - Fri, 08 Aug 2008 14:43:36 -0700 - rev 44993
merge upstream changes
07d02a30011e20c9ac930a26a86ec84e6364cfc3: move some code from the engine to remote.js; rename FileEngine to BlobEngine (since it doesn't actually sync complete files); clean up SyncEngine's sync method
Dan Mills <thunder@mozilla.com> - Fri, 08 Aug 2008 14:42:57 -0700 - rev 44992
move some code from the engine to remote.js; rename FileEngine to BlobEngine (since it doesn't actually sync complete files); clean up SyncEngine's sync method
4ac7c3f81d80a6901f3b0e9936b9b661cd996e9c: small fix in _fixParents; change reconcile to 1) not require a deepEquals to drop an incoming/outgoing command pair, merely a GUID match (we can do this because we know we'll drop server changes and use client ones, and because we know we'll actually do a fresh diff at the end to send commands to the server), and 2) check for creates of existing guids after the first pass (since we might find command pairs that go away and thus not hit that error)
Dan Mills <thunder@mozilla.com> - Fri, 08 Aug 2008 14:40:52 -0700 - rev 44991
small fix in _fixParents; change reconcile to 1) not require a deepEquals to drop an incoming/outgoing command pair, merely a GUID match (we can do this because we know we'll drop server changes and use client ones, and because we know we'll actually do a fresh diff at the end to send commands to the server), and 2) check for creates of existing guids after the first pass (since we might find command pairs that go away and thus not hit that error)
37dac54975252cdfb0d06d22422ca130a9a5c0a0: whitespace fix
Dan Mills <thunder@mozilla.com> - Fri, 08 Aug 2008 12:34:01 -0700 - rev 44990
whitespace fix
a152624d1c47cd3c5282178ad9d89484d1e66d4a: Automated merge with ssh://anarayanan@mozilla.com@hg.mozilla.org/labs/weave
Anant Narayanan <anant@kix.in> - Thu, 07 Aug 2008 20:00:46 -0700 - rev 44989
Automated merge with ssh://anarayanan@mozilla.com@hg.mozilla.org/labs/weave
80d84c99d0aade97d3f5cf742b713e3fe0f98f97: Syncing for Awesome bar (bug 437133, r=thunder)
Anant Narayanan <anant@kix.in> - Thu, 07 Aug 2008 20:00:35 -0700 - rev 44988
Syncing for Awesome bar (bug 437133, r=thunder)
27b45dd518e6a4c29a46960dd164ea8f318c4aba: Fix a typo that could cause an error in appendDelta()
Dan Mosedale <dmose@mozilla.org> - Wed, 06 Aug 2008 14:51:41 -0700 - rev 44987
Fix a typo that could cause an error in appendDelta()
39f8d9f94c1db4de09a74bda946d338ed6f81e98: Client-side OAuth support (bug 444528, r=thunder)
Anant Narayanan <anant@kix.in> - Mon, 04 Aug 2008 17:34:21 -0700 - rev 44986
Client-side OAuth support (bug 444528, r=thunder)
956305b06a80a9bc5754312063e9c40ab33aa4b9: Automated merge with ssh://anarayanan@mozilla.com@hg.mozilla.org/labs/weave
Anant Narayanan <anant@kix.in> - Mon, 04 Aug 2008 17:23:36 -0700 - rev 44985
Automated merge with ssh://anarayanan@mozilla.com@hg.mozilla.org/labs/weave
6de780d21579afde1d40e9f8a5549bffe7bade58: Asynchronous bookmark sharing (bug 449113, r=thunder)
Anant Narayanan <anant@kix.in> - Mon, 04 Aug 2008 17:23:23 -0700 - rev 44984
Asynchronous bookmark sharing (bug 449113, r=thunder)
2352e7244c6c85ff9a842047525a42d1c6e109a1: refresh clients on a timer when changed via the prefpane, otherwise just wait until next sync
Dan Mills <thunder@mozilla.com> - Thu, 31 Jul 2008 01:59:03 -0700 - rev 44983
refresh clients on a timer when changed via the prefpane, otherwise just wait until next sync
500130b859c755bdfff349f58db0481920b20279: sync client data when client prefs change
Dan Mills <thunder@mozilla.com> - Thu, 31 Jul 2008 01:02:41 -0700 - rev 44982
sync client data when client prefs change
1e2147c7eabbbe1d3df76fa630ac599162019510: UI for clients
Chris Beard <chris@mozilla.org> - Thu, 31 Jul 2008 00:39:57 -0700 - rev 44981
UI for clients
f9b6f10e8a822cb6ebeeec1f189bde3d12645e82: merge upstream changes
Dan Mills <thunder@mozilla.com> - Thu, 31 Jul 2008 00:21:53 -0700 - rev 44980
merge upstream changes
ef85392cc4cf85b1b3ea3de0b3b4e2846dee635a: filter out invalid tags when applying edit commands
Dan Mills <thunder@mozilla.com> - Thu, 31 Jul 2008 00:21:22 -0700 - rev 44979
filter out invalid tags when applying edit commands
e01a7acfd412be4d5c4f3b0a7b875416304528c2: add a hack that supresses a strange error (this._remote.status.data is null, even though it was downloaded correctly)
Dan Mills <thunder@mozilla.com> - Thu, 31 Jul 2008 00:20:55 -0700 - rev 44978
add a hack that supresses a strange error (this._remote.status.data is null, even though it was downloaded correctly)
5eb9aa986b8fb40a712bba9d224bd6b8478bb7e0: adding UI to add/edit client name and types
Chris Beard <chris@mozilla.org> - Wed, 30 Jul 2008 23:48:33 -0700 - rev 44977
adding UI to add/edit client name and types
ad48060fd1b390214730bb14abcd20ceafe9ef0e: fix typo in utils deepCopy
Dan Mills <thunder@mozilla.com> - Wed, 30 Jul 2008 23:37:21 -0700 - rev 44976
fix typo in utils deepCopy
cc9c106176bd59a2ac8c0dde1e76ee5ca3a169bf: do log some stack traces
Dan Mills <thunder@mozilla.com> - Wed, 30 Jul 2008 22:53:27 -0700 - rev 44975
do log some stack traces
(0) -30000 -10000 -3000 -1000 -300 -100 -50 -20 +20 +50 +100 +300 +1000 +3000 +10000 +30000 +100000 +300000 tip