Wes Kocher
618b2c258b
Merge fx-team to m-c
2014-03-25 20:03:13 -07:00
Richard Newman
2f78706e9d
Bug 841096 - Follow-up: remove debugging cruft. r=trivial
2014-03-25 09:00:07 -07:00
Henrik Skupin
414adfe553
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
ca4b6d2580
Bug 841096 - Part 2: speed up retrieval of open tabs. r=rnewman
2014-03-24 16:11:37 -07:00
Valery Yundin
f40979d0bf
Bug 841096 - Part 1: speed up about:sync-tabs. r=rnewman
2014-03-24 16:11:37 -07:00
Mark Hammond
80b2f9e857
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
5b1152ce0e
Back out b9597187a3d6 (bug 985212) for xpcshell bustage
...
CLOSED TREE
2014-03-22 21:30:46 -07:00
Mark Hammond
6a5ecb9cbc
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
754de56c6f
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
Gregory Szorc
beddc2399c
Bug 974024 - Add FHR recording of Telemetry Experiments activity; r=bsmedberg
...
--HG--
extra : rebase_source : 1e875e53da49c69194ee740898ff943d1801d1cf
2014-03-20 14:16:00 -07:00
Carsten "Tomcat" Book
c9cd70cfdf
merge fx-team to mozilla-central
2014-03-21 15:16:06 +01:00
Henrik Skupin
3f627fb88e
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
a06cadf42b
Back out 61454adff1d6 (bug 985212) for xpcshell bustage
2014-03-20 21:50:21 -07:00
Mark Hammond
8f728efcd1
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
81878b2d38
Bug 970167 - Disable passwords engine when a master password is set. r=rnewman
2014-03-21 14:22:02 +11:00
Fernando Jiménez
7e16c679dd
Bug 976002 - Build time flag to enable/disable FxA. r=fabrice, r=gps
2014-03-17 09:58:16 -07:00
Mozilla Release Engineering
5429cb98c6
Merging in version bump NO BUG CLOSED TREE DONTBUILD
2014-03-17 13:48:08 -07:00
Mark Hammond
ae6d67cfd5
Bug 983270 (part 2) - _findCluster() should return null on authentication errors. r=ckarlof
2014-03-17 09:39:31 +11:00
Mark Hammond
e66fd85f48
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
aa951ea934
Merge m-c to fx-team
2014-03-14 23:19:44 -07:00
Wes Kocher
f7a4d641fc
Merge inbound to m-c
2014-03-14 22:20:25 -07:00
Mark Hammond
0565a07d1b
Bug 983913 - ensure failure to reject a promise is actually reported. r=ttaubert
2014-03-14 18:02:01 -07:00
Chris Karlof
b72f0729f2
Bug 983256 - Change the client generated expiration time in FxA assertions to be 'forever'. r=jedp
2014-03-14 14:50:19 -07:00
Henrik Skupin
89771ec7db
Bug 966434 - Refactor tps for fxaccounts and old sync authentication support. r=jgriffin
2014-03-14 21:13:38 +01:00
Richard Newman
e5fa7ab83f
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
7ed58d2139
Bug 978876 - Part 2: refactor out datatype choice. r=markh
2014-03-13 16:37:26 -07:00
Richard Newman
9138511a11
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
Richard Newman
e5a7647359
Bug 978876 - Part 0: add set utilities to CommonUtils. r=gps
2014-03-13 16:37:25 -07:00
Jed Parsons
160234bcb9
Bug 978896 - FxA: watch() should get silent assertion if possible. r=ferjm
2014-03-11 17:49:26 -07:00
Mark Hammond
0a65d8c164
Bug 982965 - ensure we fail if getKeys can't get kA or kB. r=ckarlof
2014-03-14 15:22:32 -07:00
Gregory Szorc
30f8839c06
Bug 875562 - Part 9: Change Health Report to pull from crashes manager; r=bsmedberg, r=rnewman
...
This patch changes Firefox Health Report to pull crash counts from the
newly-implemented crash manager. The crash manager is now the canonical
source of crash data, so all the code for reading crash dump files from
disk has been removed.
This regresses the collection capability of Firefox Health Report by
removing plugin crashes and hangs from the reported values. This
regression is intended to be temporary and a follow-up bug will be
created to add plugin process event recording to the crash events
system.
This regression has been justified because the old crash reporting
mechanism was severely flawed and wasn't sending accurate data (not all
crashes were being saved to dumps and some dumps would be deleted).
--HG--
extra : amend_source : d54bb3bf9f740508cb4eda286536ce16a4c3bee5
2014-01-30 16:48:52 -08:00
Wes Kocher
030d5126a7
Backed out changeset 21793ea94b09 (bug 875562) for ASAN xpcshell failures
2014-03-13 15:22:40 -07:00
Gregory Szorc
1e8ae344f7
Bug 875562 - Part 9: Change Health Report to pull from crashes manager; r=bsmedberg, r=rnewman
...
This patch changes Firefox Health Report to pull crash counts from the
newly-implemented crash manager. The crash manager is now the canonical
source of crash data, so all the code for reading crash dump files from
disk has been removed.
This regresses the collection capability of Firefox Health Report by
removing plugin crashes and hangs from the reported values. This
regression is intended to be temporary and a follow-up bug will be
created to add plugin process event recording to the crash events
system.
This regression has been justified because the old crash reporting
mechanism was severely flawed and wasn't sending accurate data (not all
crashes were being saved to dumps and some dumps would be deleted).
--HG--
extra : rebase_source : 7442a712d06b4d875010e78d4dd4f5cc179c8dfc
2014-01-30 16:48:52 -08:00
Carsten "Tomcat" Book
210cd1a4c5
merge fx-team to mozilla-central
2014-03-13 12:52:51 +01:00
Henrik Skupin
3fb8a3bb48
Bug 981921 - Allow signin in FxAccountsClient to use '?keys=true'. r=ckarlof
...
--HG--
extra : rebase_source : 37b0935a103c578895813e1411cffdde0953552e
2014-03-12 22:50:58 +01:00
Tim Taubert
1a00683433
Bug 969555 - Follow-up to fix test_syncscheduler.js failures on a CLOSED TREE r=bustage
2014-03-12 13:06:01 -07:00
Tim Taubert
600e5e8f15
Bug 969555 - Reduce single device sync interval for FxAccounts r=rnewman
2014-03-11 14:46:36 -07:00
Marco Bonardo
784031cd19
Bug 969318 - Mute "A promise chain failed to handle a rejection" error from the livemarks service. r=mano
2014-03-12 16:24:23 +01:00
Mark Hammond
d03eaa8b9c
Bug 958447 - respect Retry-After header from token server. r=rnewman
2014-03-12 19:27:22 -07:00
Chris Karlof
e94dc84363
Bug 982848: Don't clear syncKeyBundle in BrowserID Identity manager during failures to fetch token. r=markh
...
--HG--
extra : rebase_source : 42bccbef9e86cbc2f9e6113656acdddd04844f67
2014-03-12 14:31:18 -07:00
Chris Karlof
a51705c845
Bug 981140 - Make the FxA signup uri pref and path explicitly reference signup. r=markh
2014-03-11 15:58:27 -07:00
Mark Hammond
243605a6fe
Bug 981957 - make browserid_identity's logs consistent with other sync logs. r=rnewman
2014-03-11 13:24:51 -07:00
Mark Hammond
7dff794c1a
Bug 981172 - have bid_identity fire a notification on login error. r=ckarlof
...
--HG--
extra : rebase_source : f7413e58d2913b008142b7b70a9455995edffa82
2014-03-10 11:54:46 -07:00
Jed Parsons
ed60f7b54c
Bug 969892 - Fixes and improvements to FxAccounts test suite; r=ttaubert
2014-02-18 09:47:52 -08:00
Henrik Skupin
a91de5dd52
Bug 966434 - Update TPS to use FxA. r=jgriffin
2014-03-07 15:54:19 -08:00
Mark Hammond
4b03615e02
Bug 967015 - Have bid_identity call Service.startOver on logout. r=rnewman,ckarlof
2014-03-07 15:41:33 +11:00
Mark Hammond
7c71c437c3
Bug 977502 (part 2) - add tests with mock http responses simulating errors. r=ckarlof
2014-03-07 15:41:32 +11:00
Mark Hammond
d188243f95
Bug 977502 (part 1) - better management of login failure states and allow sync to force a login. r=ckarlof,rnewman
2014-03-07 15:41:32 +11:00
Phil Ringnalda
5e90ed84c9
Back out 8b98e1dc7ef3 (bug 972100) for xpcshell bustage
2014-03-03 21:41:35 -08:00
Mark Hammond
975723b139
Bug 972100 - have _remoteSetup() use the existing info response when logging in. r=rnewman
2014-03-04 15:16:06 +11:00