Commit Graph

8765 Commits

Author SHA1 Message Date
Matthew Noorenberghe
1afd30fc5a Bug 1021618 - Create the foundation for converting preference dialogs to be in-content. r=jaws a11y=MarcoZ f=Paenglab,davidb 2014-06-26 13:17:17 -04:00
Carsten "Tomcat" Book
0e0a47e9f3 Merge mozilla-central to fx-team 2014-06-26 15:53:44 +02:00
Mark Banner
5c3cd1dcdd Bug 1030062 Loop Marionette tests need clearer failure points when displayed on tbpl. r=dburns 2014-06-26 09:00:08 +01:00
Wes Kocher
63967fdc03 Merge m-c to inbound a=merge 2014-06-25 18:39:25 -07:00
Gijs Kruitbosch
c4cffea63e Bug 1027125 - set sync signup pref for button test, r=ttaubert 2014-06-25 16:23:42 +01:00
Carsten "Tomcat" Book
ea57b2f6fe Backed out changeset 24fb014f1ae3 (bug 1021618) for Linux Memory Leak on a CLOSED TREE 2014-06-25 10:03:44 +02:00
Matthew Noorenberghe
c4b4d92eef Bug 1021618 - Create the foundation for converting preference dialogs to be in-content. r=jaws a11y=MarcoZ f=Paenglab,davidb 2014-06-25 02:38:24 -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
David Rajchenbach-Teller
409d9e236e Bug 883609 - Porting tests to new Session Restore backup mechanism;r=ttaubert
--HG--
rename : browser/components/sessionstore/test/browser_833286_atomic_backup.js => browser/components/sessionstore/test/browser_backup_recovery.js
2014-06-24 16:51:22 +02:00
David Rajchenbach-Teller
dda55660fc Bug 883609 - Make Session Restore backups useful;r=ttaubert 2014-06-24 16:51:15 +02: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
Brian R. Bondy
8cd13a3270 Bug 1028575 - Remove brandShortName from Preferences tab title. r=jaws 2014-06-24 09:45:17 -04:00
Tim Taubert
a6cce4d071 Bug 1029486 - Check for dead wrappers after running language detection r=felipe 2014-06-24 14:04:45 +02:00
Asaf Romano
80952d18ee Bug 1029363 - browser_translation_fhr.js fails if it runs on its own. r=ttaubert. 2014-06-24 11:42:49 +03: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
Asaf Romano
a9690e1dd6 Bug 977774 - Count the number of times a user opts out of Instant Translation. r=felipe. 2014-06-24 11:40:24 +03:00
Vikneshwar
085d53d4c1 Bug 1027819 - Replace the deprecated initEvent code with the CustomEvent constructor. r=jaws 2014-06-20 11:28:00 +02:00
Carsten "Tomcat" Book
333b876740 Backed out changeset 5e0288a4e398 (bug 977774) for bc1 test failures 2014-06-24 09:13:47 +02:00
Carsten "Tomcat" Book
57655b7b7e Backed out changeset 895eeb7bddb8 (bug 973294) for bc1 test failures 2014-06-24 09:13:34 +02: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
Asaf Romano
6852295bd8 Bug 977774 - Count the number of times a user opts out of Instant Translation. r=felipe. 2014-06-24 08:30:47 +03:00
Ryan VanderMeulen
630815ba86 Merge m-c to fx-team. a=merge 2014-06-23 10:59:41 -04:00
Ryan VanderMeulen
adb70139cc Merge inbound to m-c. a=merge 2014-06-23 10:42:32 -04:00
kernp25@yahoo.com
30fd62f102 Bug 480242 - "Always ask" doesn't work for Plugins. r=Unfocused 2014-06-23 21:44:49 +12:00
Mark Banner
d3de984921 Bug 1023279 Make conversation window title localizable, and add missing license header. r=nperriault,ui-review=darrin 2014-06-23 11:48:32 +01:00
Asaf Romano
293536d1d6 Bug 977774 - Metric for tracking opts out of Instant Translation. r=felipe. 2014-06-22 12:23:40 +03:00
Florian Quèze
46e8421108 Bug 1022856 - Implement translator provider attribution. r=felipe
Parts of the patch written by Felipe, with r=florian
2014-06-20 15:50:41 -03:00
Tim Taubert
c8c5f3bbc7 Backed out changeset 65a7440e87ea (bug 1027092) 2014-06-20 17:08:52 +02:00
Tim Taubert
7ed6552b1e Bug 1027096 - Fix encoding errors in browser_911547.js r=smacleod 2014-06-18 16:01:33 +02:00
Tim Taubert
01d93a3314 Bug 1027087 - Fix ContentRestore errors when a tab is closed while restoring into it r=smacleod 2014-06-18 14:48:12 +02:00
Tim Taubert
c9158aa8f2 Bug 1027092 - Fix "this.editor is undefined" errors when running browser_394759_behavior.js r=smacleod 2014-06-18 15:56:39 +02:00
Dão Gottwald
a1f6c67c7b Bug 867317 - Implement transition for showing and hiding toolbars. r=jaws 2014-06-20 14:11:55 +02:00
Wes Kocher
387f8bb39f Merge m-c to fx-team 2014-06-19 18:33:19 -07:00
Wes Kocher
af6ad08f86 Merge inbound to m-c a=merge 2014-06-19 18:07:43 -07:00
Florian Quèze
8ab686ea99 Bug 1022640 - the Translation UI disappears when tearing off a tab, r=felipe. 2014-06-19 19:40:24 +02:00
Ed Morley
901a1e2acc Merge mozilla-central and fx-team 2014-06-19 17:20:10 +01:00
Ed Morley
6703cfdbb0 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-19 15:59:56 +01:00
Mike de Boer
782d1b99f9 Bug 1022725: add a mock httpd.js Translation provider for tests. r=florian,felipe 2014-06-19 16:56:02 +02:00
Mike de Boer
a5ea2f48a7 Bug 1022725: Rename BingTranslation to BingTranslator and allow overriding URLs. r=florian 2014-06-19 16:56:00 +02:00
Florian Quèze
156db1bd01 Bug 1027024 - Never translate 'language' disappears when close/open translation infobar using a expired key, r=mikedeboer. 2014-06-19 12:09:28 +02:00
Ryan VanderMeulen
ad8fba4501 Merge m-c to fx-team. a=merge 2014-06-18 16:17:58 -04:00
Jared Wein
9954500055 Bug 754304 - make in-content preferences linkable via URL. r=mattn 2014-06-19 16:12:52 -04:00
Birunthan Mohanathas
51ba75d135 Bug 1016240 - Exterminate CR+LF line endings. r=briansmith,cpearce,ehsan,gavin 2014-06-18 17:56:02 -07:00
Wes Kocher
4c297ef8c0 Merge m-c to inbound a=merge 2014-06-23 18:59:54 -07:00
Benoit Jacob
dd08a67adb Bug 1028588 - Fix dangerous public destructors in miscellaneous places - r=ehsan 2014-06-23 18:40:03 -04:00
Dão Gottwald
179cf8d577 Bug 996053 - make nsISessionStore's setTabValue, setWindowValue and setGlobalValue take arbitrary JS values but throw for non-strings, for consistency with SessionStore.jsm. r=ttaubert
--HG--
extra : rebase_source : 6fc3457960da44e27be89ff89bbc9398ec87375a
2014-06-18 20:12:19 +02: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
Blake Kaplan
6395ab74bd Bug 949617 - Make the login manager work in e10s. r=dolske
--HG--
extra : rebase_source : 412da12f3c916a2e57092943096a15b2c38955e7
extra : histedit_source : 030de4e9454cd4c150126fdb7500ab27023ad244
2014-06-24 16:57:39 -04:00