Commit Graph

12640 Commits

Author SHA1 Message Date
Wes Kocher
4fe0f80d08 Backed out changeset e7f7cc81c103 (bug 943262) for breaking Android S4 tests 2014-03-14 13:47:43 -07:00
Margaret Leibovic
c52e43433b Bug 965622 - String for dynanmic panel empty view text. r=lucasr 2014-03-14 11:49:05 -07:00
Margaret Leibovic
1718215200 Bug 943262 - Use CharsetMenu.jsm instead of charsetTitles.properties for Character Encoding menu items. r=bnicholson 2014-03-14 11:41:47 -07:00
Margaret Leibovic
a9933dccf8 Bug 968640 - Lazy init HomeBanner using ViewStub. r=lucasr
--HG--
rename : mobile/android/base/resources/layout/home_banner.xml => mobile/android/base/resources/layout/home_banner_content.xml
2014-03-14 11:41:46 -07:00
Margaret Leibovic
f18cfdd4bf Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-14 11:41:46 -07:00
David Rajchenbach-Teller
f239dd5dfa Bug 961665 - Native implementation of OS.File.read, native bits. r=froydnj, r=bz, r=paolo 2014-03-14 10:13:26 -04:00
Sola Ogunsakin
37b3b73842 Bug 959297 - Get description and approx. reading time for reading list items. r=liuche, r=lucasr, r=margaret, r=rnewman 2014-03-12 14:53:25 -07:00
Carsten "Tomcat" Book
3c43258d50 merge fx-team to mozilla-central 2014-03-14 12:35:23 +01:00
Nick Alexander
4b632cb8dc Bug 974015 - Replace "Firefox online services" with "Firefox cloud services". r=rnewman 2014-03-13 22:31:55 -07:00
Nick Alexander
857bfb9edb Bug 974942 - Don't share link{tos,privacy} strings. r=rnewman 2014-03-13 22:31:55 -07:00
Nick Alexander
7ad54c64ba Bug 974133 - Replace "Firefox account" with "Firefox Account". r=rnewman 2014-03-13 22:31:54 -07:00
Nick Alexander
a04e56d0d2 Bug 974129 - Part 2: use branding icon instead of fxaccount_icon. r=rnewman 2014-03-13 22:21:00 -07:00
Nick Alexander
e7ca01ceaf Bug 974129 - Part 1: update fxaccount_intro drawable. r=rnewman 2014-03-13 22:21:00 -07:00
Nick Alexander
ccb50d9b6b Bug 974124 - Update padding, margins, and color scheme in FxA setup. r=rnewman 2014-03-13 22:21:00 -07:00
Wes Kocher
99beccd7cb Merge m-c to fx-team 2014-03-13 20:01:18 -07:00
Wes Kocher
c15c6c9b48 Merge fx-team to m-c 2014-03-13 19:09:07 -07:00
Nick Alexander
9ef788dd99 Bug 983350 - Include User-Agent header for FxAccount and TokenServer requests. r=rnewman
--HG--
extra : rebase_source : cb622c61646be2752e4900fd6e480874e9ba5406
2014-03-13 17:13:58 -07:00
Nick Alexander
1c79307779 Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman
--HG--
extra : rebase_source : 1db653efb3d0656b9208ade6859f86fb10f1be3b
2014-03-13 17:06:29 -07:00
Nick Alexander
a185fd8134 Bug 978944 - Use Android native code pbkdf2sha256 in FxAccounts. r=rnewman,mcomella
--HG--
extra : rebase_source : 73cc0d3b480246f64a07388caafda56465039bda
2014-03-13 17:04:45 -07:00
Wes Kocher
53b7c0d896 Merge m-c to inbound despite the CLOSED TREE 2014-03-13 19:58:47 -07:00
Geoff Brown
25da3175dc Bug 983440 - Disable testInputConnection on Android 2.3 2014-03-13 16:59:01 -06:00
Brian Nicholson
0546683495 Bug 981676 - Fix backout of bugs 980438/962103. r=mfinkle 2014-03-13 14:42:19 -07:00
Brian Nicholson
e172cd6e2d Bug 979166 - Refactor dynamic toolbar code. r=lucasr
--HG--
extra : rebase_source : 665621241d47985699a6994a8aea989ac29f9f7e
2014-03-13 12:29:39 -07:00
Myk Melez
2b0848ec69 bug 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle 2014-03-13 12:01:55 -07:00
Carsten "Tomcat" Book
0b804927d7 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Wes Kocher
93661497bd Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Wes Kocher
c317000cea Merge fx-team to m-c 2014-03-12 20:01:45 -07:00
Wes Kocher
a15b6e2f00 Merge m-c to m-i 2014-03-12 21:21:07 -07:00
Geoff Brown
ce7ca57333 Bug 966788 - Increase wait time for Gecko:Ready; r=mcomella 2014-03-12 17:44:54 -06:00
Michael Comella
35f2b81da7 Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Lucas Rocha
c31092879c Bug 963817 - Wrap HomeStorage data insertion loop in a transaction (r=margaret) 2014-03-12 17:02:50 +00:00
Richard Newman
75846416f7 Bug 982191 - The resource://services-common/ alias is broken in Fennec. r=nalexander,lucasr 2014-03-12 09:52:50 -07:00
Richard Newman
684cd20a21 Bug 945429 - Remove log output. r=trivial 2014-03-12 09:49:48 -07:00
Lucas Rocha
5c4f78a4b3 Bug 969055 - Validate items being saved with HomeProvider API (r=margaret) 2014-03-12 16:37:02 +00:00
Chris Kitching
f04ac8d0be Bug 969417 - Cleanup naming conventions in favicon code. r=rnewman 2014-03-12 16:20:38 +00:00
Chris Kitching
c1031fa21d Bug 969417 - Reduce insanity in favicon cache concurrency. r=rnewman 2014-03-12 16:20:36 +00:00
Margaret Leibovic
84d368e508 Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-12 08:57:30 -07:00
Margaret Leibovic
412f8103fe Bug 979101 - Enable remote debugger by default on nightly builds. r=mfinkle 2014-03-12 08:57:30 -07:00
Margaret Leibovic
44400adb7f Bug 976308 - Remove search engine name from initial search suggestions prompt. r=liuche 2014-03-12 08:57:30 -07:00
Margaret Leibovic
7f5ad9821b Bug 982461 - Support launching an intent to the current application package. r=wesj 2014-03-12 08:57:29 -07:00
Nick Alexander
d225664e41 Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
2a693e3f20 Bug 979537 - Make geckoview_resources.zip include res/values/strings.xml. r=trivial
The commit looks large, but it's trivial: just replacing $(android_res_files) with $(all_resources) in

+geckoview_resources.zip: $(all_resources) $(GLOBAL_DEPS)

It looks bigger because it needs to move below the definition of $(all_resources).
2014-03-12 17:22:27 -07:00
Nick Alexander
28663ebee3 Bug 979388 - Make aapt invocation rebuild R.java. r=glandium
This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild.  This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.

What appeared to be happening is the following:

Touch a resource.  On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.

Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale.  A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked.  So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale.  The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.

On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
2014-03-12 17:22:27 -07:00
Nick Alexander
fbd080396b Bug 982138 - Ignore #* in aapt invocations in mobile/android/base. r=blassey 2014-03-12 17:22:27 -07:00
Myk Melez
ff45f79479 bug 982182 - fix regressions that hang checking for updates for webapps; r=mfinkle 2014-03-12 11:57:45 -07:00
Myk Melez
c64728d4a3 bug 982552 - use DEBUG variable to enable logging in debug build; r=mfinkle 2014-03-12 11:57:22 -07:00
Myk Melez
bfcd61620f bug 978836 - update URLs to production servers; r=mfinkle 2014-03-12 09:08:30 -07:00
Geoff Brown
ddd528ae7b Bug 979612 - Fix testPictureLinkContextMenu on Android 2.3; r=margaret 2014-03-12 09:42:00 -06:00
Wes Johnston
4bac935c13 Bug 968182 - Hide the Android menu before reshowing it with a submenu. r=lucasr 2014-03-11 23:01:22 -07:00
Phil Ringnalda
e2781e6a10 Back out 9fe5610363b3 (bug 959652) for bustage 2014-03-11 21:53:43 -07:00
Michael Comella
707bc99a8a Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Chenxia Liu
844c16ae38 Bug 978825 - Add android:summary text to Customize > Search. r=sola 2014-03-11 18:59:37 -07:00
Chenxia Liu
4fbdf37462 Bug 970743 - Add android:summary text to Customize > Home. r=sola 2014-03-11 18:59:34 -07:00
Ryan VanderMeulen
00f626009e Merge m-c to fx-team. 2014-03-11 13:23:55 -07:00
Ryan VanderMeulen
3ba438c548 Merge fx-team to m-c. 2014-03-08 01:12:53 -08:00
Kartikaya Gupta
58bd5444ea Bug 981728 - Fix missing close-paren. r=wesj 2014-03-11 08:07:23 -04:00
Lucas Rocha
bfab5d4467 Bug 981614 - Do a null check when handling toolbar focus change in HomePager (r=jdover) 2014-03-11 17:58:31 +00:00
Marcos Cezar
2bd31ee6d0 Bug 956360 - Use Arrays.asList when possible. r=jchen 2014-03-04 14:32:47 -03:00
Carsten "Tomcat" Book
78ca955c60 Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure 2014-03-11 12:23:56 +01:00
Nick Alexander
779536081c Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
0952880137 Bug 980478 - Generate assertions with no iat and exp: 9999999999999L. r=rnewman 2014-03-10 21:04:25 -07:00
Nick Alexander
d0cb9b8bce Bug 915312 - Follow-up: Land background JUnit 3 tests. r=nalexander 2014-03-10 20:53:43 -07:00
Richard Newman
b7b8661e41 Bug 945429. r=wesj 2014-03-10 16:12:52 -07:00
Chenxia Liu
40f9a95f82 Bug 977980 - Add "Remove" as an option for dynamic Home panels. r=margaret 2014-02-13 15:33:46 -08:00
Michael Comella
84db67d001 Bug 976833 - Override JUnit methods in UITest. r=lucasr 2014-03-06 16:42:26 -08:00
Ryan VanderMeulen
481593de88 Merge fx-team to m-c. 2014-03-10 17:10:25 -04:00
Chenxia Liu
a8ce1fcb55 Bug 976925 - UI after adding a Home Panel from Settings. r=lucasr 2014-03-10 09:37:36 -07:00
Robert O'Callahan
f87fd81842 Bug 975931. Part 11: Make nsDOMWindowUtils::SetDisplayPortForElement take a priority parameter, and set that parameter to 1 in reftests to override automatic displayport selection. r=kats
--HG--
extra : rebase_source : 07dcbfb67cb2db0bbb26a959517bbbdebd84f10b
2014-03-08 22:25:15 +13:00
Josh Dover
9a954e8950 Bug 966047 - Hide banner when there are no panels enabled. r=lucasr 2014-02-24 17:05:52 -08:00
Eugen Sawin
5bbbe857fc Bug 981345 - Fix HelperApp callback regression. r=wesj 2014-03-10 03:06:53 +01:00
Phil Ringnalda
29c6781b1d Merge f-t to m-c 2014-03-08 17:41:33 -08:00
Chenxia Liu
e25c1e0bfa Bug 965606 - Part 2: Update tests for new string and nested preference panels. r=margaret 2014-03-07 15:28:56 -08:00
Chenxia Liu
5d411bd290 Bug 965606 - Part 1: Give users the choice to only sync home panel data when on wifi. r=margaret 2014-03-07 15:28:51 -08:00
Chenxia Liu
63be995458 Bug 965606 - Part 0: Change home sync pref name, and type from boolean to ints. r=margaret 2014-03-07 15:28:48 -08:00
Margaret Leibovic
f2bd7a57c1 Bug 975469 - Remove sync promo banner from rotation after it has been tapped. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
d6625e0444 Bug 975239 - (Part 4) Don't show the banner again for the rest of the app lifetime after the user taps the close button. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
687be40d19 Bug 975239 - (Part 3) Refactor HomeBanner.handleMessage to handle being called multiple times. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
a23eb66424 Bug 975239 - (Part 2) Request a home banner message when the HomePager loads. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
875eb9015a Bug 975239 - (Part 1) Choose a banner message at random instead of rotating through a queue. r=bnicholson 2014-03-07 11:23:26 -08:00
Ryan VanderMeulen
eacebe7794 Backed out changeset 749fb9b52dd7 (bug 976833) for robocop failures on all platforms.
CLOSED TREE
2014-03-07 13:37:27 -05:00
Brian Nicholson
388bc5f140 Bug 976426 - Update progress on LOCATION_CHANGE and LOADED only if tab is loading. r=lucasr 2014-03-07 09:54:52 -08:00
Lucas Rocha
b1450f701e Bug 967742 - Consolidate API to edit HomeConfig state (r=margaret) 2014-03-07 17:15:31 +00:00
Brian Nicholson
f9b8beb9cd Bug 980438 - Make progress bar thinner and darker. r=lucsar 2014-03-07 09:03:42 -08:00
Michael Comella
f55c17c347 Bug 976833 - Override JUnit methods in UITest. r=lucasr 2014-03-07 08:52:55 -08:00
Wes Johnston
e2958d9688 Bug 960146. r=kats 2014-03-07 08:32:22 -08:00
Wes Kocher
83398347ef Merge m-c to inbound 2014-03-07 17:39:52 -08:00
Geoff Brown
ada892d8f0 Bug 945395 - Disable testSessionOOMSave on Android 2.3 2014-03-07 17:24:40 -07:00
Geoff Brown
1cc142904e Bug 981173 - Wait for Gecko:Ready in testReadingListProvider; r=sola 2014-03-07 17:24:40 -07:00
Chris Lord
a2a7f276b8 Bug 960146. r=kats,wesj 2014-02-20 09:36:48 -05:00
Mark Capella
c8947c7243 Bug 978731 - Cursor position jumps around, dragging handles moves text, r=wesj 2014-03-06 22:14:22 -05:00
Chenxia Liu
7cbe4c8a56 Bug 973039 - Display message in HomePanelPicker when no Home panels are available for install. r=margaret 2014-02-13 11:46:48 -08:00
Michael Comella
d175adb86c Bug 976775 - Rename AssertionHelper assertions to fAssert*. r=lucasr 2014-03-06 15:50:52 -08:00
Wes Johnston
9a4601f6d8 Bug 942611 - Fix missing parameter qualifier. r=rewman CLOSED TREE 2014-03-06 12:57:42 -08:00
Wes Johnston
4582386da0 Bug 942611 - Delete old temp files onPause. r=rnewman 2014-03-06 12:23:54 -08:00
Wes Johnston
67aff8f6c5 Bug 942611 - Delete temp files when tabs are closed. r=rewman 2014-03-06 12:23:53 -08:00
Wes Johnston
bfa9a38eda Bug 942611 - Store temp files in Android's cache dir. r=rewman 2014-03-06 12:23:52 -08:00
Michael Comella
220386026f Bug 915312 - Part 4: Test native crypto. r=rnewman,nalexander 2014-03-06 12:10:54 -08:00
Michael Comella
a531628bad Bug 915312 - Part 3: Add NativeCrypto Java interface. r=nalexander 2014-03-06 12:10:54 -08:00
Margaret Leibovic
01dca21687 Bug 974925 - Change snippets error message into a log message. r=bnicholson 2014-03-06 09:25:08 -08:00
Margaret Leibovic
0bef7ca0cd Bug 965822 - Add null check to HomeListView.setOnItemClickListener. r=lucasr 2014-03-06 09:25:02 -08:00
Wes Kocher
3e0200aabe Merge fxteam to m-c 2014-03-05 18:20:17 -08:00
Ryan VanderMeulen
a82c72c6ca Merge m-c to inbound on a CLOSED TREE. 2014-03-05 16:08:02 -05:00
Ryan VanderMeulen
3d07d638ad Merge b2g-inbound to m-c. 2014-03-05 16:01:53 -05:00
Margaret Leibovic
cc33aee3ea backout 4bc6027f5638 for causing bug 978741 2014-03-05 12:21:22 -08:00
Margaret Leibovic
a7779868e8 backout 9ee8634f70dc because it didn't work 2014-03-05 12:21:20 -08:00
Nick Alexander
c50facf8d3 Bug 978587 - Make GeckoView package org.mozilla.gecko; don't include org.mozilla.gecko.R. r=blassey
This builds a new Java JAR containing only org.mozilla.gecko.R.  This
new JAR file is included in Fennec, but not included in
geckoview_library.  (Usually ant, gradle, or Eclipse arranges to produce
org.mozilla.gecko.R but not include it in the classes.jar output as part
of a library project.  This mimics that.)

Changing the GeckoView package to org.mozilla.gecko declares to
consuming applications that they should produce org.mozilla.gecko.R,
replacing what was removed above (but with correct resource IDs).
2014-03-05 08:57:09 -08:00
Nick Alexander
9bb1446916 Bug 978587 - Pre: Make geckoview_library and BackgroundInstrumentationTests target android-16. r=blassey
This agrees with Fennec (and BrowserInstrumentationTests).
2014-03-05 08:57:09 -08:00
Jim Chen
d0283f4f04 Bug 975436 - Catch ClassCastException in ANRReporter. r=blassey 2014-03-05 09:05:21 -05:00
Christopher Su
fffcc84d5a Bug 943629 - Remove unnecessary comment in Tabs. r=mcomella 2014-03-05 09:05:07 -05:00
Carsten "Tomcat" Book
4124791bb3 merge mozilla-inbound to mozilla-central 2014-03-05 13:04:39 +01:00
Jed Davis
6a4c4691a0 Bug 946407 - Reimplement DumpMemoryInfoToTempDir in terms of GetReports. r=njn
This winds up exposing things in the nsIMemoryReporterManager interface
that arguably don't belong at that level of abstraction -- "minimize
memory usage first" and DMD -- in order to take advantage of the
infrastructure that GetReports already has for managing the child
processes.
2014-03-04 18:27:13 -08:00
Matt Brubeck
95576befed Bug 972844 - Add a Maybe Later link on about:feedback intro [r=mfinkle] 2014-03-04 16:58:33 -08:00
Richard Newman
d588cdd055 Bug 966143 - Don't attempt to process a malformed password record. r=nalexander 2014-03-04 14:38:11 -08:00
Brian Nicholson
06ecca9062 Bug 976006 - Update bookmark star when page is saved. r=wesj 2014-03-04 13:00:00 -08:00
Brian Nicholson
553b10d067 Bug 962103 - Make progress bar overlap content. r=lucasr 2014-03-04 12:57:23 -08:00
Richard Newman
2aa48a9683 Bug 961238 - Follow-up: eliminate BrowserContract dependency on DBUtils. r=trivial, DONTBUILD 2014-03-04 12:18:26 -08:00
Chenxia Liu
d66e3be430 Bug 942878 - Part 2: Add panel to settings. r=lucasr 2014-03-04 10:31:38 -08:00
Chenxia Liu
8ce8e10415 Bug 942878 - Part 1: Expose public method for adding panels to HomeConfig. r=lucasr 2014-03-04 10:31:38 -08:00
Chenxia Liu
a1299bdfa2 Bug 942878 - Part 0: Add final modifier to GeckoPreferences. r=lucasr 2014-03-04 10:31:37 -08:00
Nick Alexander
63a09ec1f3 Bug 979064 - Declare JUnit 3 instrumentation test applications debuggable. r=rnewman
I also took the opportunity to move a constant into
AndroidManifest.xml.in; it removes a layer of indirection when trying to
determine what Android package gets built.
2014-03-04 09:34:35 -08:00
Lucas Rocha
26d6956e66 Bug 975841 - Bootstrap schema upgrade path in HomeProvide.jsm (r=margaret) 2014-03-04 16:57:43 +00:00
Lucas Rocha
d9f3d4bbac Backed out changeset 70bccf82bbfa (forgot to add reviewer) 2014-03-04 16:54:32 +00:00
Lucas Rocha
d7fa164d02 Bug 975841 - Bootstrap schema upgrade path in HomeProvide.jsm 2014-03-04 16:52:13 +00:00
Wes Johnston
10d98500b6 Bug 967254 - Delay Webapp Uninstall code till delayed startup. r=rnewman 2014-03-04 08:35:39 -08:00
Wes Johnston
9d1664d882 Bug 977592 - Don't autofocus the password field in auth dialogs. r=margaret 2014-03-04 08:31:06 -08:00
Wes Johnston
132e81c4ca Bug 974289 - Fixup test for FilePicker results. r=lucasr 2014-03-04 08:29:26 -08:00
Josh Dover
2ae98fce47 Bug 978741 - Fix tab strip on tablets. r=margaret 2014-03-03 13:23:38 -08:00
Sola Ogunsakin
a52845e046 Bug 959290 - Test for ReadingListProvider. r=mcomella 2014-03-03 14:37:13 -08:00
Sola Ogunsakin
a01edc17fd Bug 959290 - Make ContentProvider for Reading List. r=lucasr 2014-03-03 15:34:57 -08:00
Wes Kocher
ac800b68ed Merge m-c to fx-team 2014-03-03 20:39:02 -08:00
Wes Kocher
931a86b030 Merge inbound to m-c 2014-03-03 20:25:51 -08:00
Brian Nicholson
6580583f25 Bug 979038 - Disable testAboutHomePageNavigation. r=mcomella 2014-03-03 19:43:56 -08:00
Brian Nicholson
03cc1c6ccf Bug 977669 - Rename save subscribe ID. r=mfinkle 2014-03-03 19:41:37 -08:00
Richard Newman
c78053ee78 Bug 707123 - Part 1: refactor GeckoProfileDirectories out of GeckoProfile. r=nalexander 2014-03-03 15:27:42 -08:00
Nick Alexander
8514a9a94f Bug 977358 - Replace status activity header with 'Signed in as'. r=rnewman 2014-03-03 15:20:20 -08:00
Nick Alexander
1d7921eb47 Bug 972051 - Dismiss 'Tap to sign in' notification when a sync succeeds. r=rnewman 2014-03-03 15:20:19 -08:00
Nick Alexander
e676ebd6e4 Bug 977336 - Support action bar 'up' for FxAccountStatusActivity. r=rnewman 2014-03-03 15:20:19 -08:00
Nick Alexander
a63be26f08 Bug 974134 - Improve FxAccountStatusActivity layout. r=rnewman 2014-03-03 15:20:19 -08:00
Brad Lassey
f4a746f0ab Bug 962606 - Suggestions are present for password field, switch to use text transforms to reveal text. r=nalexander 2014-03-03 15:20:18 -08:00
Ryan VanderMeulen
9fceaa515e Backed out changeset 7e424486f60e (bug 950417) for adding new attack surface. 2014-03-03 17:48:12 -05:00
Ryan VanderMeulen
2a78057cf2 Merge m-c to inbound. 2014-03-03 17:23:35 -05:00
Brian Nicholson
74c1ef2cef Bug 978494 - Fix URL in Reader:Removed. r=lucsar 2014-03-03 10:35:23 -08:00
Ed Morley
7b1b28e4bd Backed out changeset 1eebddd614eb (bug 962103) for causing bug 947550
--HG--
extra : rebase_source : 809b725149264001d341469ebae420aa19911af4
2014-03-03 17:01:01 +00:00
Ed Morley
a18c2212b0 Merge mozilla-central and fx-team 2014-03-03 14:53:17 +00:00
Ed Morley
1169e3e5fb Merge latest green inbound changeset and mozilla-central 2014-03-03 14:44:44 +00:00
Lucas Rocha
0d9198820e Bug 971214 - Use setBackgroundDrawable() in BasicColorPicker (r=wesj) 2014-03-03 14:16:58 +00:00
Margaret Leibovic
d501cd043d Bug 977844 - Make sure snippets response is valid JSON before caching it (or trying to use it). r=bnicholson 2014-02-28 17:26:56 -08:00
Margaret Leibovic
799078fbf6 Bug 977155 - (Part 2) Rename HomeBanner setEnabled to setActive. r=bnicholson 2014-02-28 17:26:54 -08:00
Margaret Leibovic
3bbedb11ea Bug 977155 - Don't animate HomeBanner when it's not visible. r=bnicholson 2014-02-28 17:26:51 -08:00
Eugen Sawin
565e9da954 Bug 959108 - Update helper apps page actions URL on location change. r=wesj 2014-02-26 22:38:09 +01:00