Commit Graph

175052 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
57c071047f Merge mozilla-central to mozilla-inbound 2014-03-24 15:23:49 +01:00
James Willcox
11722c2841 Bug 981621 - Guard against null GrContext r=gwright 2014-03-24 09:13:55 -05:00
Carsten "Tomcat" Book
b5d2bce31a merge b2g-inbound to mozilla-central 2014-03-24 15:13:24 +01:00
Carsten "Tomcat" Book
a6403cad6f merge fx-team to mozilla-central 2014-03-24 15:12:28 +01:00
B2G Bumper Bot
2c9714aaf6 Bumping manifests a=b2g-bump 2014-03-24 06:57:39 -07:00
B2G Bumper Bot
e1d432a841 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
6571592da7 Bumping manifests a=b2g-bump 2014-03-24 06:51:13 -07:00
B2G Bumper Bot
81fdbb71da 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
Rik Cabanier
3425d5a8cf Bug 985257 - Add implementation for Path2D constructor that takes an SVG path string. r=roc 2014-03-24 09:31:19 -04:00
B2G Bumper Bot
ae3323bfc0 Bumping manifests a=b2g-bump 2014-03-24 06:26:10 -07:00
Simon Sapin
72897b9af2 Bug 984728 - Refactor grid-auto-flow parsing to use ParseBitmaskValues; r=dholbert 2014-03-24 14:26:04 +01:00
B2G Bumper Bot
ae06113591 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
5a4ab21d09 Bumping manifests a=b2g-bump 2014-03-24 06:11:08 -07:00
B2G Bumper Bot
5de4f15362 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
13c5b35642 Bumping manifests a=b2g-bump 2014-03-24 04:41:07 -07:00
B2G Bumper Bot
9ba7ad0c0a 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
2d0a4ac313 Bumping manifests a=b2g-bump 2014-03-24 04:22:34 -07:00
B2G Bumper Bot
f4408e21b4 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
578ca64463 Bumping manifests a=b2g-bump 2014-03-24 04:01:06 -07:00
B2G Bumper Bot
3c32ed5c0b 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
e9cbd525cb Bumping manifests a=b2g-bump 2014-03-24 03:36:07 -07:00
B2G Bumper Bot
0771331b1c 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
a68b74a964 Bumping manifests a=b2g-bump 2014-03-24 03:21:11 -07:00
B2G Bumper Bot
8a98135392 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
2dd8ba98db Bumping manifests a=b2g-bump 2014-03-24 03:06:07 -07:00
B2G Bumper Bot
8a3db68c4a 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
abdec34c57 Bumping manifests a=b2g-bump 2014-03-24 02:56:01 -07:00
B2G Bumper Bot
5b5a156f4d 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
a910cb0a34 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
7541f838f3 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
d7459c3fbd Bumping manifests a=b2g-bump 2014-03-24 02:41:05 -07:00
B2G Bumper Bot
88509b1642 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
27a769cf38 Correction to typo in checkin for bug 789096. Bug 983691, r=jfkthame 2014-03-24 02:23:12 -07:00
B2G Bumper Bot
f0c7d127a6 Bumping manifests a=b2g-bump 2014-03-24 02:16:08 -07:00
B2G Bumper Bot
7056be411c 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
544d2c7bcd Bug 983360 - Telemetry experiments: add monitoring data to Telemetry payload. r=bsmedberg 2014-03-24 09:58:57 +01:00
Georg Fritzsche
c6cfa0d526 Bug 985670 - Telemetry experiments: Decouple experiment and addon ids. r=felipe 2014-03-24 09:58:57 +01:00
Georg Fritzsche
6723d52df6 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
53ece3de1c 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
345d0cd3e5 Bumping manifests a=b2g-bump 2014-03-24 01:51:11 -07:00
B2G Bumper Bot
11afd52d27 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
2c7ec8bdd1 Bumping manifests a=b2g-bump 2014-03-24 00:56:07 -07:00
B2G Bumper Bot
405a07bd32 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
74e1bcc74c Bumping manifests a=b2g-bump 2014-03-23 23:11:01 -07:00
B2G Bumper Bot
51b165ffb5 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
B2G Bumper Bot
ba03b6749c Bumping manifests a=b2g-bump 2014-03-23 22:36:04 -07:00
B2G Bumper Bot
74631ae8e2 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/64043480018e
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17494 from gasolin/sheriff971554" for gaia-unit failures

This reverts commit c377f41d017d4b099e92fd7ecf67d9cd1cee1292, reversing
changes made to 3286e2a0cbcac52e38c0494ab614bac23cdc229f.
2014-03-23 22:30:53 -07:00
B2G Bumper Bot
11b36346f1 Bumping manifests a=b2g-bump 2014-03-23 22:21:09 -07:00
B2G Bumper Bot
40cdff216b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/13d91fc76332
Author: RickyChien <ricky060709@gmail.com>
Desc: Merge pull request #16891 from RickyChien/bug-972699

Bug 972699 - Fix unit test zero coverage when using lazy load r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/20cf28b60560
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 972699 - Fix unit test zero coverage when using lazy load
2014-03-23 22:15:57 -07:00
B2G Bumper Bot
8ed3f432ce Bumping manifests a=b2g-bump 2014-03-23 20:22:37 -07:00