Commit Graph

19713 Commits

Author SHA1 Message Date
Wes Kocher
97b5cefe51 Merge b2g-inbound to m-c a=merge 2015-01-22 14:43:08 -08:00
Wes Kocher
4dd78e1a0d Backed out changeset 39c78d4281d5 (bug 1101331) for intermittently breaking gaia-ui tests on OSX on a CLOSED TREE 2015-01-22 12:23:12 -08:00
B2G Bumper Bot
16a43f3e3b Bumping manifests a=b2g-bump 2015-01-22 10:12:14 -08:00
B2G Bumper Bot
a231777ea7 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 1119226 - [Smart Collection] Remove option for custom smart collection

========

https://hg.mozilla.org/integration/gaia-central/rev/f1c77b526fd1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1119226 - [Smart Collection] Remove option for custom smart collection

========

https://hg.mozilla.org/integration/gaia-central/rev/fcebb59ce804
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #27392 from gaye/bug-1118853

Bug 1118853 - Clean up calendar tablist underline r=millermedeiros

========

https://hg.mozilla.org/integration/gaia-central/rev/eed54c459dfb
Author: gaye <gaye@mozilla.com>
Desc: Bug 1118853 - Clean up calendar tablist underline r=millermedeiros
2015-01-22 10:10:35 -08:00
B2G Bumper Bot
0d403a58f1 Bumping manifests a=b2g-bump 2015-01-22 09:31:33 -08:00
B2G Bumper Bot
629a4f069d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7e608ce697c2
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #27598 from bebef1987/marionette_update

Bug 1124730 - Update marionette version to 0.8.7

========

https://hg.mozilla.org/integration/gaia-central/rev/bf870fa4d4ec
Author: bebef1987 <florin.strugariu@softvision.ro>
Desc: Bug 1124730 - Update marionette version to 0.8.7
2015-01-22 09:29:54 -08:00
B2G Bumper Bot
e55bc2d6a9 Bumping manifests a=b2g-bump 2015-01-22 09:10:32 -08:00
B2G Bumper Bot
4fb623711e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/070322425356
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #27593 from mwargers/cost_control2

Bug 1115180 - Get test_cost_control_data_alert_mobile.py re-enabled

========

https://hg.mozilla.org/integration/gaia-central/rev/a48948b7c85b
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1115180 - Get test_cost_control_data_alert_mobile.py re-enabled
2015-01-22 09:08:34 -08:00
B2G Bumper Bot
41271cf64c Bumping manifests a=b2g-bump 2015-01-22 07:31:37 -08:00
B2G Bumper Bot
c081c54c8d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f60a3df2fadb
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #26492 from ADLR-es/highlight-without-regexp

Bug 1104139 - [Contacts] Refactor highlight so we can avoid using regexp

========

https://hg.mozilla.org/integration/gaia-central/rev/4b9c3a9a5909
Author: Adrián de la Rosa <hola@adlr.es>
Desc: Bug 1104139 - [Contacts] Refactor highlight so we can avoid using regexp
2015-01-22 07:29:57 -08:00
Kai-Zhen Li
53a8d2e65f Bug 1107747 - Add in-tree files for dolphin-512 on master. r=nthomas 2015-01-22 23:21:58 +08:00
B2G Bumper Bot
ca3db92e4d Bumping manifests a=b2g-bump 2015-01-22 06:37:03 -08:00
B2G Bumper Bot
e20377cc84 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/61b24fd54306
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #27394 from azasypkin/bug-988269-remove-is-locked

Bug 988269 - [Messages][Refactoring] Investigate whether ActivityHandler.isLocked is still required (follow up from bug 936729). r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/f4981f53d12c
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 988269 - [Messages][Refactoring] Investigate whether ActivityHandler.isLocked is still required (follow up from bug 936729). r=schung
2015-01-22 06:35:03 -08:00
B2G Bumper Bot
180270fbfa Bumping manifests a=b2g-bump 2015-01-22 05:56:37 -08:00
B2G Bumper Bot
d76f497feb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c281e8f5d24b
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #27382 from viorelaioia/disable_test_on_mac

Bug 1102931 - Disable test_ftu_with_tour.py on mac

========

https://hg.mozilla.org/integration/gaia-central/rev/1243de832896
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1102931 - Disable test_ftu_with_tour.py on mac
2015-01-22 05:54:59 -08:00
Carsten "Tomcat" Book
ce135ea776 Merge mozilla-central to b2g-inbound 2015-01-22 14:41:48 +01:00
Carsten "Tomcat" Book
3f03122753 merge fx-team to mozilla-central a=merge 2015-01-22 14:02:40 +01:00
B2G Bumper Bot
d410a5c5ef Bumping manifests a=b2g-bump 2015-01-22 04:51:35 -08:00
B2G Bumper Bot
59b32cfbb1 Bumping manifests a=b2g-bump 2015-01-21 22:21:21 -08:00
B2G Bumper Bot
3edaa7b0db Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1119024 - Use number instead of string r=eragonj, drs

========

https://hg.mozilla.org/integration/gaia-central/rev/b861c6bc167f
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1119024 - Use number instead of string
2015-01-21 22:19:43 -08:00
B2G Bumper Bot
734eadfe86 Bumping manifests a=b2g-bump 2015-01-22 04:31:55 -08:00
B2G Bumper Bot
cd82a28423 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3f869bcf3bbf
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #27127 from eeejay/bug-1068983

Bug 1068983 - Hide adjacent frames from screen reader.

========

https://hg.mozilla.org/integration/gaia-central/rev/f23c17270fce
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1068983 - Hide adjacent frames from screen reader.
2015-01-22 04:30:18 -08:00
B2G Bumper Bot
fbc8a4b1f3 Bumping manifests a=b2g-bump 2015-01-22 03:47:03 -08:00
B2G Bumper Bot
20e58bc061 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/26ef2cc0e92d
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 829820 - merge pull request #22957 from kumarrishav:Bug-829820 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/518ce5349878
Author: kumarrishav <rishav006@gmail.com>
Desc: Bug 829820 - Ability to mark selected SMS thread as Read/Unread. r=schung
2015-01-22 03:45:21 -08:00
B2G Bumper Bot
2098468ab7 Bumping manifests a=b2g-bump 2015-01-22 03:06:24 -08:00
B2G Bumper Bot
8fc58db070 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8c85cfc47e18
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #27277 from stasm/1115798-langpacks-link

Bug 1115798 - Provide a link to Langpacks from Settings. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/2a231e009a2e
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1115798 - Provide a link to Langpacks from Settings. r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/6ee1bd6ad93c
Author: Salvador de la Puente González <neo.salvador@gmail.com>
Desc: Merge pull request #27572 from lodr/bug-1089580-avoiding-system-details

Bug 1089580 - [Usage][Cost Control] Noticeable difference on amount of traffic on the system app, between the data usage list per app and the app detail view.
r=mai

========

https://hg.mozilla.org/integration/gaia-central/rev/4b87be21ebc7
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1089580 - [Usage][Cost Control] Noticeable difference on amount of traffic on the system app, between the data usage list per app and the app detail view.

========

https://hg.mozilla.org/integration/gaia-central/rev/6e211fa2344d
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1124086 - merge pull request #27556 from julienw:add-diagnostic-message to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/0e4f7a6f0667
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1124086 - Add a user friendly message when downloading node_modules r=ricky
2015-01-22 03:04:46 -08:00
B2G Bumper Bot
b81cd97e29 Bumping manifests a=b2g-bump 2015-01-22 02:27:32 -08:00
B2G Bumper Bot
cbbc26328e Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f024f9f8b881
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1121188 - merge pull request #27417 from albertopq:1121188-tap-call-banner to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/fe6926650f82
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1121188 - Allowing pointer events on the attention screen chrome

========

https://hg.mozilla.org/integration/gaia-central/rev/8d2134a6e392
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #27524 from luke-chang/1123542_stingray_remove_unused_context_menu

Bug 1123542 - [Stingray] Remove unused context menu item in app deck, r=rexboy

========

https://hg.mozilla.org/integration/gaia-central/rev/a1373134ee9c
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1123542 - [Stingray] Remove unused context menu item in app deck
2015-01-22 02:25:23 -08:00
B2G Bumper Bot
ba806e5cc8 Bumping manifests a=b2g-bump 2015-01-22 02:01:40 -08:00
B2G Bumper Bot
7f5518a0ce Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d5c43ec8e523
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Revert "Bug 1123184 - Enable l10n args format in browser context menu"

This reverts commit ee232275266996cf61637ec530983b00457a4349.
2015-01-22 01:59:51 -08:00
B2G Bumper Bot
b0d9382d22 Bumping manifests a=b2g-bump 2015-01-22 01:41:23 -08:00
B2G Bumper Bot
cccc1531fe Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/abffc7096710
Author: Salvador de la Puente González <neo.salvador@gmail.com>
Desc: Merge pull request #27499 from lodr/bug-1122512-draft-discarded

Bug 1122512 - [Messages][Drafts] Unsaved draft is silently discarded when user goes to report or participants panel
r=:azasypkin

========

https://hg.mozilla.org/integration/gaia-central/rev/6cef9340c22c
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1122512 - [Messages][Drafts] Unsaved draft is silently discarded when user goes to report or participants panel
2015-01-22 01:39:45 -08:00
B2G Bumper Bot
de1495aaa8 Bumping manifests a=b2g-bump 2015-01-21 20:21:58 -08:00
B2G Bumper Bot
91ac0d7498 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1d51fd305973
Author: Tzu-Lin Huang <dwi019@gmail.com>
Desc: Merge pull request #27521 from dwi2/bug1123301

Bug 1123301 - [Stingray] move default-cards.json to tv_shared/ and copy it to app folders at build-time

========

https://hg.mozilla.org/integration/gaia-central/rev/4028f48ceb83
Author: Tzu-Lin Huang <tzhuang@mozilla.com>
Desc: Bug 1123301 - [Stingray] move default-cards.json to tv_shared/ and copy it to app folders at build-time

========

https://hg.mozilla.org/integration/gaia-central/rev/df2735ca2522
Author: Sherman Chen <shamenchens@users.noreply.github.com>
Desc: Merge pull request #27523 from shamenchens/Bug1123184-ContextMenuL10nArgs

Bug 1123184 - Enable l10n args format in browser context menu, r=gandalf

========

https://hg.mozilla.org/integration/gaia-central/rev/411a39df249b
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 1123184 - Enable l10n args format in browser context menu
2015-01-21 20:20:19 -08:00
B2G Bumper Bot
6448e504fa Bumping manifests a=b2g-bump 2015-01-21 19:36:22 -08:00
B2G Bumper Bot
df2e6b0883 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d5148663f0f7
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1115083 - merge pull request #27577 from millermedeiros:1115083-intermittent-day-observer-test to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/3502ab1d2f50
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1115083 - Intermittent day_observer_test.js | day_observer cached #on: yesterday + persist + remove + visibility
2015-01-21 19:34:45 -08:00
B2G Bumper Bot
0f2f33fce5 Bumping manifests a=b2g-bump 2015-01-21 17:36:22 -08:00
B2G Bumper Bot
2bd34b4f89 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b395d5d859c6
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Merge pull request #27562 from asutherland/email-coremail-sent

Bug 1055445 - CoreMail servers auto-file in sent, like gmail. r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/a3cefd5b7be4
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1055445 - CoreMail servers auto-file in sent, like gmail. r=asuth

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/361
2015-01-21 17:34:43 -08:00
B2G Bumper Bot
689441605c Bumping manifests a=b2g-bump 2015-01-21 13:51:28 -08:00
B2G Bumper Bot
cb34d01c57 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/833ac164319c
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #27459 from stasm/1115797-langpacks-extend-list

Bug 1115797 - Extend languages list in Settings with Langpack provided locales. r=eragonj r=kgrandon r=gandalf

========

https://hg.mozilla.org/integration/gaia-central/rev/c8bf9811dde9
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1115797 - Extend languages list in Settings with Langpack provided locales. r=eragonj r=kgrandon r=gandalf
2015-01-21 13:49:46 -08:00
B2G Bumper Bot
55f03ab03a Bumping manifests a=b2g-bump 2015-01-21 11:11:22 -08:00
B2G Bumper Bot
363c92592e Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3033c2214b58
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #27541 from zbraniecki/1124013-upgrade-sinon-to-1.12.2

Bug 1124013 - Upgrade sinon to 1.12.2. r=felash

========

https://hg.mozilla.org/integration/gaia-central/rev/06fb8f5c6c02
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1124013 - Upgrade sinon to 1.12.2

========

https://hg.mozilla.org/integration/gaia-central/rev/a71aedaddda3
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27567 from Cwiiis/bug1120718-hover-over-top-with-collection

Bug 1120718 - Fix creating new group at top with collection as first icon. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/50e95afe93ba
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1120718 - Test that creating groups above collections works. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/6b650dfa7fcb
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1120718 - Fix creating new group at top with collection as first icon. r=kgrandon

If the first icon in a grid was a collection, dragging an icon to the top
of the grid would drop it into that collection instead of creating a new
group.
2015-01-21 11:09:45 -08:00
B2G Bumper Bot
bf45c66606 Bumping manifests a=b2g-bump 2015-01-21 10:31:54 -08:00
B2G Bumper Bot
ec91af0d3d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c1a0215e7a28
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27540 from martasect/bug_1120726

Bug 1120726 - do not change the setting of notifications r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/586a3b25453e
Author: Marta Piekarska <marta@sec.t-labs.tu-berlin.de>
Desc: Bug 1120726 - do not change the setting of notifications + autolander
2015-01-21 10:30:17 -08:00
Wes Kocher
6b6ca4243b Merge m-c to fx-team a=merge 2015-01-21 16:28:27 -08:00
B2G Bumper Bot
efb985a5ec Bumping manifests a=b2g-bump 2015-01-21 09:47:20 -08:00
B2G Bumper Bot
564261d6ea Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b777991859f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27571 from Cwiiis/bug1121865-blank-space-dont-dismiss-edit

Bug 1121865 - Don't dismiss edit mode when tapping a blank space. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/5e359963725f
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1121865 - Don't dismiss edit mode when tapping a blank space. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/90b237151499
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27569 from Cwiiis/bug1121149-homescreen-margin-bottom

Bug 1121149 - Add a margin to the bottom of the homescreen. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/5992d8dbb30e
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1121149 - Add a margin to the bottom of the homescreen. r=kgrandon
2015-01-21 09:45:35 -08:00
B2G Bumper Bot
15a3c00ffb Bumping manifests a=b2g-bump 2015-01-21 08:41:57 -08:00
B2G Bumper Bot
97bf2dc31b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/80261ef6903c
Author: Johan Lorenzo <jlorenzo@mozilla.com>
Desc: Merge pull request #27533 from bebef1987/fix_dialer

Bug 1110169 - Intermittent test_dialer_add_contact.py

========

https://hg.mozilla.org/integration/gaia-central/rev/18b986e1d63d
Author: bebef1987 <florin.strugariu@softvision.ro>
Desc: Bug 1110169 - Intermittent test_dialer_add_contact.py
2015-01-21 08:40:20 -08:00
B2G Bumper Bot
49060304a6 Bumping manifests a=b2g-bump 2015-01-21 07:16:28 -08:00