Commit Graph

3473 Commits

Author SHA1 Message Date
Fernando Jiménez
30de9de7a8 Bug 1023266 - Make the Mobile ID API privileged. Part 2: Fix permission check. r=jedp 2014-06-27 01:18:20 +02:00
Gregory Szorc
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
Benjamin Smedberg
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
Jim Blandy
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
Ed Morley
736101e1e8 Merge mozilla-central and fx-team 2014-06-24 17:24:53 +01:00
Ed Morley
4c3f72e562 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Asaf Romano
900b49eb1e Bug 977770 - Count the times users manually adjust the offered translation pair. r=felipe. 2014-06-24 16:53:30 +03:00
Carsten "Tomcat" Book
7cc40ece67 Backed out changeset 8499eefa342e (bug 958868) for m2 test failures on a CLOSED TREE 2014-06-24 12:49:47 +02:00
Asaf Romano
0e132b65dc Bug 973294 - Count the number of times 'Show Original' is used. r=felipe. 2014-06-24 11:41:52 +03:00
Carsten "Tomcat" Book
57655b7b7e Backed out changeset 895eeb7bddb8 (bug 973294) for bc1 test failures 2014-06-24 09:13:34 +02:00
Felipe Gomes
6e373479dd Bug 1024757 - Follow up, update example documentation. r=felipe. 2014-06-24 08:45:00 +03:00
Asaf Romano
007ecd2b70 Bug 973294 - Firefox counts the number of times that users pick 'Show Original'. r=felipe. 2014-06-24 08:36:56 +03:00
Andrew Comminos
25358a7059 Bug 958868 - Add support for delta line and page accumulation; r=masayuki, sr=smaug 2014-06-24 18:02:11 +09:00
Ryan VanderMeulen
adb70139cc Merge inbound to m-c. a=merge 2014-06-23 10:42:32 -04:00
Asaf Romano
293536d1d6 Bug 977774 - Metric for tracking opts out of Instant Translation. r=felipe. 2014-06-22 12:23:40 +03:00
Wes Kocher
387f8bb39f Merge m-c to fx-team 2014-06-19 18:33:19 -07:00
Benoit Jacob
dd08a67adb Bug 1028588 - Fix dangerous public destructors in miscellaneous places - r=ehsan 2014-06-23 18:40:03 -04:00
Felipe Gomes
39039f6701 Bug 1024757 - Translation FHR should report missed opportunities due to the detected language not being part of the list of supported languages. r=mdeboer 2014-06-19 13:42:29 -03:00
Michael Brennan
88fb9d432f Bug 939072: Refactor Sqlite connections to support finalization; r=Yoric
--HG--
extra : rebase_source : 2171ab3b3f7cf654ccc37865f5def9fc7f133e3c
2014-06-11 23:40:06 +02:00
Carsten "Tomcat" Book
c720055e6d Merge mozilla-central to mozilla-inbound 2014-06-18 14:41:11 +02:00
Mark Hammond
975c808fd7 Bug 1026359 - FxAccounts will try and log an undefined variable on error. r=jedp 2014-06-18 09:26:06 +10:00
Tim Taubert
0c2ddde4ae Bug 991907 - checkEmailStatus in FxAccounts.jsm doesn't handle errors r=markh 2014-06-16 11:47:45 +02:00
Mark Banner
59a1c3ac3e Bug 1020859 Part 1 - Make HawkClient return all the response details for a request, and make deriveHawkCredentials common code. r=jparsons 2014-06-18 10:42:15 +01:00
Mark Hammond
79bf688cfb Bug 1024812 - unhandled exceptions in hawkclient no longer cause sync to hang. r=rnewman 2014-06-14 11:47:34 +10:00
Ed Morley
e9af0f26e9 Merge mozilla-central and b2g-inbound 2014-06-12 16:02:18 +01:00
Mark Hammond
3446835782 Bug 1015794 - use Object.create to create services timer objects. r=rnewman 2014-06-12 10:06:47 +10:00
Sam Penrose
cbc6e10aa8 Bug 1023463 - [FxA] Leave user logged in after failed RP refresh authentication. r=jedp 2014-06-10 16:38:55 -07:00
Brian Warner
f684b7b882 Bug 1021950 - Delete unwrapBKey after we're done with it. r=ckarlof 2014-06-09 11:53:00 -04:00
Mark Hammond
783db8b7f4 Bug 995599 - prevent services tests hitting the network. r=rnewman
--HG--
extra : rebase_source : f38fefae031f4cbd94215ee61f89a553b1f5c272
2014-06-10 12:02:39 +10:00
Ryan VanderMeulen
7f089812ff Merge m-c to inbound. a=merge 2014-06-09 18:13:50 -04:00
ffxbld
5d6165c841 Version bump. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release 2014-06-09 11:50:02 -07:00
Sam Penrose
d91bae5b76 Bug 1008901 - Fire 'onlogin' when the account is verified. r=jedp 2014-06-06 10:42:22 -07:00
Fernando Jiménez
bb7584f78c Bug 988469 - MSISDN verification API for privileged apps. Part 4: Mobile ID service. r=markh, jedp 2014-06-07 19:30:19 +02:00
Fernando Jiménez
3a335772ca Bug 988469 - MSISDN verification API for privileged apps. Part 2: Make FxA specific stuff generic. r=markh 2014-06-07 19:30:18 +02:00
Sam Penrose
3765b1483d Bug 1004319 - Handle server-side account changes in Gecko. r=jedp 2014-06-06 08:54:27 -07:00
David Rajchenbach-Teller
039b13df10 Bug 1017706 - Make sure that healthreporter.jsm always initiates shutdown, even if it never receives quit-application. r=gps 2014-06-09 12:07:00 -04:00
Mike de Boer
dea3bd3c63 Bug 1015525: changes to translation prefs are now recorded by FHR. r=rnewman 2014-06-04 15:32:08 +02:00
Steven MacLeod
34d0f0822a Bug 978158 - Setup FHR provider for Translation project r=felipe,rnewman
--HG--
rename : browser/components/translation/test/test_cld2.js => browser/components/translation/test/unit/test_cld2.js
rename : browser/components/translation/test/xpcshell.ini => browser/components/translation/test/unit/xpcshell.ini
2014-06-03 18:08:35 +02:00
David Rajchenbach-Teller
129007abd8 Bug 1017706 - Better logging for FHR AsyncShutdown. r=rnewman 2014-06-02 04:28:00 +02:00
Mark Hammond
4a02a78886 Bug 1014957 - add telemetry probe to indicate if custom servers are used for sync. r=rnewman 2014-05-30 14:56:25 +10:00
Gijs Kruitbosch
7369b7f81b Bug 1011343 - don't log username in sync log, r=markh 2014-05-29 12:47:24 +01:00
Paolo Amadini
82d4807bf3 Bug 853549 - Use a JSON storage back-end in the Login Manager, except on Android. r=dolske 2014-01-07 17:29:41 +01:00
Carsten "Tomcat" Book
a09f70f357 Backed out changeset ca4caf0d721c (bug 853549) for valgrind testfailures 2014-05-28 15:53:13 +02:00
Paolo Amadini
e4ede54cb5 Bug 853549 - Use a JSON storage back-end in the Login Manager, except on Android. r=dolske 2014-01-07 17:29:41 +01:00
Mark Hammond
3da402253d Bug 1010531 - Prevent async callback from throwing when a callback is made with an error. r=rnewman 2014-05-28 10:00:00 +10:00
Mark Hammond
cc68451c4d Bug 1015794 - avoid mutating the prototype of a timer object to prevent warnings. r=rnewman 2014-05-28 09:54:52 +10:00
David Rajchenbach-Teller
3409d1ab07 Bug 1016389 - Fix uncaught async error in test_healthreporter.js. r=rnewman 2014-05-27 08:06:00 -04:00
Shashank Sabniveesu
6ebb289168 Bug 1014186 - Remove unused BookmarkJSONUtils from services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm. r=mak 2014-05-22 13:56:00 -04:00
David Rajchenbach-Teller
3c0791acd1 Bug 917883 - Use AsyncShutdown instead of spinning the event loop in healthreporter.jsm. r=gps, r=rnewman 2014-05-22 02:11:00 -04:00
Mark Hammond
19e1b5e569 Bug 1013448 - add telemetry probes for sync. r=rnewman 2014-05-27 10:39:51 +10:00