Commit Graph

13599 Commits

Author SHA1 Message Date
Nick Alexander
b2da8d069c Bug 1021864 - Post: Don't build Search Activity in Fennec by default. r=me 2014-06-30 11:22:34 -07:00
Nick Alexander
f1515270d6 Bug 1021864 - Part 4: Build Search Activity as part of the Fennec APK. r=rnewman 2014-06-30 11:21:50 -07:00
Nick Alexander
6f8e76455f Bug 1021864 - Part 3: Include Search Activity strings in Fennec. r=rnewman 2014-06-30 11:21:50 -07:00
Nick Alexander
5f54a0f7aa Bug 1021864 - Part 2: Add build feature flag MOZ_ANDROID_SEARCH_ACTIVITY. r=rnewman 2014-06-30 11:21:49 -07:00
Nick Alexander
075c815075 Bug 1021864 - Part 1: Land mobile/android/search. r=margaret 2014-06-30 11:21:48 -07:00
Jim Chen
539c24981c Bug 1026788 - Reinsert composition after removing autocomplete text; r=wesj 2014-06-30 13:24:06 -04:00
Jim Chen
a5fffbc4c8 Bug 1023303 - Restart IME when intercepting deleteSurroundingText call; r=wesj 2014-06-30 13:24:05 -04:00
Carsten "Tomcat" Book
756094f94b merge fx-team to mozilla-central a=merge 2014-06-30 15:29:16 +02:00
richmt9@gmail.com
388d4dbc0d Bug 1028815 - "7 days ago" label in History panel is confusing. r=liuche 2014-06-27 18:34:18 -04:00
Michael Pruett
bb1b9224ce Bug 1024360 - Remove usage of deprecated mozIStorageBaseStatement methods. r=mak 2014-06-27 09:59:09 -05:00
Phil Ringnalda
1ca1b3fbc5 Merge f-t to m-c, a=merge 2014-06-29 16:40:54 -07:00
Blake Kaplan
ca30773682 Bug 949617 - Make the login manager work in e10s. r=dolske/mconley/mfinkle/jimm 2014-06-28 11:09:45 -07:00
Franz Sarmiento
57638820e0 Bug 925986 - Code cleanup - Misc unused var declared in aboutReader method _toggleToolbarVisibility(), r=margaret 2014-06-28 00:20:27 -04:00
Ed Morley
a85c6aa4da Backed out changeset fd8d40d26de8 (bug 1025931) for robocop-1 failures 2014-06-27 15:40:12 +01:00
Ed Morley
906c5aa84b Backed out changeset a9f445169eca (bug 1030738) 2014-06-27 15:39:56 +01:00
Ed Morley
e1403194ac Backed out changeset 1bb1e5ed3272 (bug 1030743) 2014-06-27 15:39:53 +01:00
Carsten "Tomcat" Book
e49265d49a Merge mozilla-central to fx-team 2014-06-27 15:53:53 +02:00
Carsten "Tomcat" Book
f7c72a1840 merge fx-team to mozilla-central a=merge 2014-06-27 15:47:39 +02:00
Carsten "Tomcat" Book
2216cb670a Backed out changeset 8c1ee05fbbd6 (bug 949617) 2014-06-27 15:17:42 +02:00
Richard Newman
3d7024e886 Bug 1030740 - Add return statements inadvertently omitted from Bug 1025937. r=mcomella 2014-06-26 09:48:48 -07:00
Carsten "Tomcat" Book
1098f66f03 Merge mozilla-central to fx-team 2014-06-26 15:53:44 +02:00
Carsten "Tomcat" Book
9c954f17e2 merge fx-team to mozilla-central a=merge 2014-06-26 15:33:24 +02:00
Randall Barker
59d2b741db Bug 1031000 - Fix problem with TabSource Prompt. r=blassey 2014-06-26 14:21:00 +02:00
Nick Alexander
0366895e38 Bug 1030734 - Fix BROWSER_INTENT_{PACKAGE,CLASS} in background after Bug 929865. r=rnewman 2014-06-26 18:57:32 -07:00
Shashank Sabniveesu
d52df17bc9 Bug 1026010 - Rename GeckoApp.ACTION_BOOKMARK to ACTION_HOMESCREEN_SHORTCUT. r=lucasr 2014-06-25 09:10:00 -04:00
Franz Sarmiento
235c8e0d6e Bug 1028728 - Update findListViewWithTag consumers to use strings from HomePager. r=mcomella 2014-06-24 21:41:00 -04:00
Eric Edens
3a24ad1f86 Bug 881091 - Don't set byline if byline is too long. r=lucasr 2014-05-16 11:03:49 -07:00
Brad Lassey
d8237902de bug 1030743 - NullPointerExceptions in GeckoPreferences r=rnewman 2014-06-26 09:48:23 -04:00
Brad Lassey
9c96ad0756 bug 1030738 - NullPointerException when getting action bar r=rnewman 2014-06-26 09:41:42 -04:00
Brad Lassey
e0d05127b0 bug 1025931 - Crash java.lang.NullPointerException in in org.mozilla.gecko.GeckoAppShell.getContext r=snorp 2014-06-26 09:37:47 -04:00
Wes Kocher
f971e62aa1 Merge m-c to inbound a=merge 2014-06-25 18:39:25 -07:00
Wes Johnston
bd62408979 Bug 1018468 - Add fullscreen button to video controls. r=mfinkle 2014-06-11 10:25:18 -07:00
Chenxia Liu
00ffc42e71 Bug 1007130 - Add UI telemetry for 'Adding a new search engine' button. r=mfinkle 2014-06-25 09:29:07 -07:00
Carsten "Tomcat" Book
56bde994f7 merge fx-team to mozilla-central a=merge 2014-06-25 15:34:21 +02:00
Jim Blandy
b6b202b6bb 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
Geoff Brown
8142f96ccb Bug 979600 - Disable testSessionOOMRestore on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Geoff Brown
37d69a3ffe Bug 995696 - Disable testNewTab on Android 2.3 (for aws); no review 2014-06-24 20:33:31 -06:00
Wes Kocher
934a0b53a3 Merge m-c to inbound a=merge on a CLOSED TREE 2014-06-24 18:39:27 -07:00
Wes Kocher
60d5bc4f5e Merge inbound to m-c a=merge 2014-06-24 18:13:38 -07:00
Nathan Froyd
944043708f Bug 728600 - define TARGET_XPCOM_ABI in mozilla-config.h; r=glandium 2014-06-23 15:06:48 -04:00
Ed Morley
ca7d53fbb2 Merge mozilla-central and inbound 2014-06-24 17:18:28 +01:00
Ed Morley
1b7a40bcf6 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Wes Kocher
eea3b3a418 Merge m-c to fx-team a=merge 2014-06-23 19:07:22 -07:00
Wes Kocher
7b66a28e6b Merge fx-team to m-c a=merge 2014-06-23 17:56:11 -07:00
Margaret Leibovic
5407cb80f9 Bug 1026715 - Add "Open all" item to recent tabs lists. r=lucasr 2014-06-23 14:13:05 -07:00
Michael Comella
869329177b Bug 1002303 - Part 3: Update empty private tabs panel description. r=eedens 2014-06-23 11:35:03 -07:00
Ethan Pransky
d860e50bbf Bug 1019009 - Make MatrixBlobCursor complain if its Cursors are not properly closed. r=gcp 2014-06-24 17:32:28 +02:00
Michael Comella
026e90168e Bug 1028337 - Fix crash when closing all private tabs. r=margaret 2014-06-23 11:01:37 -07:00
Michael Comella
6bbe93ce85 Bug 979600 - Increase verifyPageTitle wait timeout. r=gbrown 2014-06-23 10:54:57 -07:00
Gian-Carlo Pascutto
52b278ac5b Bug 1018928 - Fix getUserMedia device selection on Android. r=blassey 2014-06-24 10:22:50 +02:00