Commit Graph

337370 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
577bf4bd2d merge fx-team to mozilla-central 2013-12-12 13:28:08 +01:00
Carsten "Tomcat" Book
a021b8c618 merge b2g-inbound to mozilla-central 2013-12-12 13:26:40 +01:00
Patrick Brosset
9345aa8ebc Bug 946331 - Rule/Computed views tooltip closes on new selection, r=miker 2013-12-12 08:57:37 +01:00
Patrick Wang
b9e2273819 Bug 948829: use MOZ_NUWA_PROCESS flag to disable nuwa. r=me 2013-12-12 13:52:00 +08:00
Gaia Pushbot
95bad69206 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5bfef5faac50
Author: evelynhung <jj.evelyn@gmail.com>
Desc: Merge pull request #14368 from svic/rebase-df070d4e-NFC-Settings-permission

Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created. r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/faaf2b447dad
Author: Garner Lee <garner.lee@telekom.com>
Desc: Bug 946047: Add nfc read only permissions to Settings UI to allow navigator.mozNfc DOM to be created.

This fix is needed for apps using NFC if "HasNfcSupport" is added to the navigator MozNfc WebIDL.

Conflicts:
	apps/settings/manifest.webapp
2013-12-11 21:10:23 -08:00
Gaia Pushbot
b7736a9ef3 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a91a7956eb49
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #14564 from EragonJ/bug-948769

Bug 948769 - [Settings][DSDS] Default service ID should be a number

========

https://hg.mozilla.org/integration/gaia-central/rev/302a148e42af
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 948769 - [Settings][DSDS] Default service ID should be a number

- make all settings from String to Number
2013-12-11 20:30:23 -08:00
Vicamo Yang
334ff33b6e Bug 940884 - 3/3. test cases. r=gene 2013-12-12 11:45:35 +08:00
Vicamo Yang
695ea4d1d6 Bug 940884 - 2.b/3. Move init functions out of MobileMessage constructor. r=gene 2013-12-12 11:45:28 +08:00
Vicamo Yang
208f20c884 Bug 940884 - 2.a/3. Changes to adopt MobileMessageDB.jsm. r=gene 2013-12-12 11:45:24 +08:00
Vicamo Yang
59dae4a6f2 Bug 940884 - 1/3: B2G SMS: Create MobileMessageDB.jsm for automation tests. r=khuey
--HG--
rename : dom/mobilemessage/src/gonk/MobileMessageDatabaseService.js => dom/mobilemessage/src/gonk/MobileMessageDB.jsm
2013-12-12 11:45:19 +08:00
Ryan VanderMeulen
8be0779943 Merge m-c to inbound. 2013-12-11 22:42:05 -05:00
Gaia Pushbot
2775e5f90b Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8657b910fdcd
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Merge pull request #14563 from mpizza/Bug_944009

Bug 944009 - [B2G][Keyboard] Keyboard does not always display when tapping on a text field. r=timdream,
        -- handle OOM

========

https://hg.mozilla.org/integration/gaia-central/rev/0088f409b65a
Author: mpizza <mmm198219@gmail.com>
Desc: Bug 944009 - [B2G][Keyboard] Keyboard does not always display when tapping on a text field
    -- handle OOM

========

https://hg.mozilla.org/integration/gaia-central/rev/84a2d07e16ed
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #14553 from alivedise/bugzilla/948792/cardview-transition

Bug 948792 - Fix cardview transition, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/b429f6fca1d6
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 948792 - Fix cardview transition
2013-12-11 19:30:24 -08:00
Gaia Pushbot
e4d00eddc7 Bumping gaia.json for 4 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3d0d3b3e1556
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #14528 from snowmantw/issue948299

Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module

========

https://hg.mozilla.org/integration/gaia-central/rev/5d4be4ab7ce5
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 948299 - [BuildScript] Use PROFILE_DIR instead of PROFILE_FOLDER in the extension handling module

========

https://hg.mozilla.org/integration/gaia-central/rev/5280aba84106
Author: Askeing Yen (fyen) <askeing@gmail.com>
Desc: Merge pull request #14580 from zacc/bug_948822

Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py

========

https://hg.mozilla.org/integration/gaia-central/rev/d803c6844afb
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 948822 - Fix xfail message for test_cards_view_with_two_apps.py
2013-12-11 19:20:23 -08:00
Ryan VanderMeulen
2426e60da7 Merge fx-team to m-c. 2013-12-11 22:02:30 -05:00
Gaia Pushbot
a6fe1ae851 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8a192fcf2927
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #14572 from crh0716/948852

Bug 948852 - Fix the event creation error r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/745b0e8f854a
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 948852 - Fix the event creation error
2013-12-11 18:30:24 -08:00
Gaia Pushbot
4f36bd4326 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e03df840624e
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #14554 from alivedise/bugzilla/948811_master/jsdoc-refine

Bug 948811 - Remove HTML in comments, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/e8e87075e963
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 948811 - Remove HTML in comments
2013-12-11 17:25:23 -08:00
Gaia Pushbot
05f7daaa06 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c831d6b0e27a
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #14542 from punamdahiya/Bug947028

Bug 947028 - Fix of overlapping checkboxes while selecting ring tones r=davidflanagan

========

https://hg.mozilla.org/integration/gaia-central/rev/c299cbf08edc
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug 947028 - Fix of overlapping checkboxes while selecting ring tones r=davidflanagan
2013-12-11 17:00:24 -08:00
Dale Harvey
543aa991a9 Bug 942929 - Use longtapup event to handle firing clicks when longtap not handled. r=kats 2013-12-12 00:39:06 +00:00
Matt Brubeck
a3c04c6da8 Bug 946296 - Add a pref to completely disable add-on providers in Metro [r=Unfocused] 2013-12-11 16:23:36 -08:00
Ryan VanderMeulen
ad36c5cde1 Merge m-c to fx-team. 2013-12-11 22:44:00 -05:00
Brad Lassey
0da85e8997 bug 944104 - support creating a GeckoView programmatically, follow up to have just one LayerView constructor r=mfinkle 2013-12-11 21:03:56 -05:00
Matt Brubeck
3ad2639de0 Back out c237f02b3578 (bug 946296) because it broke mochitest-metro-chrome 2013-12-11 18:46:53 -08:00
Lucas Rocha
fc210fdac8 Bug 945212 - Encapsulate identity data/security mode behind a type-safe API (r=margaret) 2013-12-12 00:28:15 +00:00
Lucas Rocha
fb5f4e99fe Bug 943915 - Encapsulate button click listener in SiteIdentityPopup (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
14007eeecd Bug 943915 - Change SiteIdentityPopup's API to be package-scoped (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
1e4c7a02f2 Bug 943915 - Encapsulate SiteIdentityPopup into BrowserToolbar (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
f8bbdb0c3c Bug 943915 - Remove 'a' prefix from arguments in ArrowPopup/SiteIdentityPopup (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
bb9d7ce85e Bug 943915 - Add ArrowPopup constructor without anchor view argument (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
19e83051ba Bug 943915 - Move SiteIdentityPopup to the toolbar package (r=wesj)
--HG--
rename : mobile/android/base/SiteIdentityPopup.java => mobile/android/base/toolbar/SiteIdentityPopup.java
2013-12-12 00:28:14 +00:00
Lucas Rocha
875b68032b Bug 943915 - Small cleanup on the use of Resources in ArrowPopup (r=wesj) 2013-12-12 00:28:13 +00:00
Lucas Rocha
5647ce541f Bug 943915 - Move DoorHanger to the widget package (r=wesj)
--HG--
rename : mobile/android/base/DoorHanger.java => mobile/android/base/widget/DoorHanger.java
2013-12-12 00:28:13 +00:00
Lucas Rocha
0eeae5b5ac Bug 943915 - Make DoorHanger's API public (r=wesj) 2013-12-12 00:28:13 +00:00
Matt Brubeck
e798e1f3bd Bug 946340 - Enable vertical scrolling on about:start in portrait [r=ally] 2013-12-11 16:24:24 -08:00
Matt Brubeck
67f04d3160 Bug 946296 - Add a pref to completely disable add-on providers in Metro [r=Unfocused] 2013-12-11 16:23:36 -08:00
Gaia Pushbot
693aef6da5 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/75c6f8d7976d
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #14573 from vingtetun/bug948396

Bug 948396 - [Calendar] Can not scroll anymore the week/day view once th...

========

https://hg.mozilla.org/integration/gaia-central/rev/5014dedccfd9
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 948396 - [Calendar] Can not scroll anymore the week/day view once the new event has been opened with APZ turned on. r=kgrandon
2013-12-11 14:10:24 -08:00
Olli Pettay
d1c5c697a3 Bug 899910 - Intermittent TEST-UNEXPECTED-FAIL | layout/base/tests/chrome/test_leaf_layers_partition_browser_window.xul, r=tn
--HG--
extra : rebase_source : 58d21857e892a875acbea32d653f243ba9c75ad6
2013-12-12 00:09:29 +02:00
Gaia Pushbot
2ce0e44844 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7a53aa54b708
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #14482 from rnowm/hihglight-call-log

Bug 917820 - [Call Log] Use Full Line Highlights

========

https://hg.mozilla.org/integration/gaia-central/rev/22a0d15b9eab
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 917820 - [Call Log] Use Full Line Highlights
2013-12-11 13:55:26 -08:00
Gaia Pushbot
dfe810d33f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e104df5519d2
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #14404 from rnowm/sticky-headers-SMS

Bug 946693 - Fix sticky headers in [SMS] app

========

https://hg.mozilla.org/integration/gaia-central/rev/881d357fe8d3
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 946693 - Fix sticky headers in [SMS] app
2013-12-11 13:45:36 -08:00
Olli Pettay
ce023acc30 Bug 942229 - Intermittent browser_cmd_screenshot.js, r=jwalker
--HG--
extra : rebase_source : f44fec6e46526a1381ac956bc362f82e11c1123c
2013-12-11 22:36:24 +02:00
Makoto Kato
bb8f3692fd Bug 948837 - Remove workaround of Bug 617115. r=blassey 2013-12-12 16:32:20 +09:00
Nick Alexander
28a268c5dd Bug 934646 - Clobber. r=me
--HG--
extra : rebase_source : cdd78d0fdc02e2590862abe9c2f171581a6f8976
2013-12-11 21:20:11 -08:00
Nick Alexander
7760713d9e Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Nick Alexander
ccbc6a59c6 Bug 934646 - Part 2: Replace hard-coded Android resource ID. r=mfinkle
--HG--
extra : rebase_source : f37370654b9bb59573c4703c5f097ff792b3f037
2013-12-11 21:16:55 -08:00
Nick Alexander
cf9dfb4585 Bug 934646 - Part 1: Delete unused resources. r=mfinkle
--HG--
extra : rebase_source : 0cb4e5f30e54971b912706f5eaba8c8284b5a6ec
2013-12-11 21:16:54 -08:00
Gaia Pushbot
4937f10247 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/470fba5af189
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #14567 from jmcanterafonseca/fix_export_sim_948862_master

Bug 948862 - [Contacts] The first time exporting a contact to SIM create...

========

https://hg.mozilla.org/integration/gaia-central/rev/8cd90fb0054b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 948862 - [Contacts] The first time exporting a contact to SIM creates a duplicate of the contact in the contact list
2013-12-11 12:30:25 -08:00
Gaia Pushbot
ebc6bf5e8f Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ac1bd42712a6
Author: Malini Das <thehyperballad@gmail.com>
Desc: Merge pull request #14571 from malini/version

Bug 947001 - bump marionette-client and gaiatest versions, r=davehunt

========

https://hg.mozilla.org/integration/gaia-central/rev/69618e357429
Author: Malini Das <mdas@mozilla.com>
Desc: bump marionette-client and gaiatest versions, enable gaia-ui-tests
2013-12-11 11:30:24 -08:00
Gaia Pushbot
4220f19bed Bumping gaia.json for 6 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a5109b242065
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #14574 from vingtetun/bug942854

Bug 942854 - [Calendar] Scrolling the week view results into results int...

========

https://hg.mozilla.org/integration/gaia-central/rev/8c92dbfbb021
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 942854 - [Calendar] Scrolling the week view results into results into overlapping artifacts. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/de8afc131bb9
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #14575 from vingtetun/bug909877

Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes s...

========

https://hg.mozilla.org/integration/gaia-central/rev/5dfbe4fa95fd
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 948001 - [Settings] With APZ turned on the wifi panel is sometimes shown instead of the main panel at startup. r=arthurchen

========

https://hg.mozilla.org/integration/gaia-central/rev/764d911fb590
Author: Ben Kelly <bkelly@mozilla.com>
Desc: Merge pull request #14276 from wanderview/email-scroll-jank

Bug 943498: Spread email scroll sync reflows.  r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/592558833a26
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 943498: Spread email scroll sync reflows.
2013-12-11 11:15:24 -08:00
Ryan VanderMeulen
12e918f111 Backed out changeset ac002daf081b (bug 947100) for B2G mochitest-3 orange. 2013-12-11 14:05:37 -05:00
Jason Duell
0c4425831b Bug 945066: remote nsIDNSService to child. r=jdm
* * *
bug 945066. Fix windows bustage.  r=jduell
2013-12-11 11:03:51 -08:00
Ryan VanderMeulen
a00e00a3cc Merge m-c to b-i. 2013-12-11 13:37:13 -05:00