b1f20f9c54
Merge m-c to fx-team
2014-07-29 17:21:24 -07:00
c3fdde7659
Merge b2g-inbound to m-c a=merge
2014-07-29 16:42:15 -07:00
3fc79058a2
Bug 1014524 - Add HotfixProvider to XPCOM manifest; r=rnewman
...
--HG--
extra : rebase_source : 09108f61288d86f2739945ffa9efc79b9587c72a
2014-07-29 11:11:51 -07:00
93ba218ccc
Bug 1014524 - Report update hotfix results in FHR; r=rnewman
...
The v20140527.01 update hotfix deposited a JSON file in the profile
directory containing state. This file was purposefully not deleted
during hotfix uninstall so its contents could be later reported in
FHR.
This patch adds that reporting to FHR.
Currently, we only report a subset of the available fields. The
remaining "public" fields could be added easily enough. For now, it is
important that we capture the important ones.
--HG--
extra : rebase_source : 925d6ea04118296108327dc843323b150b87b208
2014-07-25 12:25:06 -07:00
2bab6202af
Bug 1043820 - Remove PARALLEL_DIRS. r=gps
2014-07-29 08:57:59 +09:00
92e83c5795
Bug 1044041 - remove now-unnecessary rule from services/healthreport/Makefile.in; r=gps
2014-07-25 11:11:28 -04:00
7ea4dd517f
Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files; fix previous bustage on a CLOSED TREE, r=ahal
2014-07-02 15:40:56 -07:00
13e1f93153
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2014-07-21 14:19:15 -07:00
f191a1b74f
Bug 1013064, backout e5dfe9801f76, 11f3a97d1d2c, e2374762f521, 91db8acb8d7e, d0050ba0b875 due to sync issues
2014-07-21 09:09:41 -04:00
17d1a2d5f3
Bug 1044792 - Send MCC and MNC on POST /sms/mt/verify. r=spenrose
2014-07-29 14:27:03 +02:00
2702b1e946
Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
...
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
0a9a6684a2
Bug 1013064 (part 4) - browserid_identity and sync changes to support FxA credentials in the login manager. r=ckarlof,rnewman
...
From 9717484083e66b78eedfa14e539d51382aba760f Mon Sep 17 00:00:00 2001
---
services/sync/modules/browserid_identity.js | 61 ++++++++++++++++++++--
services/sync/modules/identity.js | 19 +++++++
services/sync/modules/service.js | 20 ++++---
.../sync/tests/unit/test_browserid_identity.js | 15 ++++++
4 files changed, 102 insertions(+), 13 deletions(-)
2014-06-14 14:33:56 +10:00
12436672a3
Bug 1013064 (part 3) - only migrate data into the loginmgr when it is unlocked. r=ckarlof
...
From 86c67f9b9081ce905442c86b38575b3422c8dce3 Mon Sep 17 00:00:00 2001
---
services/fxaccounts/FxAccounts.jsm | 25 ++++-
.../tests/xpcshell/test_loginmgr_storage.js | 113 +++++++++++++++++++++
2 files changed, 137 insertions(+), 1 deletion(-)
2014-06-18 15:07:41 +10:00
e520f78577
Bug 1013064 (part 2) - Store sensitive FxA credentials in the login manager. r=ckarlof
...
From 4a92f9ee1ba35989f82a24bba18806f8616a5be8 Mon Sep 17 00:00:00 2001
---
services/fxaccounts/FxAccounts.jsm | 170 ++++++++++++++++++
services/fxaccounts/FxAccountsCommon.js | 13 ++
services/fxaccounts/moz.build | 5 +-
.../tests/xpcshell/test_loginmgr_storage.js | 196 +++++++++++++++++++++
services/fxaccounts/tests/xpcshell/xpcshell.ini | 2 +
services/sync/modules/util.js | 12 +-
6 files changed, 396 insertions(+), 2 deletions(-)
create mode 100644 services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
2014-06-14 14:33:20 +10:00
7fbee60fc9
Merge fx-team to m-c. a=merge
2014-07-11 16:22:36 -04:00
f40d884f09
Bug 1028398 - FxA will silently provide user's email to privileged apps in 2.0. Part 2: Trigger forceAuth when new privileged app tries to get a FxA assertion. r=jedp"
2014-07-11 16:13:32 +02:00
0b8072e06c
Bug 1035337 - Introduce API to record when the infobar is hidden due to "Never translate this language/site". r=felipe
...
--HG--
extra : rebase_source : 04dd1e060efad6160997194ba1b128c7f8a5db36
extra : histedit_source : be5f46896497e1bef1aa5ace5850793c4556527d
2014-07-10 18:31:56 -04:00
d1a397eff8
Bug 1033238 - Cannot revoke Mobile ID permission. r=jedp
2014-07-11 14:56:57 +02:00
84fe7e5e67
Bug 1023780 - Ensure that Mobile ID client support the 401/110 error (invalid token) properly. r=jedp
2014-07-11 14:56:56 +02:00
30f43e9c10
Bug 1036444 - Kill touchenter and touchleave events. r=smaug
2014-07-09 10:27:00 -04:00
013b94f495
Bug 1036198 - rejection not defined in _handleGetAssertionError. r=spenrose
2014-07-08 18:00:25 -07:00
7a8c61014e
Merge m-c to inbound
2014-07-08 20:04:41 -07:00
62a193212a
Bug 1022181 - Mobile ID Tests. Part 2: Mobile Identity Service Tests. r=jedp
2014-07-08 19:57:44 +02:00
4bc32621ba
Bug 1026999 - Mobile ID - SIM change scenario is not working. r=jedp
2014-07-08 19:57:43 +02:00
55ac136605
Bug 982816 - Remove extra calls to nextTest in test_hawkrequest.js r=ckarlof
2014-07-08 11:44:03 -07:00
a98c31f1a8
merge fx-team to mozilla-central a=merge
2014-07-08 15:10:56 +02:00
25170257c3
Bug 1033836 - Convert TESTING_JS_MODULES to moz.build; r=glandium
...
--HG--
extra : rebase_source : 1cd9e402c507260358af7a93c6fb2fc91c24994b
2014-07-02 16:43:41 -07:00
04d5343419
Bug 1033836 - Rename services-common to services/common; rs=rnewman
...
The upcoming build system patches don't support hypthens in path names.
Changing this for that reason is kind of silly, but it's the easiest
way. Besides, nothing else uses hyphens in directory names.
--HG--
extra : rebase_source : 42dda2b1f16a3c0bfe17397a70092362e400530f
2014-07-02 16:49:36 -07:00
549f1eb82f
Bug 958868 - Add support for delta line and page accumulation; r=masayuki, sr=smaug
2014-07-07 18:54:14 +09:00
24d3b9ebd9
Bug 1032017 Remove MOZ_SERVICES_FXACCOUNTS flags as it is no longer necessary. Also fixes test_hawkrequest.js failures in m-c. r=glandium
2014-07-08 07:37:57 +01:00
eaaaed8472
Bug 994707 - Introduce crash submission events and handle them. r=bsmedberg
...
This introduces a new crash event type for submissions and handles
them in the Crash Manager. These crash submissions will also be counted
in FHR.
--HG--
extra : rebase_source : c37fc86cecc86aea0afdd8cfa7b31295aad3d6f8
2014-07-03 14:04:28 -04:00
f1d146e3eb
Bug 1021595 - Set "services.mobileid.forcehttps" to true once the server is https. r=jedp
2014-07-03 11:56:34 +02:00
e8b7d231d3
Bug 1031580 - FxA fires ONLOGIN only for calling RP. r=jedp
2014-07-01 10:31:17 -07:00
f554394022
Bug 1022193 - Add a "forceIdSelection" to navigator.getMobileIdAssertion. Part 3: MobileIdentityManager. r=jedp
2014-06-27 01:18:21 +02:00
30de9de7a8
Bug 1023266 - Make the Mobile ID API privileged. Part 2: Fix permission check. r=jedp
2014-06-27 01:18:20 +02:00
53e5c741a2
Bug 1029031 - Record default search provider in FHR; r=bsmedberg, MattN
...
--HG--
extra : rebase_source : 7e3c2688db567bac8760c405d9e9d7d41e8564d9
extra : amend_source : a5f4264ec947ae27e3036018034e0b17bf1e8590
2014-06-25 12:44:00 -07:00
8295abf927
Bug 1017806 - Record and report on optional branches of experiments, so that each experiment doesn't have to re-invent data collection. r=gfritzsche
2014-06-25 15:16:13 -04:00
7e20285e70
Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
...
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):
- Never set the buffer's mode.
Years ago, Emacs did not have a good JavaScript mode, so it made sense
to use Java or C++ mode in .js files. However, Emacs has had js-mode for
years now; it's perfectly serviceable, and is available and enabled by
default in all major Emacs packagings.
Selecting a mode in the -*- file variable line -*- is almost always the
wrong thing to do anyway. It overrides Emacs's default choice, which is
(now) reasonable; and even worse, it overrides settings the user might
have made in their '.emacs' file for that file extension. It's only
useful when there's something specific about that particular file that
makes a particular mode appropriate.
- Correctly propagate settings that establish the correct indentation
level for this file: c-basic-offset and js2-basic-offset should be
js-indent-level. Whatever value they're given should be preserved;
different parts of our tree use different indentation styles.
- We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
Remove tab-width: settings, at least in files that don't contain tab
characters.
- Remove js2-mode settings that belong in the user's .emacs file, like
js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
736101e1e8
Merge mozilla-central and fx-team
2014-06-24 17:24:53 +01:00
4c3f72e562
Merge latest green fx-team changeset and mozilla-central; a=merge
2014-06-24 17:02:56 +01:00
900b49eb1e
Bug 977770 - Count the times users manually adjust the offered translation pair. r=felipe.
2014-06-24 16:53:30 +03:00
7cc40ece67
Backed out changeset 8499eefa342e (bug 958868) for m2 test failures on a CLOSED TREE
2014-06-24 12:49:47 +02:00
0e132b65dc
Bug 973294 - Count the number of times 'Show Original' is used. r=felipe.
2014-06-24 11:41:52 +03:00
57655b7b7e
Backed out changeset 895eeb7bddb8 (bug 973294) for bc1 test failures
2014-06-24 09:13:34 +02:00
6e373479dd
Bug 1024757 - Follow up, update example documentation. r=felipe.
2014-06-24 08:45:00 +03:00
007ecd2b70
Bug 973294 - Firefox counts the number of times that users pick 'Show Original'. r=felipe.
2014-06-24 08:36:56 +03:00
25358a7059
Bug 958868 - Add support for delta line and page accumulation; r=masayuki, sr=smaug
2014-06-24 18:02:11 +09:00
adb70139cc
Merge inbound to m-c. a=merge
2014-06-23 10:42:32 -04:00
293536d1d6
Bug 977774 - Metric for tracking opts out of Instant Translation. r=felipe.
2014-06-22 12:23:40 +03:00
387f8bb39f
Merge m-c to fx-team
2014-06-19 18:33:19 -07:00
Wes Kocher
Gregory Szorc
Mike Hommey
Nathan Froyd
Alexandre Poirot
ffxbld
Neil Deakin
Fernando Jiménez
Mark Hammond
Ryan VanderMeulen
Steven MacLeod
Kartikaya Gupta
Jed Parsons
Steve Workman
Carsten "Tomcat" Book
Andrew Comminos
Mark Banner
Sam Penrose
Benjamin Smedberg
Jim Blandy
Ed Morley
Asaf Romano
Felipe Gomes