Commit Graph

7202 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
091094e1f6 merge b2g-inbound to mozilla-central 2014-03-12 12:23:01 +01:00
B2G Bumper Bot
63d513be6d Bumping manifests a=b2g-bump 2014-03-11 19:16:44 -07:00
B2G Bumper Bot
c3d4081777 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1450b977cb8e
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #16979 from EragonJ/bug-979751

Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows

========

https://hg.mozilla.org/integration/gaia-central/rev/d46a0e05b417
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 979751 - [Security setting] Redundant "Enter PUK code" page shows

after enter incorrect PIN code three times.

- update logic
- add unit test
2014-03-11 19:10:13 -07:00
B2G Bumper Bot
ecd44dbe09 Bumping manifests a=b2g-bump 2014-03-11 18:51:21 -07:00
B2G Bumper Bot
fd9137cdb2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/66cf75ccef9c
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #16446 from psingapati/Bug_965139_WiFiWakeLock_Email_Send

Bug 965139 - [Email] Acquiring a wifi wakelock while sending an email r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/28385a8660cc
Author: praveen.singapati <praveen.singapati@lge.com>
Desc: Bug 965139 - [Email] Acquiring a wifi wakelock while sending an email

comment spaces
2014-03-11 18:45:24 -07:00
Wes Kocher
85a3a0d665 Merge m-c to fx-team 2014-03-11 18:40:27 -07:00
B2G Bumper Bot
4dd6d85523 Bumping manifests a=b2g-bump 2014-03-11 16:46:04 -07:00
B2G Bumper Bot
b82a635e79 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/814d50a6110b
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17023 from pivanov/bug-968483" for gaia-unit test bustage

This reverts commit 32b5a2c8986332d50edde79517fe4fc83ae8519c, reversing
changes made to 6c93da506e79bd7641f2cc0958b531ab84ceefe1.
2014-03-11 16:40:23 -07:00
B2G Bumper Bot
892b477c4b Bumping manifests a=b2g-bump 2014-03-11 15:51:40 -07:00
B2G Bumper Bot
77b67ae985 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9cc2a81126ab
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #17020 from jmcanterafonseca/vivien_search"

This reverts commit 2ac4603e3269c5d410869a76c13a25bdb6a79241, reversing
changes made to 8280f6749b8183e4bc52ce84affca310858e86d2.
2014-03-11 15:50:23 -07:00
B2G Bumper Bot
c94158c2a1 Bumping manifests a=b2g-bump 2014-03-11 15:36:38 -07:00
B2G Bumper Bot
a9705cc291 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/57ce65a5f1e4
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 981521 - Display notifications for messages with a "signal-none" action r=julienw
2014-03-11 15:35:22 -07:00
B2G Bumper Bot
76d5017279 Bumping manifests a=b2g-bump 2014-03-11 14:36:17 -07:00
B2G Bumper Bot
7cbeeae6f5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a0ffe2f47707
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #17023 from pivanov/bug-968483

Bug 968483 - [Building Blocks] Update header design to accommodate larger back-button

========

https://hg.mozilla.org/integration/gaia-central/rev/efaaabc5b3b4
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 968483 - [Building Blocks] Update header design to accommodate larger back-button
2014-03-11 14:30:22 -07:00
B2G Bumper Bot
4b23ea9dae Bumping manifests a=b2g-bump 2014-03-11 13:06:23 -07:00
B2G Bumper Bot
a825999e20 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/82537f452462
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #17094 from gaye/revert-26cec18074b99c169d1bdf76c8a4a80b0acc4c83

Revert "Bug 970138 - [Tooling] Add a commit hook to unify the file permission

========

https://hg.mozilla.org/integration/gaia-central/rev/f73b3caa62e4
Author: Gareth Aye <gaye@mozilla.com>
Desc: Revert "Bug 970138 - [Tooling] Add a commit hook to unify the file permision"

This reverts commit 26cec18074b99c169d1bdf76c8a4a80b0acc4c83.
2014-03-11 13:00:22 -07:00
Jan Keromnes
902f8046ea Bug 973188 - Make the Developer HUD API nicer for Gaia test integration. r=21 2014-03-11 17:01:29 -04:00
Ryan VanderMeulen
2a9e5542b7 Merge m-c to b2g-inbound. 2014-03-08 01:26:52 -08:00
B2G Bumper Bot
8d95ff156e Bumping manifests a=b2g-bump 2014-03-11 12:11:39 -07:00
B2G Bumper Bot
ad8a5643ee Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 978371 - Fix editing bookmark URLs r=vingtetun

========

https://hg.mozilla.org/integration/gaia-central/rev/be625f9a3e41
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 978371 - Fix editing bookmark URLs
2014-03-11 12:10:23 -07:00
B2G Bumper Bot
be7a000c3a Bumping manifests a=b2g-bump 2014-03-11 11:51:00 -07:00
B2G Bumper Bot
86bc145950 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6195441c7748
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #17087 from etiennesegonzac/bug-980984-incoming-alert-from-system

Bug 980984 - Alert the user of an incoming from the system app to improve performance r=alive, rik

========

https://hg.mozilla.org/integration/gaia-central/rev/b15ab79f660a
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 980984 - Alert the user of an incoming from the system app to improve performance.
r=alive, rik
2014-03-11 11:45:25 -07:00
B2G Bumper Bot
32c5e2db2e Bumping manifests a=b2g-bump 2014-03-11 11:41:26 -07:00
B2G Bumper Bot
08e480afd6 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/30948612490a
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #17074 from millermedeiros/981441-dst-day-view

Bug 981441 - DST bug in day_view_test.js results in "TEST-UNEXPECTED-FAIL | day view events longer than 2h click after event end" during the day daylight time begins r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/a57be6acbe8e
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 981441 - DST bug in day_view_test.js results in "TEST-UNEXPECTED-FAIL | day view events longer than 2h click after event end" during the day daylight time begins

========

https://hg.mozilla.org/integration/gaia-central/rev/ae68e52eec42
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #16685 from DouglasSherk/dsds

Bug 946866 - [DSDS][Dialer][SMS] On-the-fly SIM change when calling, supporting refactors. r=Rik

========

https://hg.mozilla.org/integration/gaia-central/rev/68a2f4f1d760
Author: DouglasSherk <github@sherk.me>
Desc: Bug 946866 - [DSDS][Dialer][SMS] On-the-fly SIM change when calling, supporting refactors. r=Rik
2014-03-11 11:35:22 -07:00
B2G Bumper Bot
aea37df1ed Bumping manifests a=b2g-bump 2014-03-11 11:11:39 -07:00
B2G Bumper Bot
2f48be2533 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/55974fe6ab78
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #17047 from qdot/981943-clock-database-fix

Bug 981943 - Add database close to upgrade error in clock database. Fix ...

========

https://hg.mozilla.org/integration/gaia-central/rev/0e340f5280ab
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 981943 - Add database close to upgrade error in clock database. Fix event name typo.
2014-03-11 11:10:22 -07:00
B2G Bumper Bot
16a8a3c22e Bumping manifests a=b2g-bump 2014-03-11 10:56:39 -07:00
B2G Bumper Bot
b5ccd27ddd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0518f739c8c0
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17085 from bebef1987/unxfail

Bug 982178 - Unxfail test_dialer_airplane_mode Bug 978031 is fixed

========

https://hg.mozilla.org/integration/gaia-central/rev/fb0ee54bfc6b
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 982178 - Unxfail test_dialer_airplane_mode Bug 978031 is fixed
2014-03-11 10:55:23 -07:00
B2G Bumper Bot
88c04338f6 Bumping manifests a=b2g-bump 2014-03-11 09:46:06 -07:00
B2G Bumper Bot
34ca0abb82 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/93de9c5bcb90
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #16992 from etiennesegonzac/bug-980984-incoming-alert-from-system"

This reverts commit 88677ea30dff41d6dc404ab95285d318accdd738, reversing
changes made to 6826cb8e2589651fbe3ec15b4fa9cb9a372de4cf.
2014-03-11 09:40:24 -07:00
B2G Bumper Bot
bfc2efa6d3 Bumping manifests a=b2g-bump 2014-03-11 09:31:19 -07:00
B2G Bumper Bot
05ef45bcd5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f9350e0a6c86
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Merge pull request #16910 from gtorodelvalle/contacts-bug-972600-add-contact-after-merging

Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen (r=arcturus)

========

https://hg.mozilla.org/integration/gaia-central/rev/062d14925bfc
Author: Germán Toro del Valle <gtorodelvalle@gmail.com>
Desc: Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen
2014-03-11 09:25:22 -07:00
B2G Bumper Bot
40276fcd0c Bumping manifests a=b2g-bump 2014-03-11 09:16:58 -07:00
B2G Bumper Bot
311068a1a6 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5f23f25eb8a0
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17080 from chirarobert/skip_clock_app

Bug 982134 - Skip test_clock_set_alarm.py with Bug 982128

========

https://hg.mozilla.org/integration/gaia-central/rev/a487a8035353
Author: chirarobert <robert.chira@softvision.ro>
Desc: Bug 982134 - Skip test_clock_set_alarm.py with Bug 982128

========

https://hg.mozilla.org/integration/gaia-central/rev/affea58483ac
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #17076 from zacc/bug_982048_xfail

Bug 982048 - Xfail test_email_keyboard.py with bug 982113

========

https://hg.mozilla.org/integration/gaia-central/rev/515d9d178cf5
Author: zac <zac@zac-ThinkPad-X1-Carbon.(none)>
Desc: Bug 982048 - Xfail test_email_keyboard.py with bug 982113
2014-03-11 09:15:28 -07:00
B2G Bumper Bot
6ff3aaf719 Bumping manifests a=b2g-bump 2014-03-11 09:01:47 -07:00
B2G Bumper Bot
c4e4fed8be Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8dd1d2267841
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17001 from vingtetun/bug981277

Bug981277

========

https://hg.mozilla.org/integration/gaia-central/rev/d9d417e6b371
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981277 - Remove a sync reflow when using the cards view. r=etienne
2014-03-11 09:00:24 -07:00
B2G Bumper Bot
0145586323 Bumping manifests a=b2g-bump 2014-03-11 08:06:02 -07:00
B2G Bumper Bot
502b6aa8aa Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ea76d4fe9662
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #17027 from wilsonpage/bug/980877

Bug 980877 - Directly deleting picture taken does not work

========

https://hg.mozilla.org/integration/gaia-central/rev/061ea27f35af
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 980877 - Directly deleting picture taken does not work
2014-03-11 08:00:24 -07:00
B2G Bumper Bot
9957fd6ca0 Bumping manifests a=b2g-bump 2014-03-11 07:51:04 -07:00
B2G Bumper Bot
032301819b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d25390120160
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Merge pull request #17004 from EverythingMe/968918-revert-collection-icon

Bug 968918 - [B2G][Everything.me][Smart Collections] Revert to Default I...

========

https://hg.mozilla.org/integration/gaia-central/rev/76fd2efb6085
Author: Amir Nissim <amirnissim@gmail.com>
Desc: Bug 968918 - [B2G][Everything.me][Smart Collections] Revert to Default Icon [r=ranbena]
2014-03-11 07:45:26 -07:00
B2G Bumper Bot
83e8a13d7d Bumping manifests a=b2g-bump 2014-03-11 07:26:10 -07:00
B2G Bumper Bot
2a8e1dcc07 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/119485d3bc4b
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #16992 from etiennesegonzac/bug-980984-incoming-alert-from-system

Bug 980984 - Alert the user of an incoming from the system app to improve performance.
r=alive, rik

========

https://hg.mozilla.org/integration/gaia-central/rev/3d88afa29e3d
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 980984 - Alert the user of an incoming from the system app to improve performance.
r=alive, rik
2014-03-11 07:20:42 -07:00
B2G Bumper Bot
37a6fa7edf Bumping manifests a=b2g-bump 2014-03-11 06:46:13 -07:00
B2G Bumper Bot
d05817eebb Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7086fc75af7c
Author: Ben Kelly <ben@wanderview.com>
Desc: Revert "Merge pull request #15774 from wanderview/opus-json"

This reverts commit 6f968274d05ba8cf30b8b9c45b50b3f2ca220af7, reversing
changes made to 09ae464cb04f056aaf8272636a9d4f51f5f9a395.

Conflicts:
	apps/communications/ftu/test/unit/resources/customization.json
2014-03-11 06:40:25 -07:00
B2G Bumper Bot
26c604fa42 Bumping manifests a=b2g-bump 2014-03-11 06:21:04 -07:00
B2G Bumper Bot
b1760c542d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5e4fffbaee8e
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #16701 from zacc/bug_977046

Bug 977046 - On device testing, cleanup cache and local webapps between ...

========

https://hg.mozilla.org/integration/gaia-central/rev/bddcb4867d40
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 977046 - On device testing, cleanup cache and local webapps between b2g restart
2014-03-11 06:15:27 -07:00
B2G Bumper Bot
4079f7c875 Bumping manifests a=b2g-bump 2014-03-11 05:51:46 -07:00
B2G Bumper Bot
781cd12612 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2b8576720f96
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17038 from flodolo/bug975637_ftuselection

Bug 980456 - [B2G][FTE][Date & Time] Continent and city selections aren't displayed highlighted

========

https://hg.mozilla.org/integration/gaia-central/rev/4133291d60c4
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 980456 - [B2G][FTE][Date & Time] Continent and city selections aren't displayed highlighted

========

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

Bug 942573 - [Settings] Feedback: improve "Thank you" message

========

https://hg.mozilla.org/integration/gaia-central/rev/eb19597cd07c
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 942573 - [Settings] Feedback: improve wording when feedback is complete

Updated string from :matej
2014-03-11 05:50:23 -07:00
B2G Bumper Bot
62ed8e509d Bumping manifests a=b2g-bump 2014-03-11 04:16:23 -07:00
B2G Bumper Bot
25361fa082 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7319f9447565
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17007 from vingtetun/bug981440

Bug 981440 - Add a CSS linter to the build system. r=ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/0d2cd9e2d98c
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981440 - Add a CSS linter to the build system. r=ochameau
2014-03-11 04:10:23 -07:00