Commit Graph

2759 Commits

Author SHA1 Message Date
Gaia Pushbot
7b19a4a2de Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/4ff387ba1fbb
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12282 from eeejay/bug-917586

Bug 917586 - Use newer version of screen reader simulator in desktop firefox. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/467adffea105
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 917586 - Use newer version of screen reader simulator in desktop firefox.
2013-09-19 14:30:25 -07:00
Gaia Pushbot
ea39e1ac6d Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/a5b50081635b
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #12313 from ferjm/bug915038.imei

Bug 915038 - [Dialer] MMI codes not working in dialer app. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/e3d3374484d8
Author: Fernando Jiménez <ferjmoreno@gmail.com>
Desc: Bug 915038 - [Dialer] IMEI code not working in dialer app. r=rik
2013-09-19 09:25:24 -07:00
Gaia Pushbot
4614be4ec1 Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/80b4004cd338
Author: Ben Kelly <ben@wanderview.com>
Desc: Revert "Merge pull request #12304 from wanderview/contacts-css-opt" r=jmcf

This reverts commit 2216eb383b005b9f6159f2b04fd7400f4f2641af, reversing
changes made to 9043813ee4d5fb68e7dec34dd9cd97d5fc5adcfc.
2013-09-19 08:35:23 -07:00
Ed Morley
01d078a07c Merge mozilla-central and b2g-inbound 2013-09-19 16:28:54 +01:00
Gaia Pushbot
d138c4d649 Bumping gaia.json for 4 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/ca3e0c37006f
Author: Francisco Borja Salguero Castellano <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #12312 from borjasalguero/followup_sms

Bug 918302 - [Followup 900443][SMS] Add a robust check when retrieving a...

========

https://hg.mozilla.org/integration/gaia-central/rev/99c1b41313cd
Author: borjasalguero <fbsc@tid.es>
Desc: Bug 918302 - [Followup 900443][SMS] Add a robust check when retrieving a contact from activity. r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/d6876efaab51
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #12270 from fcampo/BT-exportVcard-887534

Bug 887534 - [US] Send contact as a VCARD via bluetooth (r=borjasalguero)

========

https://hg.mozilla.org/integration/gaia-central/rev/a258d8fafed8
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 887534 - [US] Send contact as a VCARD via bluetooth
-------------------------------------------------------

Create bt.js and use it for bluetooth call
Add error messages, seems to work, error related to other bugs
Fixing activity parameters
Correct path for file
Getting the file from sdcard
Adding log sfor debug
More logs, seems to work now
last changes, working now, need to clean up code
Cleaning up
Refactor and final cleanup
Adding tests
2013-09-19 08:10:22 -07:00
Gaia Pushbot
5d645a9de3 Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/f8a6680334ee
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 917956 - [Clock] Timer spinner allows for out-of-bound input - r=jugglinmike

- The "upper" limit of the select should be the length of values - 1 (not the length)
2013-09-19 08:00:23 -07:00
Ed Morley
f85e620314 Merge latest green b2g-inbound changeset and mozilla-central 2013-09-19 15:38:36 +01:00
Gaia Pushbot
8cb79360e9 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/33d22cba7641
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #11860 from rnowm/821673

Bug 821673 - Redesign back, menu and close buttons

========

https://hg.mozilla.org/integration/gaia-central/rev/1b57a5c8be1d
Author: Arnau <arnau@arnaumarch.com>
Desc: Bug 821673 - Redesign back, menu and close buttons
2013-09-19 06:10:24 -07:00
Gaia Pushbot
ea16a35391 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/239f22974aae
Author: Francisco Borja Salguero Castellano <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #11889 from borjasalguero/madrid_getdisplayinfo

Bug 900443 - [SMS] Remove repeated request to Contacts API when retrievi...

========

https://hg.mozilla.org/integration/gaia-central/rev/d0a61a8248a6
Author: borjasalguero <fbsc@tid.es>
Desc: Bug 900443 - [SMS] Remove repeated request to Contacts API when retrieving a contact from 'Contacts' activity. r=julienw
2013-09-19 05:35:27 -07:00
Gaia Pushbot
808614c137 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/9bf9368a1110
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #12155 from cctuan/911673

Bug 911673 - [system] use 'scroll from device side to screen'(scroll up) gesture to back to homescreen

========

https://hg.mozilla.org/integration/gaia-central/rev/483951ba1552
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 911673 use 'scroll from device side to screen'(scroll up) gesture to back to homescreen
2013-09-19 04:15:25 -07:00
Gaia Pushbot
ba9eabe6de Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/b74eef52b0d0
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12308 from gtorodelvalle/contacts-bug-916100-footer-button-not-disabled-reloaded

Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour (r=jmcanterafonseca)

========

https://hg.mozilla.org/integration/gaia-central/rev/36fe8acf08df
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour
2013-09-19 02:55:23 -07:00
Gaia Pushbot
e0fb917d28 Bumping gaia.json for 4 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/892887f2e1c2
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12307 from jmcanterafonseca/bug-917783

Bug 917783 - [Contacts] Email field is case sensitive when merging

========

https://hg.mozilla.org/integration/gaia-central/rev/79d6af966b4b
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917783 - [Contacts] Email field is case sensitive when merging

========

https://hg.mozilla.org/integration/gaia-central/rev/a8027db4408d
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12309 from jmcanterafonseca/bug-917684

Bug 917684 - [Contacts] Importing from SIM a contact without phone numbe...

========

https://hg.mozilla.org/integration/gaia-central/rev/ca914400218f
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917684 - [Contacts] Importing from SIM a contact without phone number, will add an empty phone for that contact
2013-09-19 02:40:21 -07:00
Gaia Pushbot
d86ec87b72 Bumping gaia.json for 4 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/684f7deeab97
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12304 from wanderview/contacts-css-opt

Bug 918174: Load contacts CSS from index.html

========

https://hg.mozilla.org/integration/gaia-central/rev/6c981ec2dccd
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 918174: Load contacts CSS from index.html

========

https://hg.mozilla.org/integration/gaia-central/rev/0a88a2ce13e7
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12290 from jmcanterafonseca/bug-917208

Bug 917208 - [Contacts] Phone field appears twice when merging two conta...

========

https://hg.mozilla.org/integration/gaia-central/rev/47e3f76ae9dc
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 917208 - [Contacts] Phone field appears twice when merging two contacts with same phone number
2013-09-19 00:35:22 -07:00
Phil Ringnalda
9b61e0092a Merge m-c to b-i 2013-09-18 23:31:20 -07:00
Phil Ringnalda
059782fbe5 Merge m-c to m-i 2013-09-18 23:28:41 -07:00
Wes Kocher
df09fa0ebc Merge b2g-inbound to m-c 2013-09-18 17:09:39 -07:00
Gaia Pushbot
0b2077cd04 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

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

Revert "Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support" r=fabrice

========

https://hg.mozilla.org/integration/gaia-central/rev/654907243f6a
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support"

This reverts commit 4cfe3660a8f293f54c111d07fca5cec6089bd32a.
2013-09-18 17:00:26 -07:00
Gaia Pushbot
20c1fd84bd Bumping gaia.json for 3 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/a22c634e2dda
Author: retornam <retornam@users.noreply.github.com>
Desc: Merge pull request #12272 from bobsilverberg/bug917276

Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup

========

https://hg.mozilla.org/integration/gaia-central/rev/16c313e6aaeb
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Address review comments.
Replaced calls to launch(), changed method name, made wait_for explicit.

========

https://hg.mozilla.org/integration/gaia-central/rev/f123d13ce40e
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 917276 - Update lockscreen app and tests to address changes to the lockscreen markup
2013-09-18 16:25:22 -07:00
Gaia Pushbot
a96b7f330f Bumping gaia.json for 1 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/94c99936c5f8
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 917463 - [Clock] Implement scrolling inertia in inline time picker for Timers - r=jugglinmike

https://bugzilla.mozilla.org/show_bug.cgi?id=917463

- Removes "slow down" effect when under threshold, is awkward
- Adds "inertia" by detecting the speed of the last pan event when a swipe finishes and adjusts the index properly
- Separated out the "stopInteraction" method from the onswipe
2013-09-18 14:50:22 -07:00
Gaia Pushbot
86f5065239 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/d56c46fdd8f9
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #12253 from nullaus/agps-unit-tests

bug 891732 - AGPS/SUPL Operator Variant Unit Tests. r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/d3e7c3670930
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 891732 - AGPS/SUPL Operator Variant Unit Tests.

r=josea.olivera
2013-09-18 14:15:24 -07:00
Gaia Pushbot
cdac2ec153 Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/8547bf51868f
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #11995 from bobsilverberg/settings_bluetooth_test

Bug 917946 - Add Gaia-marionette tests for the settings app

========

https://hg.mozilla.org/integration/gaia-central/rev/6eedcfd6ddca
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 917946 - Add Gaia-marionette tests for the settings app
Create base app object
Create settings app object
Create bluetooth and do not track panel regions
Create sample tests for bluetooth and do not track settings
2013-09-18 12:40:22 -07:00
Fabrice Desré
6307081ca7 Bug 915626 - Add a way to restart gecko into a clean state r=vingtetun 2013-09-18 10:42:06 -07:00
Gaia Pushbot
79c894bd75 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e596a7138422
Author: ochameau <poirot.alex@gmail.com>
Desc: Merge pull request #12299 from ochameau/build-exceptions

Bug 917793 - Ensure printing exceptions in js build scripts r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/6465882eb932
Author: Alexandre Poirot <poirot.alex@gmail.com>
Desc: Bug 917793 - Ensure printing exceptions in js build scripts r=yurenju
2013-09-18 08:30:22 -07:00
Gaia Pushbot
bc67196764 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e77a67b02714
Author: Corey Frang <gnarf37@gmail.com>
Desc: Bug 917337 - [Clock] Implement Scrolling for Timer Settings

https://bugzilla.mozilla.org/show_bug.cgi?id=917337

- Adds overflow-y: auto to #timer-dialog
- Adds a event.preventDefault() on touchstart on the time picker to stop user from scrolling while spinning inputs

r=jugglinmike
2013-09-18 08:05:24 -07:00
Jim Chen
8afec00f15 Bug 916205 - Add and package UA override list; r=fabrice r=glandium 2013-09-18 10:57:08 -04:00
Gaia Pushbot
4a18f5cb91 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/5cf9abd14f7e
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12296 from gtorodelvalle/contacts-bug-910170-export-button-not-disabled

Bug 910170 - [CONTACTS] The export button isn't disabled when no contact is selected (r=jmcanterafonseca).

========

https://hg.mozilla.org/integration/gaia-central/rev/ae1bb0ba69c5
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 910170 - [CONTACTS] The export button isn't disabled when no contact is selected.

========

https://hg.mozilla.org/integration/gaia-central/rev/81b0bdb11125
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12295 from gtorodelvalle/contacts-bug-916100-footer-button-not-disabled

Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour (r=jmcanterafonseca)

========

https://hg.mozilla.org/integration/gaia-central/rev/5ea89914d834
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 916100 - [Contacts] Taapping on the disabled merge button when there are not contacts selected to be merged make it to change its colour.
2013-09-18 06:40:22 -07:00
Chia-hung Tai
89b5a82de0 Bug 917163 - [MMS] MMS Data call is not released immediately. r=vyang 2013-09-18 11:04:16 +08:00
Gaia Pushbot
265adee975 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/73923a35d9de
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #12269 from gtorodelvalle/dialer-bug-910188-closing-contact-list

Dialer bug 910188 closing contact list (r=jmcanterafonseca)

========

https://hg.mozilla.org/integration/gaia-central/rev/32e97206d1dc
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 910188 - [CONTACTS] In export contacts option, if we tap on 'x' button, we come back to Settings screen.
2013-09-18 01:35:22 -07:00
Gaia Pushbot
786a3f44ca Bumping gaia.json for 2 gaia-central revision(s) a=NPOTB
========

https://hg.mozilla.org/integration/gaia-central/rev/98f191869b0c
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #12310 from jmcanterafonseca/bug-916096

Bug 916096 - [Contacts] Incorrect message to show the matching field in ...

========

https://hg.mozilla.org/integration/gaia-central/rev/c3470b4ea0ee
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 916096 - [Contacts] Incorrect message to show the matching field in Merge duplicates screen
2013-09-19 04:40:22 -07:00
Gaia Pushbot
fb32f85c56 Bumping gaia.json for 2 gaia-central revision(s)
========

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

Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me)

========

https://hg.mozilla.org/integration/gaia-central/rev/7aefd8280725
Author: crdlc <crdlc@tid.es>
Desc: Bug 916782 - Remove progress_activity.css and status.css from homescreen (it is only needed for ev.me)
2013-09-17 23:50:26 -07:00
Gaia Pushbot
135df49e13 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ebb38d4126d0
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12287 from lightsofapollo/reallyreallyhide-keyboard-tets

[really] per bug 917523 disable test on tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/290853690b8c
Author: James Lal <james@lightsofapollo.com>
Desc: [really] per bug 917523 disable test on tbpl
2013-09-17 21:40:27 -07:00
Gaia Pushbot
dbfee1394b Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/31d028bfcc44
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #12236 from gasolin/issue-911696

Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no tel..., r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/c0226574c7ea
Author: gasolin <gasolin@gmail.com>
Desc: Bug 911696 - [Dialer] [Flatfish] hide dialer app in homescreen if no telephony support
2013-09-17 20:20:22 -07:00
Ryan VanderMeulen
871fb32207 Merge b2g-inbound to m-c. 2013-09-17 22:46:32 -04:00
Ryan VanderMeulen
5be5179c2d Merge m-c to fx-team on a CLOSED TREE. 2013-09-17 20:27:03 -04:00
Gaia Pushbot
0309ea7d5b Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/94340fb19f68
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12283 from lightsofapollo/reallyhide-keyboard-tests

per bug 917523 disable test on tbpl

========

https://hg.mozilla.org/integration/gaia-central/rev/d817d867b7ae
Author: James Lal <james@lightsofapollo.com>
Desc: per bug 917523 disable test on tbpl
2013-09-17 17:10:24 -07:00
Gaia Pushbot
1f9d0fdc59 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/99a07b8780aa
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12095 from eeejay/bug-914882

Bug 914882 - Style clipped settings panels as invisible. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/7d4f34845e97
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 914882 - Style clipped settings panels as invisible.
2013-09-17 16:15:26 -07:00
Gaia Pushbot
f032f4ad00 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/b5d66bc31278
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #12281 from eeejay/bug-916231

Bug 916231 - Add screen reader toggle to developer options. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/706499ea0abd
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 916231 - Add screen reader toggle to developer options.
2013-09-17 15:50:25 -07:00
Gaia Pushbot
8a8bc6c735 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/2abf97674c6a
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12279 from lightsofapollo/disable-modify-event-view

disable modify_event_test a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/b12465654e88
Author: James Lal <james@lightsofapollo.com>
Desc: disable modify_event_test a=test-only
2013-09-17 14:50:22 -07:00
Gaia Pushbot
440374fcd3 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/49950f830ee6
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12259 from lightsofapollo/gaia-ui-tests-travis

Bug 916305 - Gaia ui tests travis

========

https://hg.mozilla.org/integration/gaia-central/rev/13c2ca7c1f26
Author: James Lal <james@lightsofapollo.com>
Desc: xfail test_clock_turn_on_off_alarm.py

========

https://hg.mozilla.org/integration/gaia-central/rev/3a93cb8a84ef
Author: James Lal <james@lightsofapollo.com>
Desc: xfail test_settings_change_keyboard_language.py

========

https://hg.mozilla.org/integration/gaia-central/rev/a2031a207635
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 916305 - Gaia ui test travis setup
2013-09-17 14:40:24 -07:00
Gaia Pushbot
93eb55d7da Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/36097dafad3c
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #12234 from EragonJ/bug-914317"

https://bugzilla.mozilla.org/show_bug.cgi?id=914317#c13

This reverts commit bda5c4a902793934467b689a118a2c68f745706e, reversing
changes made to bc85e07011c2c40986693657fa7647ee5c9f8eea.
2013-09-17 14:15:23 -07:00
Ryan VanderMeulen
8babb6cb0e Merge m-c to inbound on a CLOSED TREE. 2013-09-17 16:55:23 -04:00
Ryan VanderMeulen
19805ff01e Merge m-c to b2g-inbound. 2013-09-17 16:51:34 -04:00
Gaia Pushbot
160664d665 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d61ac2e84b83
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #12276 from gaye/waitForAlert

Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/958033f9d148
Author: gaye <gaye@mozilla.com>
Desc: Use MarionetteHelper#waitForAlert in share_url_test.js r=lightsofapollo
2013-09-17 13:50:23 -07:00
Ryan VanderMeulen
a185ae5d5b Merge b2g-inbound to m-c. 2013-09-17 16:50:17 -04:00
Gaia Pushbot
cf46f24c4e Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/ca3cef257ae1
Author: Fabien Cazenave <fabien@cazenave.cc>
Desc: Merge pull request #12274 from flodolo/bug917198_master

Bug 917198 - inconsistent use of "OK" and "KB" across Gaia apps and settings, r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/76e3a2829ed1
Author: Francesco Lodolo <flod@lodolo.net>
Desc: Bug 917198 - en-US: inconsistent use of "OK" and "KB" across Gaia apps and settings
2013-09-17 12:50:25 -07:00
Gaia Pushbot
18b44328e9 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/a54cc0c1ff0d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12255 from lightsofapollo/travis-parallel

Bug 917044 - Run gjslint, unit tests and integration tests in parallel

========

https://hg.mozilla.org/integration/gaia-central/rev/2f6b3ef3d6ee
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 917044 - Run gjslint, unit tests and integration tests in parallel
2013-09-17 12:20:27 -07:00
Alexandre Poirot
59c8663b59 Bug 917331 - Fix exception on b2g desktop about undefined AdbController object. r=fabrice 2013-09-17 14:29:38 -04:00
Alex Keybl
b16740d8c4 m-c is now FxOS 1.3 r=merge NO BUG 2013-09-17 14:26:06 -04:00
Gaia Pushbot
bbd9413604 Bumping gaia.json for 2 gaia-central revision(s)
========

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

Bug 908953 - Use HTML import polyfill for dialer dom r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/c45d90bbef10
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 908953 - Use HTML import polyfill for dialer dom r=rik
2013-09-17 09:30:28 -07:00
Gaia Pushbot
009da3fc5e Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/c94420395a6b
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #12177 from steveck-chung/issue913378

Bug 913378 - Redesign of incoming call screen - Gaia implementation. r=etienne a=koi+

========

https://hg.mozilla.org/integration/gaia-central/rev/30be20b5c73e
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 913378 - Redesign of incoming call screen - Gaia implementation
2013-09-17 09:15:26 -07:00