Commit Graph

2900 Commits

Author SHA1 Message Date
Wes Kocher
570c41e98b Merge m-c to inbound 2014-05-05 21:15:33 -07:00
Henrik Skupin
a37a7d089b Bug 1003250 - Disable automatic sync for TPS tests. r=rnewman DONTBUILD 2014-05-05 23:07:52 +02:00
Ehsan Akhgari
4c3acbbb4f Bug 1005710 - Avoid preprocessing the services JS exports files needlessly; r=mshal 2014-05-05 21:28:55 -04:00
Mark Hammond
0b36e5d6bc Bug 972100 - avoid an info/collections call as sync starts. r=rnewman 2014-04-30 17:42:51 +10:00
ffxbld
8714c49598 Version bump. CLOSED TREE NO BUG a=release 2014-04-28 14:18:37 -04:00
Sam Penrose
98097b9dd7 Bug 983445 - Verification causes logout on device. r=jedp 2014-04-21 16:45:58 -07:00
Carsten "Tomcat" Book
c55de21cc3 merge fx-team to mozilla-central 2014-04-17 12:49:25 +02:00
Mark Hammond
c97626cc7f Bug 985868 - only report prolonged sync errors once per application invocation. r=rnewman 2014-04-17 11:25:44 +10:00
Henrik Skupin
c606a4119a Bug 996027 - Ensure that TPS always fakes login into Weave. r=rnewman DONTBUILD 2014-04-14 18:22:23 +02:00
Roberto A. Vitillo
fd71acaf46 Bug 993468 - TypeError: callback is undefined in jsonSave(). r=rnewman 2014-04-13 14:28:20 -04:00
Ed Morley
73c827f7b3 Merge latest green inbound changeset and mozilla-central 2014-04-10 17:55:29 +01:00
Henrik Skupin
7936999b7f Bug 992198 - TPS.Sync() fails for special options like 'wipeRemote' if the user is not logged in yet. r=jgriffin DONTBUILD
--HG--
extra : rebase_source : d4ff28171ebdd7d2a23e7cc395d7087831d30f96
2014-04-09 23:35:57 +02:00
Mark Hammond
f59a4e6887 Bug 985145 - make node reassignment work correctly with FxA. r=rnewman 2014-04-10 12:18:24 +10:00
Mark Hammond
e2705bdbf4 Bug 990834 (part 3) - Fix handling of hawk errors. r=ckarlof 2014-04-10 12:08:19 +10:00
Mark Hammond
bc93fc2b9d Bug 990834 (part 2) - Add support/tweak retry and backoff header support to hawk and tokenserverclient. r=rnewman 2014-04-10 12:08:19 +10:00
Mark Hammond
1cfe00f9c1 Bug 990834 (part 1) - minor refactor of hawk tests. r=ckarlof 2014-04-10 12:08:18 +10:00
Marco Castelluccio
6924f0bb5f Bug 988301 - Avoid main-thread IO in Sync code. r=Yoric, r=rnewman 2014-04-07 10:49:32 -04:00
David Rajchenbach-Teller
7e80df0235 Bug 992363 - Fix a few uncaught async errors in services. r=rnewman 2014-04-07 10:33:56 -04:00
Carsten "Tomcat" Book
d4d8a64c7a merge fx-team to mozilla-central 2014-04-03 12:46:58 +02:00
Mark Hammond
7dc2e440e9 Bug 987468 - remove sync delayed notification. r=ttaubert 2014-04-03 09:56:59 +11:00
Richard Newman
bc9c137228 Bug 990872 - Eliminate Places dependency in Sync utils. r=gps 2014-04-01 21:33:42 -07:00
Henrik Skupin
0d814619fc Bug 986190 - [tps] Synced data on the server is not always wiped at the end of a test. r=jgriffin, r=rnewman DONTBUILD 2014-04-02 22:58:14 +02:00
Henrik Skupin
5e6c5a1faf Bug 989249 - test_addon_reconciling.js broken due to missing sync. r=jgriffin DONTBUILD 2014-04-01 12:13:37 +02:00
Henrik Skupin
af7d3cf41b Bug 989045 - [tps] Registering of observer topics happens too late so 'weave:engine:start-tracking' can be missed during startup. r=jgriffin DONTBUILD 2014-04-01 08:35:32 +02:00
Andrei Eftimie
807e96807c Bug 983642 - [tps] AddonRepository.getAddonsByIDs fails in mutiple tps tests. r=hskupin DONTBUILD
--HG--
extra : rebase_source : 51ed8adff60cd7a0ddcd9c7c36a81f3510350089
2014-03-27 20:06:56 +01:00
Henrik Skupin
e985fb4331 Bug 981848 - [tps] Don't force login each time the browser gets started. r=jgriffin - DONTBUILD 2014-03-26 21:55:00 +01:00
Wes Kocher
0d58e41dd9 Merge fx-team to m-c 2014-03-25 20:03:13 -07:00
Richard Newman
cc0d0bda5a Bug 841096 - Follow-up: remove debugging cruft. r=trivial 2014-03-25 09:00:07 -07:00
Henrik Skupin
ff4ec74c43 Bug 987682 - DumpBookmarks() in bookmarks.jsm hangs due to invalid JSON data. r=jgriffin DONTBUILD 2014-03-25 19:43:33 +01:00
Valery Yundin
b8f18c9040 Bug 841096 - Part 2: speed up retrieval of open tabs. r=rnewman 2014-03-24 16:11:37 -07:00
Valery Yundin
7542910281 Bug 841096 - Part 1: speed up about:sync-tabs. r=rnewman 2014-03-24 16:11:37 -07:00
Mark Hammond
40e12f4211 Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman 2014-03-24 11:44:43 +11:00
Phil Ringnalda
08f929b520 Back out b9597187a3d6 (bug 985212) for xpcshell bustage
CLOSED TREE
2014-03-22 21:30:46 -07:00
Mark Hammond
b52785af62 Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman 2014-03-23 14:20:38 +11:00
Marco Bonardo
163196f903 Bug 818584 - Discard consecutive duplicate bookmark backups by comparing hashes r=mano
Original patch by Raymond Lee <raymond@appcoast.com> f=mak
2014-03-19 14:33:02 +01:00
Carsten "Tomcat" Book
12e249d1fa merge fx-team to mozilla-central 2014-03-21 15:16:06 +01:00
Henrik Skupin
32625620a9 Bug 982591 - Update TPS to retrieve keys from server instead of hard-coding them. r=warner
--HG--
extra : rebase_source : 2a9449aeca2f28a2bce648971619635b19a4d670
2014-03-21 10:23:15 +01:00
Phil Ringnalda
44d24e0d0d Back out 61454adff1d6 (bug 985212) for xpcshell bustage 2014-03-20 21:50:21 -07:00
Mark Hammond
0ebee1740a Bug 985212 - check if the username looks like an email address to determine what sync to use. r=rnewman 2014-03-21 14:39:35 +11:00
Mark Hammond
f65bef3293 Bug 970167 - Disable passwords engine when a master password is set. r=rnewman 2014-03-21 14:22:02 +11:00
Mozilla Release Engineering
198567e0a0 Merging in version bump NO BUG CLOSED TREE DONTBUILD 2014-03-17 13:48:08 -07:00
Mark Hammond
0196af6a9c Bug 983270 (part 2) - _findCluster() should return null on authentication errors. r=ckarlof 2014-03-17 09:39:31 +11:00
Mark Hammond
e50a273cff Bug 983270 (part 1) - testonly refactor of FxA tests to make cluster testing easier. r=ckarlof 2014-03-17 09:39:31 +11:00
Wes Kocher
b031e3117f Merge m-c to fx-team 2014-03-14 23:19:44 -07:00
Mark Hammond
a6375e2baf Bug 983913 - ensure failure to reject a promise is actually reported. r=ttaubert 2014-03-14 18:02:01 -07:00
Henrik Skupin
5684142d7a Bug 966434 - Refactor tps for fxaccounts and old sync authentication support. r=jgriffin 2014-03-14 21:13:38 +01:00
Richard Newman
bb5c6a7aa9 Bug 978876 - Part 3: mark engines as declined after making a datatype election. r=markh 2014-03-13 16:37:26 -07:00
Richard Newman
89604f48c0 Bug 978876 - Part 2: refactor out datatype choice. r=markh 2014-03-13 16:37:26 -07:00
Richard Newman
2bf76553bf Bug 978876 - Part 1: handle declined engines in desktop Sync meta/global. r=gps
* * *
Bug 978876 - Part 2: refactor out meta/global upload.
2014-03-13 16:37:25 -07:00
Mark Hammond
923842642f Bug 982965 - ensure we fail if getKeys can't get kA or kB. r=ckarlof 2014-03-14 15:22:32 -07:00