Commit Graph

10893 Commits

Author SHA1 Message Date
Gavin Sharp
cf2f51ed8e merge m-c into elm 2013-10-14 13:01:12 -07:00
Nick Alexander
2967ef2ddc Merge m-c to elm 2013-10-14 09:05:11 -07:00
Phil Ringnalda
95759c43cf Merge m-i to m-c 2013-10-13 10:18:40 -07:00
Richard Newman
d3c5516ed5 Bug 926129 - Follow-up: null check. r=trivial 2013-10-12 22:32:03 -07:00
Nick Alexander
9d1ebdde17 Fix merge (take 2). 2013-10-12 21:50:38 -07:00
Chris Kitching
0293f1efe7 Bug 926129 - Do LoadFaviconTask result chaining in constant stack space. r=rnewman 2013-10-12 21:23:10 -07:00
Chenxia Liu
395aabef3c Bug 914377 - Intermittent testShareLink | Exception caught - junit.framework.AssertionFailedError: View is null and can therefore not be clicked! r=gbrown 2013-10-12 20:32:43 -07:00
David Rajchenbach-Teller
982856f764 Bug 903433 - Add FinalizationWitnessService. r=Waldo, r=glandium, sr=Mossop 2013-10-12 14:17:43 -04:00
Mina Almasry
01b53453c2 Bug 698437 - Allow spatial navigation with directional controller. r=kats 2013-10-12 13:59:50 -04:00
Nick Alexander
5668b183cc Fix merge. 2013-10-11 09:50:54 -07:00
Nick Alexander
68a7f48145 Merge m-c to elm 2013-10-11 09:33:44 -07:00
Wes Kocher
492cc52566 Merge m-c to fxteam 2013-10-10 19:10:24 -07:00
Wes Kocher
b643cbab41 Merge inbound to m-c 2013-10-10 18:59:58 -07:00
Michael Comella
29baaf56bd Bug 902560: FakeProfileTestCase deletes testing directory if it exists. r=nalexander 2013-10-10 16:44:22 -07:00
Brian Nicholson
850c7b10ad Bug 923519 - Remove resource preprocessing. r=nalexander
--HG--
rename : mobile/android/base/resources/xml/preferences.xml.in => mobile/android/base/resources/xml/preferences.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml.in => mobile/android/base/resources/xml/preferences_customize.xml
rename : mobile/android/base/resources/xml/searchable.xml.in => mobile/android/base/resources/xml/searchable.xml
rename : mobile/android/base/resources/xml/sync_authenticator.xml.in => mobile/android/base/resources/xml/sync_authenticator.xml
rename : mobile/android/base/resources/xml/sync_options.xml.in => mobile/android/base/resources/xml/sync_options.xml
rename : mobile/android/base/resources/xml/sync_syncadapter.xml.in => mobile/android/base/resources/xml/sync_syncadapter.xml
2013-10-10 16:08:59 -07:00
Nick Alexander
3a9fb03157 Bug 923519 - Pre: Expose MOZ_ANDROID_SHARED_{ID,ACCOUNT_TYPE} to mobile/android/**/Makefile.in. r=gps 2013-10-10 16:08:58 -07:00
Brian Nicholson
0d00729c6d Bug 923407 - Set list adapter to null when destroying BrowserSearch view. r=lucasr 2013-10-10 13:54:49 -07:00
Nick Alexander
07fb33fdcd Bug 924232 - Part 2: Move preprocessed Gecko*.java.in to widget package. r=mfinkle
--HG--
rename : mobile/android/base/GeckoEditText.java.in => mobile/android/base/widget/GeckoEditText.java.in
rename : mobile/android/base/GeckoImageButton.java.in => mobile/android/base/widget/GeckoImageButton.java.in
rename : mobile/android/base/GeckoImageView.java.in => mobile/android/base/widget/GeckoImageView.java.in
rename : mobile/android/base/GeckoLinearLayout.java.in => mobile/android/base/widget/GeckoLinearLayout.java.in
rename : mobile/android/base/GeckoRelativeLayout.java.in => mobile/android/base/widget/GeckoRelativeLayout.java.in
rename : mobile/android/base/GeckoTextSwitcher.java.in => mobile/android/base/widget/GeckoTextSwitcher.java.in
rename : mobile/android/base/GeckoTextView.java.in => mobile/android/base/widget/GeckoTextView.java.in
rename : mobile/android/base/GeckoView.java.frag => mobile/android/base/widget/GeckoView.java.frag
2013-10-10 11:53:14 -07:00
Nick Alexander
f261e39580 Bug 924232 - Part 1: Remove special processing of FENNEC_PP_JAVA_VIEW_FILES. r=mfinkle 2013-10-10 11:53:12 -07:00
Geoff Brown
21f1b8a23e Bug 851861 - Enable robocop testLoad, testPanCorrectness, etc 2013-10-10 10:00:14 -06:00
Justin Dolske
743ebf7296 Bug 717490 - Remove support for importing logins from legacy signons.txt format, as well as base64 conversion. r=mattn 2013-10-09 17:48:40 -07:00
Nick Alexander
8e6abd287d Bug 923306 - Build annotationProcessors with JAVA_JAR_TARGETS. r=glandium 2013-10-09 17:05:37 -07:00
Nick Alexander
b04068da45 Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium 2013-10-09 17:05:36 -07:00
Nick Alexander
f1118adfc9 Bug 924133 - Remove Android WebApps preprocessing. r=wesj
The existing code complicates the build system and IDE integration.
This keeps most of the flexibility while simplifying the build system.
2013-10-09 17:05:36 -07:00
Margaret Leibovic
c36d80587b Bug 917273 - Fix PinSiteDialog to handle pinning user-entered terms. r=wesj 2013-10-09 13:06:58 -07:00
Margaret Leibovic
a9f77578d9 Bug 924928 - Update general Yahoo! search engine icon. r=mfinkle 2013-10-09 13:06:55 -07:00
Nick Alexander
4a0b024f9c Merge m-c to elm 2013-10-10 08:29:47 -07:00
Nick Alexander
70e8b99100 Merge m-c to elm. 2013-10-09 10:11:44 -07:00
Carsten "Tomcat" Book
55bf9692c8 merge fx-team to mozilla-central 2013-10-09 10:15:37 +02:00
Michael Comella
d4241d5558 Bug 888086 - Use StringBuilder in sync/Utils.java r=rnewman 2013-10-08 18:42:47 -07:00
Gavin Sharp
7ca7c14c7a Bug 922338: update link to phishing protection info in Firefox, r=dao,wesj,mbrubeck,fabrice 2013-10-08 14:00:48 -07:00
Nick Alexander
6fe377c531 Merge m-c to elm 2013-10-08 09:17:50 -04:00
Phil Ringnalda
250f5a95f5 Merge f-t to m-c 2013-10-07 18:47:22 -07:00
Richard Newman
4aade40455 Bug 919645 - crash in android.os.NetworkOnMainThreadException. r=bnicholson 2013-10-07 12:54:41 -07:00
Reuben Morais
86a9d6e3c3 Backed out 2 changesets (bug 899574) for breaking Gaia tests
--HG--
rename : dom/tests/mochitest/notification/desktop-notification/create_notification.html => dom/tests/mochitest/notification/create_notification.html
rename : dom/tests/mochitest/notification/desktop-notification/notification_common.js => dom/tests/mochitest/notification/notification_common.js
rename : dom/tests/mochitest/notification/desktop-notification/test_basic_notification.html => dom/tests/mochitest/notification/test_basic_notification.html
rename : dom/tests/mochitest/notification/desktop-notification/test_basic_notification_click.html => dom/tests/mochitest/notification/test_basic_notification_click.html
rename : dom/tests/mochitest/notification/desktop-notification/test_leak_windowClose.html => dom/tests/mochitest/notification/test_leak_windowClose.html
rename : dom/tests/mochitest/notification/desktop-notification/test_notification_tag.html => dom/tests/mochitest/notification/test_notification_tag.html
rename : dom/tests/mochitest/notification/desktop-notification/test_system_principal.xul => dom/tests/mochitest/notification/test_system_principal.xul
2013-10-07 14:41:13 -04:00
Nick Alexander
b2f7c272c0 Merge m-c to elm 2013-10-07 12:23:37 -04:00
Phil Ringnalda
cea1616fed Merge b-i to m-c 2013-10-06 18:31:14 -07:00
Brad Lassey
7db29cbd88 bug 903082 - Add Yahoo as a general search provider for specified locales for Fennec r=mfinkle 2013-10-05 17:11:26 +02:00
Nick Alexander
b98210a82d Merge m-c to elm 2013-10-03 09:19:36 -07:00
Phil Ringnalda
efde14c2da Merge m-i to m-c 2013-10-03 07:58:59 -07:00
Matt Brubeck
0e87de14da Merge fx-team to mozilla-central 2013-10-03 07:38:41 -07:00
Ms2ger
ae8c899faf Merge m-c to inbound. 2013-10-03 11:09:17 +02:00
Ms2ger
df62fb8b0f Bug 900980 - Part a: Move unconditional assignments to EXPORT_LIBRARY to moz.build; rs=gps 2013-10-03 09:11:13 +02:00
Ms2ger
6b293d77c2 Bug 922288 - Remove some unnecessary boilerplate from Makefile.ins; r=mshal 2013-10-03 09:10:00 +02:00
Michael Henretty
3678897716 Bug 899574 - Part 2, add Notification.get() with notification storage. r=bent
--HG--
rename : dom/tests/mochitest/notification/create_notification.html => dom/tests/mochitest/notification/desktop-notification/create_notification.html
rename : dom/tests/mochitest/notification/notification_common.js => dom/tests/mochitest/notification/desktop-notification/notification_common.js
rename : dom/tests/mochitest/notification/test_basic_notification.html => dom/tests/mochitest/notification/desktop-notification/test_basic_notification.html
rename : dom/tests/mochitest/notification/test_basic_notification_click.html => dom/tests/mochitest/notification/desktop-notification/test_basic_notification_click.html
rename : dom/tests/mochitest/notification/test_leak_windowClose.html => dom/tests/mochitest/notification/desktop-notification/test_leak_windowClose.html
rename : dom/tests/mochitest/notification/test_notification_tag.html => dom/tests/mochitest/notification/desktop-notification/test_notification_tag.html
rename : dom/tests/mochitest/notification/test_system_principal.xul => dom/tests/mochitest/notification/desktop-notification/test_system_principal.xul
2013-10-02 18:27:53 -07:00
Nick Alexander
bb8d186292 Merge m-c to elm 2013-10-02 10:46:44 -07:00
Mark Finkle
a2c6f01255 Bug 922329 - HelperApps.getAppsForUri does not check for empty results and throws r=wesj 2013-10-01 23:43:23 -04:00
Wes Kocher
404e115714 Merge inbound to m-c 2013-10-01 18:41:15 -07:00
Nick Alexander
f83ce962de NO BUG - Deleted unused resource `gecko_actionbar_bg'. r=sriram 2013-10-01 14:13:22 -07:00
Brian Nicholson
064c4efe53 Bug 897162 - Lower Gecko thread priority when showing Top Sites page. r=lucasr 2013-10-01 12:55:00 -07:00