Commit Graph

2735 Commits

Author SHA1 Message Date
Wes Kocher
df09fa0ebc Merge b2g-inbound to m-c 2013-09-18 17:09:39 -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
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
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
Jan Jongboom
6c7bb6bd55 Bug 916740 - Expose Keyboard.jsm to shell.js. r=kchen 2013-09-17 11:11:57 -04:00
Alex Keybl
63a42a7016 Merging in version bump NO BUG 2013-09-17 09:38:37 -04:00
Ryan VanderMeulen
2687bc00cf Merge b2g-inbound to m-c on a CLOSED TREE and DONTBUILD because it's just pushbot stuff. 2013-09-16 13:37:32 -04:00
Gaia Pushbot
9b4a09a440 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/eb5973515698
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #12238 from dwi2/916066_wording_of_active_keyboard_page

Bug 916066 - [Keyboard][V1.2] Need to modify the wording of Active Keyboard page r=crh0716

========

https://hg.mozilla.org/integration/gaia-central/rev/d41b761bcfa5
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 916066 - [Keyboard][V1.2] Need to modify the wording of Active Keyboard page
2013-09-16 04:20:22 -07:00
Gaia Pushbot
6db9faa237 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/fdb817bb9058
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #12090 from benfrancis/908927

Bug 908927 - Use templates instead of string concatenation for search URIs

========

https://hg.mozilla.org/integration/gaia-central/rev/03070fa85815
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 908927 - Use templates instead of string concatenation for search URIs
2013-09-16 04:05:22 -07:00
Gaia Pushbot
1387525ac5 Bumping gaia.json for 2 gaia-central revision(s)
========

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

Bug 916050 - We can save 700-1000kbs of memory loading confirm dialog in a lazy mode and deleting IccHelper when is finished

========

https://hg.mozilla.org/integration/gaia-central/rev/55033a80bf3d
Author: crdlc <crdlc@tid.es>
Desc: Bug 916050 - We can save 700-1000kbs of memory loading confirm dialog in a lazy mode and deleting IccHelper when is finished
2013-09-16 02:31:24 -07:00
Gaia Pushbot
fc49c2ac48 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e30273e5aca9
Author: Hans Liss <Hans@Liss.nu>
Desc: Bug 906767 - Swedish keyboard layout. r=rudylu

Removed country distinction for Swedish keyboard layout

Removed country marker on sv keyboard layout name
2013-09-16 01:35:22 -07:00
Gaia Pushbot
d8ffa7fd24 Bumping gaia.json for 1 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/7d05f26ed46c
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 916023 - Add Gaia functional tests. r=jgriffin
2013-09-16 01:25:23 -07:00
Gaia Pushbot
51b2aa941a Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/7949dab98fbf
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #10838 from comoyo/profanity

Bug 803189 - Allow profane words in dictionary but dont suggest them. r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/ee2ff8dbf603
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 803189 - Allow profane words in dictionary but dont suggest them
2013-09-16 01:10:24 -07:00
Gaia Pushbot
612caa95b8 Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/7405487508e2
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12203 from comoyo/globalkey

Bug 910713 - Global key isnt hidden if there is only one layout. r=RudyL

========

https://hg.mozilla.org/integration/gaia-central/rev/d18133b60624
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 910713 - Global key isnt hidden if there is only one layout

========

https://hg.mozilla.org/integration/gaia-central/rev/f329d89b9b55
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #12234 from EragonJ/bug-914317

Bug 914317 -  [B2G] [Bluetooth] "Unable to Pair" message has placeholder text. r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/32bfa536a0d0
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 914317 - Add a check to remove title in prompts
2013-09-16 00:35:22 -07:00
Gaia Pushbot
b47994e19d Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/13e01795177d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12237 from lightsofapollo/bug-916655

Bug 916655 - vbump marionette client (5s element search timeout)

========

https://hg.mozilla.org/integration/gaia-central/rev/a9f87605b70f
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 916655 - vbump marionette client (5s element search timeout)
2013-09-15 21:20:23 -07:00
Gaia Pushbot
48c28535ab Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/0bd51266be55
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #12232 from JinhoHwang/Bug_907505_Screen_Manager_registers_duplicated_event_listeners

Bug 907505 - [System] Screen_Manager registers duplicated event listener... r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/54a8c48fc105
Author: jinho.hwang <jinho.hwang@lge.com>
Desc: Bug 907505 - [System] Screen_Manager registers duplicated event listeners
2013-09-15 20:45:28 -07:00
Gaia Pushbot
7cc8173c60 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/596dd2c001aa
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #12198 from huchengtw-moz/video/Bug_916032_unable_to_pick_file

Bug 916032 - pick activity of video unable to choose file, r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/7bd29d92ecab
Author: John Hu <johu@mozilla.com>
Desc: Bug 916032 - pick activity of video unable to choose file
2013-09-15 20:35:24 -07:00
Gaia Pushbot
24fe1d618c Bumping gaia.json for 4 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/23bdefe73507
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12235 from lightsofapollo/revert-11915

Revert "Merge pull request #11915 from reubenmorais/contacts-customizati...

========

https://hg.mozilla.org/integration/gaia-central/rev/ead989351aad
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #11915 from reubenmorais/contacts-customization"

This reverts commit 84e2d96144ce9e94cc1bd2f8da6a1d2f97c39181, reversing
changes made to 9cb0bf07dd6b8c23ee4c4db3d866464077f81e45.

========

https://hg.mozilla.org/integration/gaia-central/rev/09c2b6e4e082
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #12223 from yxl/setInputMethodActive

Bug 842436 - Keyboard API: There should only be one keyboard active, and...
r=rudylu

========

https://hg.mozilla.org/integration/gaia-central/rev/9e6440eede90
Author: Yuan Xulei <xyuan@mozilla.com>
Desc: Bug 842436 - Keyboard API: There should only be one keyboard active, and Gecko should block interaction from non-active keyboards. r=rudyl
2013-09-15 20:25:22 -07:00
Gaia Pushbot
1037e9bbd0 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/7aa503060000
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #12189 from huchengtw-moz/camera/Bug_915994_show_preview_when_preview_is_not_big_enough

Bug 915994 - [Camera][REG] reset of media frame still trying to show pre..., r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/43b6068f4806
Author: John Hu <johu@mozilla.com>
Desc: Bug 915994 - [Camera][REG] reset of media frame still trying to show preview image when it is not big enough
2013-09-15 20:10:23 -07:00
Gaia Pushbot
1215ea5ef8 Bumping gaia.json for 3 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/b44ba604bd3b
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12231 from qdot/revert-revert-915920

Revert revert 915920

========

https://hg.mozilla.org/integration/gaia-central/rev/093f08b9789b
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 915920 - Fix gjslint quote errors

========

https://hg.mozilla.org/integration/gaia-central/rev/0c597b9bcea7
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Revert "Revert "Merge pull request #12206 from qdot/915920""

This reverts commit 4433c772ad5d1367157dddae08ce235ee28096b2.
2013-09-15 19:50:23 -07:00
Ryan VanderMeulen
1b1cc7da19 Merge b2g-inbound to m-c. 2013-09-15 21:53:23 -04:00
Gaia Pushbot
5ce2f35852 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/e089fe3d2b9a
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Merge pull request #11915 from reubenmorais/contacts-customization

Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/4fed03c0b3b4
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus
2013-09-15 16:55:22 -07:00
Ryan VanderMeulen
e447cd716c Backed out changesets f6402ce2b67a and 5bdec1cb1428 (bug 915705) because it depends on bug 882145, which was also backed out. 2013-09-15 18:51:50 -04:00
Gaia Pushbot
d9cdd2ea31 Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/d1e1683abc3c
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #12218 from qdot/uitest-fix

Bug 916081 - Fix UITest Notification Test Bind

========

https://hg.mozilla.org/integration/gaia-central/rev/3f13d4e38b05
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 916081 - Fix UITest Notification Test Bind
2013-09-15 14:35:22 -07:00
Gaia Pushbot
4f3f6fb1fa Bumping gaia.json for 2 gaia-central revision(s)
========

https://hg.mozilla.org/integration/gaia-central/rev/10e2e685f748
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #12208 from epang/bug915149-missing-setting-assets

Bug 915149 - Add Missing Setting Graphics

========

https://hg.mozilla.org/integration/gaia-central/rev/4b6c57ad015e
Author: Eric Pang <epang@mozilla.com>
Desc: Bug 915149 - Add Missing Setting Graphics
2013-09-15 13:35:22 -07:00