Ed Morley
98ac12d9d0
Merge tips of mozilla-central and mozilla-inbound
2011-09-22 01:46:53 +01:00
Rafael Ávila de Espíndola
ab9a3e1e59
Bug 673017 - Misc places fixes. r=mak77.
...
This patch removes places-connection-closing, which is unused, reverts
1d1143dde4bb which was unnecessary and finalizes sql statements.
--HG--
extra : rebase_source : 8923378f4b1c58da8e128009efdf309f8ec29da3
2011-09-21 13:02:40 -04:00
Philipp von Weitershausen
381f87ffcb
Merge m-c to s-c
2011-09-19 15:05:14 -07:00
Jonathan Griffin
c81350f926
Bug 682443 - dump history and password lists to log on relevant test failure, a=testonly, DONTBUILD
2011-09-09 12:38:13 -07:00
Gregory Szorc
0165670bf3
Bug 685757 - Document Store API; r=philikon DONTBUILD
2011-09-09 10:34:58 -07:00
Jonathan Griffin
428f60fe29
Bug 685926 - pass custom sync server url to mozmill framework, a=testonly, DONTBUILD
2011-09-09 10:27:17 -07:00
Chenxia Liu
99c05ec635
Bug 663181 - Automatic cleanup for Sync error logs. r=philikon
2011-09-08 16:52:07 -07:00
Jonathan Griffin
1d27d13c49
Bug 682443 - dump the bookmark list on bookmark test failure, a=testonly, DONTBUILD
2011-09-07 17:34:27 -07:00
Kyle Huey
69617da4ba
Merge m-c to b-s.
2011-09-11 05:32:38 -04:00
Mike Hommey
ee8ec5c5ba
Bug 664090 - Enable test_errorhandler_filelog.js on windows. r=philikon
2011-09-08 09:12:58 +02:00
Philipp von Weitershausen
caa0bffbf7
Bug 683396 follow-up: fix test fixtures to avoid test hangs on opt builds. r=me
2011-09-07 12:12:46 -07:00
Philipp von Weitershausen
5707cf1388
Bug 683396 follow-up: fix botched up rebase. r=me
2011-09-07 00:16:25 -07:00
Marina Samuel
dd225756ed
Bug 683396 follow-up: Fix intermittent test failures
2011-09-06 19:15:28 -07:00
Richard Newman
fb0d8248e7
Bug 684783 - Fix intermittent test_errorhandler.js. r=philikon
2011-09-06 13:09:29 -07:00
Marina Samuel
427ab77405
Bug 683396 - Correctly identify server maintenance at login. r=philikon
2011-09-06 09:17:26 -07:00
Marina Samuel
b7174967e0
Bug 622387 - Wrong Sync Key error should only throw an error once. r=philikon
2011-09-06 09:17:26 -07:00
Jonathan Griffin
4678a1eb6b
Bug 681067 - give mozmill tests in TPS the ability to invoke a sync, a=testonly, DONTBUILD
2011-09-01 16:57:31 -07:00
Marina Samuel
0fa7657a00
Bug 683254 - On startup with no network, sync icon spins endlessly. r=philikon
2011-08-30 15:38:31 -07:00
Richard Newman
1fecdbfa27
Bug 682497 - Strict mode and assorted improvements for bookmarks and history engines. r=philikon
2011-08-26 19:14:09 -07:00
Philipp von Weitershausen
47f6b13e5d
Bug 659067 follow-up: move skip-if directives below the tests that were renamed
2011-08-26 19:14:09 -07:00
Marina Samuel
09698ac324
Bug 578195 - Better description when the server asks for a backoff. r=philikon
...
--HG--
extra : rebase_source : b7ab66f6716fa708861d394320596259166b0652
2011-08-26 16:45:08 -07:00
Philipp von Weitershausen
60eeba2595
Bug 682449 - Strict mode SyntaxError: redefining delete is deprecated. r=rnewman
...
--HG--
extra : rebase_source : d1db2617e65f918421c2cb70d7f0c40e47129725
2011-08-26 16:39:04 -07:00
Philipp von Weitershausen
b3007cb385
Bug 671349 - Reference to undefined property Ci.nsIConverterOutputStream.DEFAULT_REPLACEMENT_CHARACTER. r=rnewman
...
--HG--
extra : rebase_source : 34c935dce0f65ef2a988bcb077c5afc03c7cbe2c
2011-08-26 16:38:46 -07:00
Richard Newman
696749ebde
Bug 681840 - Fix whitespace that should have been right in 62177ac1ccad. r=philikon DONTBUILD
2011-08-26 15:31:19 -07:00
Richard Newman
40d86e9b03
Bug 681840 - Print helpful warning when starting test HTTP server fails. r=philikon DONTBUILD
2011-08-26 15:23:24 -07:00
Marina Samuel
ef2134611b
Bug 659067 - Part 3: Only show network errors for user triggered sync, not for scheduled ones. r=philikon
2011-08-26 14:01:35 -07:00
Marina Samuel
1dd8709396
Bug 659067 - Part 2: Move _syncError to ErrorHandler. r=philikon
2011-08-26 14:01:35 -07:00
Marina Samuel
297f922e20
Bug 659067 - Part 1: Move error handling and logging from Service to ErrorHandler. r=philikon
...
--HG--
rename : services/sync/tests/unit/test_service_filelog.js => services/sync/tests/unit/test_errorhandler_filelog.js
rename : services/sync/tests/unit/test_service_sync_checkServerError.js => services/sync/tests/unit/test_errorhandler_sync_checkServerError.js
2011-08-26 14:01:35 -07:00
Philipp von Weitershausen
da047dffc5
Bug 681864 - Get rid of unused Utils.sha* helpers. r=rnewman
2011-08-26 10:27:29 -07:00
Philipp von Weitershausen
349fe83b62
Bug 681863 - Replace Utils.isArray with Array.isArray. r=rnewman
2011-08-26 10:26:11 -07:00
Philipp von Weitershausen
a043949919
Bug 681843 - Part 3: Move Utils.asyncChain to Async.chain. r=rnewman
...
--HG--
rename : services/sync/tests/unit/test_utils_asyncChain.js => services/sync/tests/unit/test_async_chain.js
2011-08-26 10:25:42 -07:00
Philipp von Weitershausen
9047b934bf
Bug 681843 - Part 2: Remove Utils as a dependency in async.js, expose Async in util.js. r=rnewman
2011-08-26 10:25:29 -07:00
Philipp von Weitershausen
fb47efbd15
Bug 681843 - Part 1: Clean up async.js. r=rnewman
2011-08-26 10:25:19 -07:00
Philipp von Weitershausen
1ba753a901
Bump Sync version number after Gecko version number bump.
2011-08-24 17:09:36 -07:00
Allison Naaktgeboren
79215cfa7c
Merge mozilla-central into services-central
2011-08-23 14:44:11 -07:00
Allison Naaktgeboren
d35e331e96
Merge services-central into mozilla-central.
2011-08-23 14:38:16 -07:00
Jonathan Griffin
3380c53e29
Bug 678628 - allow TPS to run Mozmill tests, f=philikon, a=testonly, DONTBUILD
...
--HG--
rename : services/sync/tps/chrome.manifest => services/sync/tps/extensions/tps/chrome.manifest
rename : services/sync/tps/components/tps-cmdline.js => services/sync/tps/extensions/tps/components/tps-cmdline.js
rename : services/sync/tps/install.rdf => services/sync/tps/extensions/tps/install.rdf
rename : services/sync/tps/modules/bookmarks.jsm => services/sync/tps/extensions/tps/modules/bookmarks.jsm
rename : services/sync/tps/modules/forms.jsm => services/sync/tps/extensions/tps/modules/forms.jsm
rename : services/sync/tps/modules/history.jsm => services/sync/tps/extensions/tps/modules/history.jsm
rename : services/sync/tps/modules/logger.jsm => services/sync/tps/extensions/tps/modules/logger.jsm
rename : services/sync/tps/modules/passwords.jsm => services/sync/tps/extensions/tps/modules/passwords.jsm
rename : services/sync/tps/modules/prefs.jsm => services/sync/tps/extensions/tps/modules/prefs.jsm
rename : services/sync/tps/modules/quit.js => services/sync/tps/extensions/tps/modules/quit.js
rename : services/sync/tps/modules/tabs.jsm => services/sync/tps/extensions/tps/modules/tabs.jsm
rename : services/sync/tps/modules/tps.jsm => services/sync/tps/extensions/tps/modules/tps.jsm
extra : rebase_source : d4eed9a707ffe801de9b1bb4e6f08d31e670eec4
2011-08-22 14:27:25 -07:00
Richard Newman
8e084d7f0d
Bug 637576 - Part 2: Sync Form engine: cache queries. r=philikon
2011-08-22 10:38:28 -07:00
Richard Newman
c70b060538
Bug 637576 - Part 1: Sync Form engine: reuse column name arrays. r=philikon
2011-08-22 10:38:28 -07:00
Richard Newman
e4daf16b7b
Bug 637576 - Part 0: Sync Form engine: tidying and cleanup. r=philikon
2011-08-22 10:38:28 -07:00
Richard Newman
004e6506f9
Bug 680678 - Sync: byteArrayToString appears more than once in util.js. r=philikon
2011-08-22 09:15:02 -07:00
Richard Newman
be87d0ea27
Merge mozilla-central to services-central.
2011-08-22 08:03:23 -07:00
Geoff Brown
6b2be6e629
Bug 668349 - Changes to xpcshell.ini; r=jmaher
2011-08-22 09:00:50 +01:00
Richard Newman
024a89c508
Bug 679279 - Part 4: bookmarks engine cleanup. r=philikon
...
This patch reformats some definitions to more closely follow the style guide
and allow for easier extension in subsequent patches, and eliminates the
archiveBookmarks helper.
2011-08-19 17:17:58 -07:00
Richard Newman
89268cb3da
Bug 679279 - Part 3: Object.keys and test improvements. r=philikon
2011-08-19 17:17:58 -07:00
Richard Newman
18d23ad5a0
Bug 679279 - Part 2: add missing 'let' in async.js and service.js to avoid strict warning. r=philikon
2011-08-19 17:17:58 -07:00
Richard Newman
56f0dde013
Bug 679279 - Part 1: minor improvements to engines code. r=philikon
...
In particular, tracking of _modified items no longer allows _modified to
occasionally not exist! This condition was hit in Bug 675299.
2011-08-19 17:17:58 -07:00
Allison Naaktgeboren
c68078004e
Bug 656492 - Rename "Sync Key" to "Recovery Key". r=philikon
2011-08-19 14:35:29 -07:00
Philipp von Weitershausen
809006c257
Bug 676110 - Part 4: Adapt Sync's history engine to implement handleCompletion. r=rnewman
...
--HG--
extra : rebase_source : 6ddb8f8eb77b48c6b17c47b6673617f768a3634a
2011-08-19 10:12:23 -07:00
Jonathan Griffin
466ce81604
Rev FF version for TPS extension, a=testonly, DONTBUILD
...
--HG--
extra : rebase_source : 867195889c1e04f14d2a78172bae57f33f785b3f
2011-08-18 14:03:59 -07:00