Commit Graph

3612 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
b4b2c06d25 merge fx-team to mozilla-central 2014-05-06 14:24:11 +02:00
Asaf Romano
c8c5cf6767 tests-bustage fix for bug 981689 (the code relies on the current-version preference being always set, which isn't true for testing-prefs-branches) 2014-05-06 11:43:59 +03:00
Asaf Romano
d78e31bbd3 Bug 981689 - Show a notice to beta users when we turn telemetry on by default on the beta channel - Firefox Desktop (very final fix). r=bsmedberg. 2014-05-06 10:15:20 +03:00
Henrik Skupin
a37a7d089b Bug 1003250 - Disable automatic sync for TPS tests. r=rnewman DONTBUILD 2014-05-05 23:07:52 +02:00
Wes Kocher
570c41e98b Merge m-c to inbound 2014-05-05 21:15:33 -07:00
Ehsan Akhgari
4c3acbbb4f Bug 1005710 - Avoid preprocessing the services JS exports files needlessly; r=mshal 2014-05-05 21:28:55 -04:00
Carsten "Tomcat" Book
cde537b758 Merge m-c to fx-team 2014-04-30 15:28:33 +02:00
Mark Hammond
0b36e5d6bc Bug 972100 - avoid an info/collections call as sync starts. r=rnewman 2014-04-30 17:42:51 +10:00
Sam Penrose
8dfdb2f152 Bug 981210 - FxAccountsManager.jsm and consumers: change "accountId" attribute to "email" r=jedp 2014-04-29 14:47:59 -07:00
Fernando Jiménez
7746ac6a1d Bug 1027595 - TypeError: deriveHawkCredentials is not a function after bug 1020859. r=jedp 2014-06-21 07:43:39 +01:00
Ed Morley
ec7d86a49e Merge mozilla-central and fx-team 2014-04-29 18:24:19 +01:00
Ed Morley
ce8472e863 Merge latest green b2g-inbound changeset and mozilla-central 2014-04-29 17:34:22 +01:00
Wes Kocher
25702579e7 Merge m-c to fx-team 2014-04-28 16:30:10 -07:00
Wes Kocher
262b4fb1ca Merge fx-team to m-c 2014-04-28 16:20:24 -07:00
Mark Hammond
9bcb6d5b0b Bug 992371 - avoid 'A promise chain failed to handle a rejection' errors using FxAccounts. r=jedp 2014-04-29 08:46:14 +10:00
Sam Penrose
5e18eb066c Bug 1000395 - Do not sign user out at start of refreshAuth. r=jedp 2014-04-28 11:45:58 -07:00
ffxbld
8714c49598 Version bump. CLOSED TREE NO BUG a=release 2014-04-28 14:18:37 -04:00
Asaf Romano
888a277a59 Bug 981689 (Show a notice to beta users when we turn telemetry on by default on the beta channel) - For the new channel-override preference, use UpdateChannel.jsm rather than nsIXULRuntime so that it's easier to QA the feature by hacking install.js. As part of that, add a new argument to UpdateChannel.js for excluding partners. r=bsmbedberg. 2014-04-28 17:04:51 +03:00
Sam Penrose
17ef90f9f4 Bug 1001182 - FxAccountsManager.jsm correctly handles {refreshAuthentication:0} r=jedp 2014-04-28 09:44:36 -07:00
Birunthan Mohanathas
ff8ce9bd42 Bug 900908 - Part 3: Change uses of numbered macros in nsIClassInfoImpl.h/nsISupportsImpl.h to the variadic variants. r=froydnj 2014-04-27 03:06:00 -04:00
Irving Reid
69a9e55be6 Bug 966674: #3 Add parameter substitution in log messages; r=gps,rnewman 2014-04-29 10:09:29 -04:00
Irving Reid
8797f73681 Bug 966674: #2 Move exceptionStr() and stackTrace() from utils.js to Log.jsm; r=gps,rnewman 2014-04-29 10:09:27 -04:00
Drew Willcoxon
fa13495992 Bug 975786 - Add FHR search source for about:newtab. r=rnewman 2014-04-24 19:09:18 -07:00
Sam Penrose
213c13e778 Bug 994934 - Find my device can be enabled without logged into FxAccounts. r=jedp 2014-04-22 15:28:18 -07: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
Carsten "Tomcat" Book
3e5d12c5f8 merge mozilla-inbound ot mozilla-central 2014-04-17 12:47:30 +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
Nicholas Nethercote
b3fc34c7ef Bug 996430 - Remove FxAccountsUtils.jsm. r=ttaubert.
--HG--
extra : rebase_source : 797c0af77bedf9e5c768bd7083dda4f8d80610a9
2014-04-16 20:48:00 -07: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
Ryan VanderMeulen
f7bb27fea0 Backed out changeset 68ba8f6f4f03 (bug 983445) for suspicion of causing xpcshell timeouts in test_browserid_identity.js. 2014-04-16 15:14:42 -04:00
Sam Penrose
5598f89ca5 Bug 983445 - Verification causes logout on device. r=jedp 2014-04-15 16:05:16 -07:00
Mark Hammond
f660f76943 Bug 992371 - Avoid promise rejection messages from FxAccounts. r=ttaubert 2014-04-10 17:13:53 +10: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
8a53b11c8e Bug 993173 - Use encoding option in readJSON. r=Yoric 2014-04-08 04:47:00 +02: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
Asaf Romano
5dbae2896b Bug 981689 - Show a notice to beta users when we turn telemetry on by default on the beta channel - Firefox Desktop 2014-04-07 12:26:58 +03:00
Benjamin Smedberg
cd2fddc1ce Bug 986582 - Get rid of the toolkit.telemetry.enabledPreRelease pref and make the toolkit.telemetry.enabled pref do the right thing for beta users who are testing a final release build, r=rnewman
--HG--
extra : rebase_source : 43f70e2c1c3207f37ba0789245958cb0c34187f6
2014-04-03 14:55:42 -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
Gregory Szorc
4adb89bc72 Bug 968419 - Store and submit a persistent health report identifier; r=rnewman, r=bsmedberg
Up to this point, Firefox Health Report has generated and submitted a
random UUID with each upload. Generated UUIDs were stored on the client.
During upload, the client asked the server to delete all old UUIDs.
Well-behaving clients thus left at most one record/ID on the server.

Unfortunately, clients in the wild have not been behaving properly. We
are seeing multiple documents on the server that appear to come from the
same client. Clients are uploading new records but failing to delete the
old ones. These old, undeleted "orphan" records are severely impacting
the ability to derive useful knowledge from FHR data because it is
difficult, resource intensive, and error prone to filter the records on
the server. This is undermining the ability for FHR data to be put to
good use.

This patch introduces a persistent client identifier. When the client is
initialized, it generates a random UUID. That UUID is persisted to the
profile and sent as part of every upload.

For privacy reasons, if a client opts out of data submission, the client
ID will be reset as soon as all remote data has been deleted.

We still issue and send upload IDs. They exist mostly for forensics
purposes so we may log client behavior and more accurately determine
what exactly misbehaving, orphan-producing clients are doing.

It is worth noting that this persistent client identifier will not solve
all problems of branching and orphaned records. For example, profile
copying will result in multiple clients sharing a client identifier. A
"client ID version" field has been added to facilitate an upgrade path
towards client IDs with different generation semantics.

--HG--
extra : rebase_source : b761daab39fb07b6ab8883819d68bf53462314a0
2014-02-20 11:30:52 -08:00
Chris Karlof
9bc6ab6d2a Bug 989549 - Call signOut() in FxAccountsClient.jsm from signOut() in FxAccounts.jsm. r=markh 2014-04-09 16:14:19 -07: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
Mark Hammond
3d5d088ab8 Bug 985902 - expose fxaccounts/MOZ_SERVICES_FXACCOUNTS to mozinfo and only run test_hawkclient when enabled. r=ted 2014-03-31 14:15:05 +11: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
Ryan VanderMeulen
4dc5242df5 Merge inbound to m-c. 2014-03-26 20:58:31 -04:00
Ryan VanderMeulen
0581431d4c Merge fx-team to m-c. 2014-03-26 20:51:01 -04:00
Sam Penrose
3d8b5f0aad Bug 967008 - getAccounts should return the account info right away. r=jedp 2014-03-26 09:12:14 -07: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
Wes Kocher
5389f8cd94 Merge m-c to fx-team 2014-03-25 20:23:20 -07:00
Mark Hammond
5675a1c236 Bug 988051 - lazy-load FxAccountsClient module. r=rnewman 2014-03-26 12:13:46 +11: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
Nicholas Nethercote
fd38bb47c5 Bug 987146 - Represent SQL queries more efficiently. r=gps.
--HG--
extra : rebase_source : 44b196f04887d88742517e2735a33d4d79aae8d5
2014-03-24 11:31:29 -04:00
Nathan Froyd
ae562efb3f Bug 1045617 followup - remove dummy mach command DONTBUILD; r=me 2014-08-06 12:28:37 -04: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
Gregory Szorc
add4f755f7 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
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
Fernando Jiménez
7d20b5a7ba Bug 976002 - Build time flag to enable/disable FxA. r=fabrice, r=gps 2014-03-17 09:58:16 -07: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
Wes Kocher
aa89f0292c Merge inbound to m-c 2014-03-14 22:20:25 -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
Chris Karlof
eab2e0d39d 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
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
Richard Newman
b6c49a6b1c Bug 978876 - Part 0: add set utilities to CommonUtils. r=gps 2014-03-13 16:37:25 -07:00
Jed Parsons
58ef7484ed Bug 978896 - FxA: watch() should get silent assertion if possible. r=ferjm 2014-03-11 17:49:26 -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
Gregory Szorc
76bf714c29 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
51fb4209af Backed out changeset 21793ea94b09 (bug 875562) for ASAN xpcshell failures 2014-03-13 15:22:40 -07:00
Gregory Szorc
808ce3d50e 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
0b804927d7 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Henrik Skupin
b39630e0de 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
fbfe856453 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
c0680383b8 Bug 969555 - Reduce single device sync interval for FxAccounts r=rnewman 2014-03-11 14:46:36 -07:00
Marco Bonardo
edaa060572 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
dbd111e61c Bug 958447 - respect Retry-After header from token server. r=rnewman 2014-03-12 19:27:22 -07:00
Chris Karlof
f69e659748 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
9e95cbfb16 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
07cbf14768 Bug 981957 - make browserid_identity's logs consistent with other sync logs. r=rnewman 2014-03-11 13:24:51 -07:00
Mark Hammond
f3aab980bb 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
639e1d6ba2 Bug 969892 - Fixes and improvements to FxAccounts test suite; r=ttaubert 2014-02-18 09:47:52 -08:00
Henrik Skupin
31fdbed8b1 Bug 966434 - Update TPS to use FxA. r=jgriffin 2014-03-07 15:54:19 -08:00
Mark Hammond
b3b28ee9ca Bug 967015 - Have bid_identity call Service.startOver on logout. r=rnewman,ckarlof 2014-03-07 15:41:33 +11:00
Mark Hammond
bce6e55f5d Bug 977502 (part 2) - add tests with mock http responses simulating errors. r=ckarlof 2014-03-07 15:41:32 +11:00
Mark Hammond
d9dcb4b987 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
80b78db673 Back out 8b98e1dc7ef3 (bug 972100) for xpcshell bustage 2014-03-03 21:41:35 -08:00
Mark Hammond
8425e489a6 Bug 972100 - have _remoteSetup() use the existing info response when logging in. r=rnewman 2014-03-04 15:16:06 +11:00
Mark Hammond
99d3ec549e Bug 972070 - followup to address review comments previously missed. r=jedp 2014-03-03 10:28:30 +11:00
Mark Hammond
6286168567 Bug 972070 - improve FxAccounts.jsm state management. r=jedp 2014-03-03 10:20:56 +11:00
Mark Hammond
56e312c5de Bug 976393 - ensure authentication errors log as much detail as possible. r=jedp 2014-03-03 09:55:30 +11:00
Mark Hammond
fb5728ab42 Bug 977931 - return an error object even when restResponse.headers is null. r=spenrose 2014-02-28 13:24:49 +11:00
Fernando Jiménez
7f938a5970 Bug 977597 - Use FxA production server URI. r=jedp 2014-02-27 19:41:46 +01:00
Sam Penrose
28968a9820 Bug 945449 - FxAccountsClient should support auth server's backoff protocol. r=ferjm 2014-02-26 10:11:49 -08:00
Jed Parsons
d103f216bf Bug 974990 - hawk request to access lang prefs as infrequently as possible. r=rnewman
--HG--
rename : services/common/hawk.js => services/common/hawkclient.js
rename : services/common/tests/unit/test_hawk.js => services/common/tests/unit/test_hawkclient.js
2014-02-25 09:19:47 -08:00
Mark Hammond
a1c0a70f11 Bug 932759 (part 2) - Have form sync work correctly if FormHistory is disabled. r=rnewman 2014-02-26 17:12:16 +11:00
Georg Fritzsche
c016e5792f Bug 971279 - Fix FHR addon provider test for plugin data count. r=gps 2014-02-25 13:30:04 -08:00
Carsten "Tomcat" Book
df93062b9a Merge mozilla-central to fx-team on a CLOSED TREE 2014-02-25 15:42:32 +01:00
Wes Kocher
fa9c928be9 Backed out changeset 96fd88a4d311 (bug 974990) for WinXP PGO xpcshell orange
--HG--
rename : services/common/hawkclient.js => services/common/hawk.js
rename : services/common/tests/unit/test_hawkclient.js => services/common/tests/unit/test_hawk.js
2014-02-24 17:21:29 -08:00
Jed Parsons
82cc60e970 Bug 974990 - hawk request to access lang prefs as infrequently as possible. r=rnewman
--HG--
rename : services/common/hawk.js => services/common/hawkclient.js
rename : services/common/tests/unit/test_hawk.js => services/common/tests/unit/test_hawkclient.js
2014-02-20 18:04:44 -08:00
Jed Parsons
d743fcd5d6 Bug 963835 - B2G fixes for FxA client handle incorrect capitalization in emails. r=ferjm 2014-01-31 15:21:46 -08:00
Alexander J. Vincent
59e70883e7 Bug 952307 - Move some addon-private JSM's to a subdirectory. r=Unfocused
--HG--
rename : toolkit/mozapps/extensions/AddonLogging.jsm => toolkit/mozapps/extensions/internal/AddonLogging.jsm
rename : toolkit/mozapps/extensions/AddonRepository.jsm => toolkit/mozapps/extensions/internal/AddonRepository.jsm
rename : toolkit/mozapps/extensions/AddonRepository_SQLiteMigrator.jsm => toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
rename : toolkit/mozapps/extensions/AddonUpdateChecker.jsm => toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
rename : toolkit/mozapps/extensions/LightweightThemeImageOptimizer.jsm => toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
rename : toolkit/mozapps/extensions/PluginProvider.jsm => toolkit/mozapps/extensions/internal/PluginProvider.jsm
rename : toolkit/mozapps/extensions/SpellCheckDictionaryBootstrap.js => toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js
rename : toolkit/mozapps/extensions/XPIProvider.jsm => toolkit/mozapps/extensions/internal/XPIProvider.jsm
rename : toolkit/mozapps/extensions/XPIProviderUtils.js => toolkit/mozapps/extensions/internal/XPIProviderUtils.js
2014-01-07 20:14:08 -08:00
Phil Ringnalda
ee790c9883 Backed out changeset 400723105403 (bug 952307)
CLOSED TREE

--HG--
rename : toolkit/mozapps/extensions/internal/AddonLogging.jsm => toolkit/mozapps/extensions/AddonLogging.jsm
rename : toolkit/mozapps/extensions/internal/AddonRepository.jsm => toolkit/mozapps/extensions/AddonRepository.jsm
rename : toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm => toolkit/mozapps/extensions/AddonRepository_SQLiteMigrator.jsm
rename : toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm => toolkit/mozapps/extensions/AddonUpdateChecker.jsm
rename : toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm => toolkit/mozapps/extensions/LightweightThemeImageOptimizer.jsm
rename : toolkit/mozapps/extensions/internal/PluginProvider.jsm => toolkit/mozapps/extensions/PluginProvider.jsm
rename : toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js => toolkit/mozapps/extensions/SpellCheckDictionaryBootstrap.js
rename : toolkit/mozapps/extensions/internal/XPIProvider.jsm => toolkit/mozapps/extensions/XPIProvider.jsm
rename : toolkit/mozapps/extensions/internal/XPIProviderUtils.js => toolkit/mozapps/extensions/XPIProviderUtils.js
2014-02-20 21:44:23 -08:00
Alexander J. Vincent
4261297298 Bug 952307 - Move some addon-private JSM's to a subdirectory. r=Unfocused
--HG--
rename : toolkit/mozapps/extensions/AddonLogging.jsm => toolkit/mozapps/extensions/internal/AddonLogging.jsm
rename : toolkit/mozapps/extensions/AddonRepository.jsm => toolkit/mozapps/extensions/internal/AddonRepository.jsm
rename : toolkit/mozapps/extensions/AddonRepository_SQLiteMigrator.jsm => toolkit/mozapps/extensions/internal/AddonRepository_SQLiteMigrator.jsm
rename : toolkit/mozapps/extensions/AddonUpdateChecker.jsm => toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
rename : toolkit/mozapps/extensions/LightweightThemeImageOptimizer.jsm => toolkit/mozapps/extensions/internal/LightweightThemeImageOptimizer.jsm
rename : toolkit/mozapps/extensions/PluginProvider.jsm => toolkit/mozapps/extensions/internal/PluginProvider.jsm
rename : toolkit/mozapps/extensions/SpellCheckDictionaryBootstrap.js => toolkit/mozapps/extensions/internal/SpellCheckDictionaryBootstrap.js
rename : toolkit/mozapps/extensions/XPIProvider.jsm => toolkit/mozapps/extensions/internal/XPIProvider.jsm
rename : toolkit/mozapps/extensions/XPIProviderUtils.js => toolkit/mozapps/extensions/internal/XPIProviderUtils.js
2014-01-07 20:14:08 -08:00
Sam Penrose
a1fc765c95 Bug 955953 - FxAccountsClient should set Accept-Language header on all server calls. r=rnewman 2014-02-16 08:39:05 -08:00
Jed Parsons
2329e136ec Bug 963835 - FxA client handle incorrect capitalization in emails. r=rnewman 2014-02-19 08:34:42 -08:00
Fernando Jiménez
8f9b14ac06 Bug 938635 - Implement forceAuthentication for firefox accounts. Part 3: UI glue. r=fabrice 2014-02-19 11:47:11 +01:00
Fernando Jiménez
a46e069e6f Bug 938635 - Implement forceAuthentication for firefox accounts. Part 2: FxAccountsManager. r=markh 2014-02-19 11:47:11 +01:00
Tim Taubert
0f98e74c72 Bug 967197 - "Create Account" and "Sign In" links in Sync preferences should go to separate pages r=markh 2014-02-18 12:05:13 +01:00
Ehsan Akhgari
7b16802ce4 Bug 973142 - Get rid of the MOZILLA_INTERNAL_API makefile variable; r=glandium
It's just as easy to directly set the preprocessor macro in the moz.build
files.  Using this variable doesn't really buy us anything.

This patch also removes unused code from rdf/tests/dsds.
2014-02-18 01:56:51 -05:00
Phil Ringnalda
c422c4939c Merge f-t to m-c 2014-02-15 10:10:31 -08:00
Masayuki Nakano
b3b19a9e2f Bug 969247 part.1 Remove or replace DOM_VK_ENTER and NS_VK_ENTER users r=smaug 2014-02-15 09:57:39 +09:00
Gregory Szorc
1290f96f1d Bug 972093 - Detect run_next_test() during add_task(); r=ted, rnewman
If an xpcshell test called run_next_test() from inside an add_task(),
bad things would happen. This patch detects that behavior and aborts the
test immediately with an actionable error message.

--HG--
extra : rebase_source : c5cf11070421b95a6fcf476d0a86289a3d0ba73a
extra : amend_source : cec6ad2a751bba01e7d4ecbff0735b39e3326efb
2014-02-12 16:47:29 -08:00
Jed Parsons
94f10be0d7 Bug 967372 - Fix intermittent test_hawk.js failures on Windows. r=ttaubert 2014-02-08 17:07:34 -08:00
Mark Hammond
225c7f7993 Bug 972129 - introduce a custom backoff schedule if failure is due to identity manager not being ready. r=rnewman 2014-02-13 17:07:53 +11:00
Gregory Szorc
2075042f8b Bug 970336 - test_restrequest.js times out on Android 2.3 emulator; r=rnewman
--HG--
extra : rebase_source : 686beb0c5ccfab3ebde27f554a3fa60439df5e53
extra : amend_source : 787e95b977f4557073f8c30b9e4e97269e6d1572
2014-02-12 17:16:44 -08:00
Gregory Szorc
94e5fda7a5 Bug 958561 - Measure Sync with Firefox Health Report; r=rnewman
Metrics for Sync have been added to Firefox Health Report. If Sync is
not configured, we'll report that fact and the supported and preferred
Sync protocols (1.1 or 1.5).

If Sync is configured, we report the daily counts of sync attempts and
how many are successful vs errored. We also report daily counts of the
device types attached to the account.

--HG--
extra : rebase_source : 77170b323706a85cbe1542ac993ebdc1dba3b505
extra : amend_source : 7802e80b4fc94937fbe3f67505b447bfb048732d
2014-02-05 08:08:14 -08:00
Sam Penrose
671acfec76 Bug 968929 - Update FXAccountsClient to production server URI. r=jedp 2014-02-11 18:07:26 -08:00
Mark Hammond
53290815f0 Bug 967047 - give FxA credentials the same special treatment the legacy sync host credentials get. r=rnewman 2014-02-12 18:57:16 +11:00
Mark Hammond
49015f9bf8 Bug 965896 - allow a sync startOver to re-enable Firefox Accounts. r=rnewman 2014-02-12 17:25:41 +11:00
Richard Newman
4a066f87d1 Bug 968436 - Add 1.5 to client records. r=trivial 2014-02-10 18:36:02 -08:00
Jed Parsons
95f73416a1 Bug 943521 - Use onepw prototcol in fxa client. r=ckarlof 2014-02-04 22:14:30 -08:00
Ryan VanderMeulen
085446242d Backed out changeset 79b198be3e50 (bug 943521) for xpcshell failures. 2014-02-07 17:55:12 -05:00
Jed Parsons
1ab63753b4 Bug 943521 - Use onepw prototcol in fxa client. r=ckarlof 2014-02-04 22:14:30 -08:00
Peiyong Lin
6d3ae7dcf8 Bug 964735 - Convert libc into Library to make it link lazily. r=Yoric 2014-02-07 10:37:21 -05:00
Tim Taubert
61bf3e55b8 Bug 967120 - Follow-up to fix broken xpcshell and mochitests r=markh 2014-02-04 12:03:18 +01:00
Tim Taubert
f1d71b5e1a Bug 967120 - Clean up FxAccounts' public/internal API implementation r=markh 2014-02-04 11:12:37 +01:00
Tim Taubert
5367c1eab8 Bug 735868 - Fix tests r=rnewman 2014-02-07 05:12:26 +01:00
Tim Taubert
ed494e6d16 Bug 735868 - Stop tracking last selected timestamp in tabs engine r=rnewman 2014-02-07 03:43:22 +01:00
Mark Hammond
e3b1052733 Bug 969169 - ensure logging is only initialized once. r=ttaubert 2014-02-07 11:53:52 +11:00
Carsten "Tomcat" Book
23a4962c96 Merge mozilla-central to fx-team on a CLOSED TREE 2014-02-05 14:54:11 +01:00
Fernando Jiménez
d82eee2f25 Bug 967503 - Make HawkClient work in b2g. r=rnewman 2014-02-04 20:32:16 +01:00
Phil Ringnalda
f95558444a Back out e78a7c6d9601 (bug 965896) for xpcshell orange 2014-02-04 21:19:19 -08:00
Mark Hammond
688b772266 Bug 967313 - ensure Sync is initialized before we set the fxAccounts user. r=ttaubert. 2014-02-05 16:09:54 +11:00
Mark Hammond
8858a7121a Bug 965896 - allow a legacy sync reset to re-enable fxa accounts. r=rnewman 2014-02-05 14:59:19 +11:00
Phil Ringnalda
5b71969052 Back out 2865fd5e5458 (bug 967120) for xpcshell and browser-chrome bustage 2014-02-03 20:30:45 -08:00
Tim Taubert
f30c60ab80 Bug 967120 - Clean up FxAccounts' public/internal API implementation r=markh 2014-02-03 19:30:47 +01:00
Lukas Blakk
bb6781d1b1 Merging in version bump NO BUG CLOSED TREE 2014-02-03 15:03:10 -08:00
Mark Hammond
03a140db51 Bug 966842 - initialize log.level instead of log.Level. r=ttaubert 2014-02-03 12:38:52 +11:00
Tim Taubert
8204a4c5b7 Bug 964922 - Enable FxA Sync on Nightly r=markh 2014-01-30 12:09:12 -08:00
Chris Karlof
71b8861505 Bug 966560 - fix bugs with time skew fix in bug 957863; r=jedp 2014-01-31 16:43:36 -08:00
Chris Karlof
94b4fa6474 Bug 965116: Add basic error handling to browserid_identity to respond to various authentication errors, r=markh 2014-01-31 15:26:20 -08:00
Ryan VanderMeulen
a70bcc0e9f Backed out changeset cc1bac015920 (bug 966560) for xpcshell failures. 2014-01-31 21:00:47 -05:00
Mark Hammond
bf712b98a7 Bug 966520 - have sync prefs pane open the new "force sign in" page. r=gavin 2014-01-31 17:27:59 -08:00
Chris Karlof
baef89768e Bug 966560: fix bugs with time skew fix in bug 957863, r=jedp 2014-01-31 16:43:36 -08:00
Jed Parsons
556c2f110c Bug 957863 - Use FxA auth clock skew in hawk, jwcrypto, and sync. r=warner, r=rnewman 2014-01-23 18:04:38 -08:00
Carsten "Tomcat" Book
427a27f08b merge fx-team to mozilla-central 2014-01-31 12:52:17 +01:00
Mark Hammond
3a016fe0bd Bug 966159 - Fix TypeError when trying to unlink account. r=ckarlof 2014-01-30 21:05:23 -08:00
Chris Karlof
bacff53c7c Bug 966131 - On first sync set firstSync pref to resetClient instead of calling resetClient directly. r=markh 2014-01-30 20:19:48 -08:00
Mark Hammond
98d4c9b8e8 Bug 965474 - allow for an initial sync on new user signin. r=ckarlof
--HG--
extra : rebase_source : f5fd22db384606112900b2caef11cc7bdc262f98
2014-01-30 19:02:46 -08:00
Gavin Sharp
9380c7d80a Backed out changeset 00cead8f21d4 (bug 965464, should have been bug 965474)
--HG--
extra : rebase_source : 43997ecb392c716aa147407985b6f823ac087db8
2014-01-30 19:08:08 -08:00
Mark Hammond
9a83695045 Bug 965464 - allow for an initial sync on new user signin. r=ckarlof 2014-01-30 19:02:46 -08:00
Chris Karlof
346d43692c Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman
--HG--
extra : rebase_source : a78f079a22f4e196de21b7b15d63ecdc4d475a04
2014-01-29 19:26:01 -08:00
Mark Hammond
8a50b148fc Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert 2014-01-30 14:50:31 -08:00
Ryan VanderMeulen
646caf3be2 Merge m-c to fx-team. 2014-01-30 16:40:31 -05:00
Ryan VanderMeulen
51a0bb8010 Merge fx-team to m-c. 2014-01-30 16:23:01 -05:00
Tim Taubert
867f7f9e57 Bug 965544 - Show "now syncing" doorhanger when sync actually starts, once per login r=markh 2014-01-29 12:41:07 -08:00
Gregory Szorc
b14e377e09 Bug 965587 - Add lock to Firefox Health Report uploading; r=rnewman
Previously, it was technically possible for the FHR client to have
multiple simultaneous uploads. While this should never occur in
well-behaving systems, server logs have indicated that this behavior
might be occurring.

This patch adds a lock around uploading to ensure only 1 upload
operation may be active at a given time.

To measure the impact of this change in the wild, we added a counter
that increments whenever a held lock is encountered.

--HG--
extra : rebase_source : f0bb5065a3618cd335b6b6f31e4e68850f31f151
2014-01-29 15:28:57 -08:00
Wes Kocher
5a00a2520f Backed out changeset a76b3c746743 (bug 960887) for xpcshell bustage 2014-01-29 21:04:47 -08:00
Wes Kocher
9f96220b89 Backed out changeset 2bfa24370b7c (bug 965461) 2014-01-29 21:04:08 -08:00
Mark Hammond
b107d4328f Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert 2014-01-29 19:26:01 -08:00
Chris Karlof
8905ac86a3 Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman 2014-01-29 19:26:01 -08:00
Mark Hammond
dd2d27d27b Bug 965334 - Have browserid_identity create a DumpAppender to help debugging. r=ttaubert 2014-01-29 18:39:59 -08:00
Chris Karlof
058e833036 Bug 963251 - Update pref to use final production token server. r=markh 2014-01-29 18:39:59 -08:00
Jed Parsons
ac30be6052 Bug 959919 - Send X-Client-State header to token server. r=rnewman 2014-01-29 15:02:09 -08:00
Jed Parsons
25f284c3cb Bug 958464 - Report cause of 401 error from token server. r=ckarlof 2014-01-28 15:01:23 -08:00
Carsten "Tomcat" Book
0c86807f34 Backed out changeset 6f10f2e4ef13 (bug 960887) for XPC Bustage on a CLOSED TREE 2014-01-30 10:39:59 +01:00
Carsten "Tomcat" Book
bddabadbe2 Backed out changeset 2b4f723f6c60 (bug 965461) for XPC Bustage on a CLOSED TREE 2014-01-30 10:39:40 +01:00
Mark Hammond
701d4b0045 Bug 965461 - ensure sync itself and sync prefs pane considers we are logged in after key fetch. r=ttaubert 2014-01-30 00:22:55 -08:00
Chris Karlof
45ee5f07ba Bug 960887 - Handle storage endpoints returned by 1.5 token server. r=rnewman 2014-01-30 00:22:55 -08:00
Tim Taubert
2fd6d7c401 Bug 963384 - Implement modal "Choose What To Sync" dialog r=markh 2014-01-28 18:57:19 -08:00
Mark Hammond
3e0d8dd577 Bug 959222 (part 1) - Make browserid_identity a first-class identity module. r=rnewman 2014-01-28 17:51:09 -08:00
Mark Hammond
bce353b88e Bug 959990 - Add Firefox Accounts specific TOS and PP prefs and have utils functions open them if appropriate. r=rnewman. 2014-01-28 17:51:08 -08:00
Ryan VanderMeulen
fef07c2712 Merge m-c to inbound. 2014-01-30 16:36:04 -05:00
Georg Fritzsche
210817b7d7 Bug 928575 - Overhaul FHR data collection for extensions and plugins for desktop. r=gps 2014-01-15 16:12:41 +01:00
Geoff Brown
9a962e2456 Bug 969624 - Skip test_storageservice_client.js on Android 2.3 emulator; r=dminor 2014-02-24 17:51:15 -07:00
Jed Parsons
7225b2bfe1 Bug 962849 - FxAccounts.jsm method to resend verification email; r=markh 2014-01-23 16:52:24 -08:00
Mark Hammond
ea92f5114b Bug 959548 - Determine what identity manager to use as sync is initialized. r=ckarlof,rnewman 2014-01-14 13:13:08 +01:00
Tim Taubert
7c1a224b2f Bug 957421 - Keep FxA pref names consistent r=markh,rnewman,nalexander 2014-01-21 14:13:45 +01:00
Gregory Szorc
6f789f2007 Bug 959356 - Report isWow64 in Firefox Health Report; r=bsmedberg
Previously, we weren't measuring whether the machine was 64-bit
properly. This change allows us to report actual CPU architecture (at
least on Windows).

In the future, we may wish to properly report actual CPU architecture on
all operating systems.

--HG--
extra : rebase_source : 73b5673e870e959a33172ec22fee8c31db6e0e53
extra : amend_source : 64d2e23be07aa87bc5c150b6e613e6226c848ec8
2014-01-17 09:25:39 -08:00
Gregory Szorc
ff2ea33e7d Bug 961146 - Refactor Health Report documentation, import external docs; r=rnewman
FHR docs were extracted from /services/docs into their own compartment.
This arguably should have been done originally.

Documentation on the payload format has been imported from
https://github.com/mozilla-services/docs. Those docs were created in a
time before we had in-tree docs and this tree is a more logical home for
them.

--HG--
rename : services/docs/healthreport.rst => services/healthreport/docs/index.rst
extra : rebase_source : 4e2fd62cc98ea2620f580e34d032cb39bafb5108
extra : amend_source : bd6309cc9d53aba1b085067960bf20a94125c5b0
2014-01-22 17:47:15 -08:00
Fernando Jiménez
ffeddc93ad Bug 952063 - Trigger FxAccountsIACHelper 'onlogin', 'onlogout' and 'onverified' events when required. Part 1: Add onverified/onlogin. r=markh 2014-01-22 14:22:59 +01:00
Richard Newman
a13b1fe3a5 Bug 960322 - Use "BrowserID" in desktop tokenserver authz header, not "Browser-ID". r=rnewman 2014-01-16 22:24:53 -08:00
Fernando Jiménez
cf88f33582 Bug 959535 - FxAccountsManager should clear its account cache when FxAccounts performs a logout. r=markh 2014-01-15 13:07:20 +01:00
Fernando Jiménez
aee07b46ab Bug 958546 - s/isVerified/verified in all FxAccounts related code. r=markh 2014-01-14 17:00:36 +01:00
Richard Newman
1e084ce847 Bug 956936 - Include supported Sync protocol versions in desktop client records. r=gps 2014-01-06 21:45:26 -08:00
Nick Alexander
41530762ce Merge m-c to s-c 2014-01-07 15:22:58 -08:00
Richard Newman
4b428980e6 Bug 956442 - Include version in desktop Sync client records. r=gps 2014-01-06 18:41:12 -08:00
Tim Taubert
ae60773121 Bug 956724 - Fix broken onload handler for DOMWindows r=rnewman
From fdb5e3aab7479a9cf0ff7b78dcd373e296707e56 Mon Sep 17 00:00:00 2001
2014-01-06 16:23:40 +01:00
Richard Newman
be3a852b60 Bug 953282 - Fix idle observer notification, after Bug 715041 broke in-tree consumers. r=gps 2013-12-27 21:12:50 -08:00
Tim Taubert
10b26b16ea merge m-c to elm 2013-12-20 15:05:28 +01:00
Mark Hammond
43925801cc Bug 949695 tests followup - fix test_handleSyncError to reset error account so it passes when run twice 2013-12-20 15:57:26 +11:00
Mark Hammond
152f80143a Bug 949695 tests followup - convert more tests to run with both identity managers. 2013-12-20 15:57:26 +11:00
Mark Hammond
789370bf6f Bug 949695 tests followup - convert test_service_wipeServer to identity_test infrastructure 2013-12-20 15:57:26 +11:00
Mark Hammond
6c7ce4fcfd Bug 949695 tests followup - Add ability to run tests twice - once with each identity manager - and have test_service_startOver use it. 2013-12-20 15:57:26 +11:00
Mark Hammond
3bab750dd5 Bug 949259 followup - refactor identity config for tests and remove need to pass params to BrowserIDManager. 2013-12-20 15:57:26 +11:00
Mark Hammond
d350805b4b Bug 949695 followup - add resetCredentials/resetSyncKey to avoid BrowserID setters from being called. 2013-12-20 15:57:25 +11:00
Wes Kocher
8572872387 Merge inbound to m-c 2013-12-19 18:58:45 -08:00
Richard Newman
90d4d0b764 Bug 947772 - Follow-up: fix sneaky test (disabled on some platforms). r=me 2013-12-19 11:48:23 -08:00
Tim Taubert
4be4a6b411 merge m-c to elm 2013-12-19 15:52:32 +01:00
Richard Newman
f54050893e Merge m-c to s-c. 2013-12-18 21:47:50 -08:00
Richard Newman
6244e79e8b Bug 947772 - Sync adds tracker observers regardless of engine enabled state. r=gps 2013-12-18 21:42:17 -08:00
Mark Hammond
86a705e741 dump JSON.stringified error on HAWK.signCertificate error 2013-12-19 16:38:35 +11:00
Mark Hammond
160f195539 put sync identity initialization behind a pref 2013-12-19 16:38:35 +11:00
Tim Taubert
f96735c7a9 merge m-c to elm 2013-12-18 17:54:23 +01:00
Chris Karlof
a607ea974b Bug 949695 - integrate weave with browserid_identity on elm. 2013-12-17 15:45:03 +11:00
Brian Warner
b001fa2734 Bug 949259 (elm) - bring elm up-to-date with patch in bug 949259. 2013-12-17 15:45:03 +11:00
Brian Warner
c8f872faad Bug 949244 - fix getSignedInUser when the email is still unverified and other FxAccounts.jsm improvements. 2013-12-17 15:45:03 +11:00
Nick Alexander
3bf2796013 Merge m-c to elm 2013-12-16 09:13:10 -08:00
Jeff Walden
5514a61695 Remove an exact-error-message check from an xpcshell test -- error message string format is not a stable interface, and tests shouldn't break when message strings change from time to time. Followup to bug 507998, r=orange
--HG--
extra : rebase_source : b30fe2c6dc49c3278e1177bee7e55b6ee833dac6
2013-12-19 16:29:10 -05:00
Nick Alexander
51c2e9cbfe Merge m-c to elm
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-12-12 08:21:15 -08:00
Nick Alexander
4eb068477b Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander
17885804f2 Merge m-c to elm 2013-12-11 10:25:40 -08:00
Ryan VanderMeulen
d9662b7431 Merge fx-team to m-c. 2013-12-13 15:39:51 -05:00
Brian Warner
0ea0c34d5d Bug 949241 - Enhance HAWK tests. r=rnewman 2013-12-13 12:12:01 -05:00
Chris Karlof
124d02bea1 Bug 772261 - Add duration to token server and client. r=rnewman 2013-12-13 12:12:00 -05:00
Jed Parsons
0152d432ca Bug 948212 - Fix FxAccounts.jsm: internal.signOut() is not a function. r=markh 2013-12-09 17:15:30 -08:00
Fernando Jiménez
119fa6913e Bug 943998 - Need debug and uri pref for FirefoxAccounts. r=markh
--HG--
rename : services/fxaccounts/FxAccountsConsts.js => services/fxaccounts/FxAccountsCommon.js
2013-12-13 12:37:55 +01:00
Fernando Jiménez
2843b70836 Bug 949526 - FxAccountsManager and B2G implementation. Part 4: Tests. r=markh 2013-12-13 12:25:27 +01:00
Fernando Jiménez
5d402010a7 Bug 949526 - FxAccountsManager and B2G implementation. Part 2: UI Glue r=fabrice 2013-12-13 12:25:26 +01:00
Fernando Jiménez
f9db20d83c Bug 949526 - FxAccountsManager and B2G implementation. Part 1: FxAccountsManager. r=markh 2013-12-13 12:25:26 +01:00
Gregory Szorc
158ed8b3ec Bug 774572 - Part 2: Define JAR_MANIFESTS in moz.build files; r=glandium
Every directory with a jar.mn now has JAR_MANIFESTS defined in its
moz.build file.

We also removed the may_skip special consideration of jar.mn files
because this information is now available during tier traversal by the
reader courtesy of the variables being present in moz.build files.

--HG--
extra : rebase_source : 21049b15e6bd9cf65b0805ccaccc4ba5aae93c98
extra : amend_source : 0b1ea866d725beef92d37c6f6d475369ac002e19
2013-12-10 16:18:11 +09:00
Fernando Jiménez
cfc17421e6 Bug 950631 - ReferenceError: credentials is not defined in FxAccounts.jsm. r=jedp 2013-12-17 08:48:45 +01:00
Gregory Szorc
158e9a5661 Bug 924307 - More logging and error checking during FHR init; r=rnewman
--HG--
extra : rebase_source : d4d0b29eef195b62d133680edfee6bc541159c5c
extra : amend_source : 2ea9b8576a2d91912c1078fe25969bf52dbd05dd
2013-11-21 09:39:16 -08:00
Nick Alexander
93e112c0d8 Merge m-c to elm 2013-11-18 08:22:59 -08:00