Commit Graph

174784 Commits

Author SHA1 Message Date
Ryan VanderMeulen
ad9cfce8d1 Merge fx-team to m-c. 2014-03-24 16:39:56 -04:00
B2G Bumper Bot
21365754ef Bumping manifests a=b2g-bump 2014-03-24 11:22:34 -07:00
B2G Bumper Bot
58a2d3fec2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e7950c4d17aa
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17404 from KevinGrandon/bug_985032_keyboard_menu

Bug 985032 - Long press the globe key won't be able to pop up the keyboard automatically

========

https://hg.mozilla.org/integration/gaia-central/rev/4e843cbe4309
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 985032 - Long press the globe key won't be able to pop up the keyboard automatically
2014-03-24 11:20:58 -07:00
Margaret Leibovic
59d75e85a6 Bug 943262 - Remove getCharsetTitle part of test_bug713519.js. r=gavin 2014-03-24 09:22:35 -07:00
Margaret Leibovic
90044610c2 Bug 943262 - Use CharsetMenu.jsm instead of charsetTitles.properties for Character Encoding menu items. r=bnicholson 2014-03-24 09:22:32 -07:00
B2G Bumper Bot
94df285592 Bumping manifests a=b2g-bump 2014-03-24 09:01:03 -07:00
Brian R. Bondy
bf48200eab Bug 981166 - Turn off Metro Firefox. r=jimm 2014-03-24 11:58:29 -04:00
B2G Bumper Bot
05d92eb84f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3a951d36f4b8
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17523 from arcturus/multipledelete2

Bug_956219 Multiple Contact Delete

========

https://hg.mozilla.org/integration/gaia-central/rev/b822a82094aa
Author: ashay.neema <ashay.neema@lge.com>
Desc: Bug_956219 Multiple Contact Delete

Fixing Lint
2014-03-24 08:55:46 -07:00
Carsten "Tomcat" Book
5a4ee05fad Merge mozilla-central to b2g-inbound 2014-03-24 15:35:27 +01:00
Carsten "Tomcat" Book
cb6a1cbb68 merge b2g-inbound to mozilla-central 2014-03-24 15:13:24 +01:00
Carsten "Tomcat" Book
2476c6cd83 merge fx-team to mozilla-central 2014-03-24 15:12:28 +01:00
B2G Bumper Bot
c4ba918b7e Bumping manifests a=b2g-bump 2014-03-24 06:57:39 -07:00
B2G Bumper Bot
20639d63b3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3335e206fa87
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17493 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button

========

https://hg.mozilla.org/integration/gaia-central/rev/608599241418
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
2014-03-24 06:55:57 -07:00
B2G Bumper Bot
f66fe845e5 Bumping manifests a=b2g-bump 2014-03-24 06:51:13 -07:00
B2G Bumper Bot
e7c1148ecf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4caf1d14a3bd
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #16248 from viorelaioia/bug-968912

Bug 968912 - Make an app object for FTU

========

https://hg.mozilla.org/integration/gaia-central/rev/077690350b64
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 968912 - Make an app object for FTU and write a test for desktopb2g/CI
2014-03-24 06:46:06 -07:00
B2G Bumper Bot
50d158cedb Bumping manifests a=b2g-bump 2014-03-24 06:26:10 -07:00
B2G Bumper Bot
a14fcc9da0 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7fb1f8a824c7
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17500 from viorelaioia/cost_control_tests

Bug 979914 - Investigate failure in test_cost_control_reset_wifi

========

https://hg.mozilla.org/integration/gaia-central/rev/08958c790917
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 979914 - Investigate failure in test_cost_control_reset_wifi

========

https://hg.mozilla.org/integration/gaia-central/rev/93f73bbf355e
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17516 from Archaeopteryx/crashreportsConcatSettingsUp2Date

Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/b73be1be7765
Author: Sebastian Hengst <archaeopteryx@coole-files.de>
Desc: Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/d2730e14b7d8
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17292 from flodolo/bug939791_settingskeyboard

Bug 939791 - [settings] keyboard: {{type}} in mustHaveOneKeyboard is empty for text keyboards

========

https://hg.mozilla.org/integration/gaia-central/rev/4aa7584a540a
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 939791 - [settings] keyboard: {{type}} in mustHaveOneKeyboard is empty for text keyboards
2014-03-24 06:20:56 -07:00
B2G Bumper Bot
5c4159d6f6 Bumping manifests a=b2g-bump 2014-03-24 06:11:08 -07:00
B2G Bumper Bot
15711330af Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0947d3f423ba
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17501 from viorelaioia/bug_985903

Bug 985903 - Investigate test_camera_capture_video.TestCamera intermitte...

========

https://hg.mozilla.org/integration/gaia-central/rev/548534372463
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail
2014-03-24 06:05:49 -07:00
B2G Bumper Bot
9734a85062 Bumping manifests a=b2g-bump 2014-03-24 04:41:07 -07:00
B2G Bumper Bot
9c733aff99 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c4bd8e11f0a7
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #17241 from crdlc/bug-983594

Bug 983594 - Avoid making several calls from detail view at the same tim...

========

https://hg.mozilla.org/integration/gaia-central/rev/e1abb181711a
Author: crdlc <crdlc@tid.es>
Desc: Bug 983594 - Avoid making several calls from detail view at the same time
2014-03-24 04:35:55 -07:00
B2G Bumper Bot
e5d7430099 Bumping manifests a=b2g-bump 2014-03-24 04:22:34 -07:00
B2G Bumper Bot
e3a4dc2145 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/27b36387e1e1
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" for bustage

This reverts commit 498250413b65c91762fd6f62e21b9f81c5ee77c9.
2014-03-24 04:21:08 -07:00
B2G Bumper Bot
9103cafd1c Bumping manifests a=b2g-bump 2014-03-24 04:01:06 -07:00
B2G Bumper Bot
a53e46fcd9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4188aeaa6414
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17505 from viorelaioia/bug_986462

Bug 986462 - Unxfail test_dialer_find_contact as Bug 983054 is fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/ecb3212a1066
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 986462 - Unxfail test_dialer_find_contact as Bug 983054 is fixed
2014-03-24 03:55:53 -07:00
B2G Bumper Bot
5fcfd9c920 Bumping manifests a=b2g-bump 2014-03-24 03:36:07 -07:00
B2G Bumper Bot
1f5e1f2bff Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c7df3a8049fe
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Revert "Merge pull request #17386 from nucliweb/973827-Power-button-modal"

This reverts commit 3ba39ebd3fd4613640f9477898a008580ef8fb41, reversing
changes made to ad3ff4d8515803a5467957f3c39faf83653b5510.
2014-03-24 03:31:00 -07:00
B2G Bumper Bot
ddb0a336b5 Bumping manifests a=b2g-bump 2014-03-24 03:21:11 -07:00
B2G Bumper Bot
13adeb3211 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/32bb22b68077
Author: Arthur Chen <crh0716@gmail.com>
Desc: Revert "Bug 961800 - Implement Child Window Factory."

This reverts commit 769a5b332ae1fb7758583006567e05ac8dd42dc1.
2014-03-24 03:15:59 -07:00
B2G Bumper Bot
bde1a095d4 Bumping manifests a=b2g-bump 2014-03-24 03:06:07 -07:00
B2G Bumper Bot
0d694e621e Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/08ef2514a1aa
Author: Carsten Book -Tomcat- <cbook@mozilla.com>
Desc: Revert "Bug 960861 - mozMobileConnections should not be requisites for airplane mode" for suspicion of breaking marionette tests

This reverts commit abd710def22c5244dfa8959b15ca49954a58e12c.

========

https://hg.mozilla.org/integration/gaia-central/rev/9fcac81be0ab
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17321 from pacorampas/973547

Bug 973547 - Enter device name overlay has a wrong layout.

========

https://hg.mozilla.org/integration/gaia-central/rev/1a7947ed3ee4
Author: Paco Rampas <pacorampas@gmail.com>
Desc: Bug 973547 - Enter device name overlay has a wrong layout.
2014-03-24 03:00:55 -07:00
B2G Bumper Bot
2da86efe98 Bumping manifests a=b2g-bump 2014-03-24 02:56:01 -07:00
B2G Bumper Bot
94a1d73123 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a15a2479ef80
Author: Joan Leon <joan.leon@gmail.com>
Desc: Merge pull request #17386 from nucliweb/973827-Power-button-modal

Power-button-modal

========

https://hg.mozilla.org/integration/gaia-central/rev/37cfe1536eaf
Author: Joan Leon <joan.leon@gmail.com>
Desc: Power-button-modal
2014-03-24 02:51:18 -07:00
Thomas Zimmermann
3de553dd1d Bug 985949: Correctly forget pointer references in Bluedroid backend, r=echou
This patch fixes a regression from bug 967364. An nsRefPtr is now
correctly cleared by |forget| without causing a crash.
2014-03-24 10:44:29 +01:00
Thomas Zimmermann
4aaccae2b5 Bug 985949: Fix pointer handling in BlueZ backend, r=echou
This is caused by bug 967364. We need to hand over data structures
to DBus operations and forget about them if the operation returned
success. Until now, we could just tell their nsRefPtrs to |forget|
about them, but with bug 967364 applied we need to swap an empty
value into the pointer.
2014-03-24 10:44:28 +01:00
B2G Bumper Bot
ae38a2366f Bumping manifests a=b2g-bump 2014-03-24 02:41:05 -07:00
B2G Bumper Bot
b6fa020e1f Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9fc2a79c615a
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17510 from yurenju/stage3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/26e9ea2e0fbc
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js

========

https://hg.mozilla.org/integration/gaia-central/rev/297745511a1a
Author: gitmai <mri@tid.es>
Desc: Merge pull request #17474 from gitmai/bug-986473-CC-modify-parameters

Bug 986473 -Modify cost control parameters
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/9c49ef2d5808
Author: mai <mri@tid.es>
Desc: Bug 986473 -Modify cost control parameters
2014-03-24 02:35:52 -07:00
Simon Montagu
0c95e23cef Correction to typo in checkin for bug 789096. Bug 983691, r=jfkthame 2014-03-24 02:23:12 -07:00
B2G Bumper Bot
a433a5d48b Bumping manifests a=b2g-bump 2014-03-24 02:16:08 -07:00
B2G Bumper Bot
80515b3424 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9deb1e43dd2e
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17508 from crh0716/964180

Bug 964180 - Introduce AMD to settings app, r=evelyn, etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/40f60ae4d99a
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 964180 - Introduce AMD to settings app
1. Support new panel model
2. Separate common logic to SettingsCache, PanelUtils, PageTransitions
2014-03-24 02:10:54 -07:00
Georg Fritzsche
e0beb1ca80 Bug 983360 - Telemetry experiments: add monitoring data to Telemetry payload. r=bsmedberg 2014-03-24 09:58:57 +01:00
Georg Fritzsche
d16974272e Bug 985670 - Telemetry experiments: Decouple experiment and addon ids. r=felipe 2014-03-24 09:58:57 +01:00
Georg Fritzsche
60ec64ab73 Bug 985670 - Telemetry experiments: Don't schedule incorrect timer when there is no pending experiment. r=felipe 2014-03-24 09:58:57 +01:00
Georg Fritzsche
9c80ae9c4b Bug 984387 - Telemetry experiments: test coverage for disabling and removal of experiments via manifest. r=felipe 2014-03-24 09:58:56 +01:00
B2G Bumper Bot
daf540aaba Bumping manifests a=b2g-bump 2014-03-24 01:51:11 -07:00
B2G Bumper Bot
a8d0393cf3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b3421d0cc5b3
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #17503 from alivedise/bugzilla/970028_master_v2/nicer-activity-animation

Bug 970028 - Nicer activity opener animation

========

https://hg.mozilla.org/integration/gaia-central/rev/673fc5bf232d
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 970028 - Nicer activity opener animation
2014-03-24 01:46:02 -07:00
B2G Bumper Bot
3e0f9dce13 Bumping manifests a=b2g-bump 2014-03-24 00:56:07 -07:00
B2G Bumper Bot
23a33bc99d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/864dfd0e6f53
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17451 from rnowm/986512

Bug 986512 - Switches [BB] remove transition

========

https://hg.mozilla.org/integration/gaia-central/rev/7bc73c337dc8
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 986512 - Switches [BB] remove transition
2014-03-24 00:51:05 -07:00
B2G Bumper Bot
18a677afe0 Bumping manifests a=b2g-bump 2014-03-23 23:11:01 -07:00
B2G Bumper Bot
08ec8f8bd7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9bb30b77853f
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #17418 from alivedise/bugzilla/961800_master_merging/child-window-factory

Bug 961800 - Implement Child Window Factory, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/d31dbf17fad2
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 961800 - Implement Child Window Factory.

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css
2014-03-23 23:05:47 -07:00