Commit Graph

404001 Commits

Author SHA1 Message Date
Yoshi Huang
a04b632dab Bug 1126653 - don't send nfc-manager-tech-lost if the foreground has received ontag/peerfound. r=dimi 2015-01-28 10:48:17 +08:00
Jamin Liu
21112546e2 Bug 1121404 - Cache addresses of bonded devices and notify adapter properly. r=btian 2015-01-29 15:49:53 +08:00
Yoshi Huang
867b189d7a Bug 1120315 - Part 4: update comments in MozNFC.webidl. r=smaug
From 22a5126696b96b9904c0c10258dcbe346d2f582a Mon Sep 17 00:00:00 2001
---
 dom/webidl/MozNFC.webidl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
2015-01-28 11:25:35 +08:00
Yoshi Huang
346e483a75 Bug 1120315 - Part 3: notify tag/peerlost when lost focus. r=dimi
From 14b18a83041d65c0cf111d20279668e665dd0d56 Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     |  3 +++
 dom/nfc/gonk/Nfc.js             | 24 ++++++++++++++++++++++--
 dom/nfc/gonk/nfc_consts.js      |  1 +
 dom/nfc/nsINfcContentHelper.idl | 10 +++++++++-
 dom/nfc/nsNfc.js                | 16 ++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)
2015-01-26 18:58:52 +08:00
Yoshi Huang
01ea1ea1be Bug 1120315 - Part 2: s/change/changed/. r=dimi
From 86ab7fbe1d409c9f8f7082499179e0632101a61b Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js     | 4 ++--
 dom/nfc/gonk/Nfc.js             | 6 +++---
 dom/nfc/gonk/nfc_consts.js      | 2 +-
 dom/nfc/nsINfcContentHelper.idl | 4 ++--
 dom/nfc/nsNfc.js                | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
2015-01-26 18:13:36 +08:00
Yoshi Huang
8fc659bf30 Bug 1120315 - Part 1: revert Bug 1082445. r=dimi 2015-01-26 17:27:57 +08:00
Kai-Zhen Li
5b167dcbab Bug 1126499 - Move mp4 code into MOZ_FMP4 compile flag. r=jya 2015-01-29 14:08:58 +08:00
B2G Bumper Bot
7e79c275cd Bumping manifests a=b2g-bump 2015-01-28 22:42:02 -08:00
B2G Bumper Bot
3a23765182 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3995efa35859
Author: GaryChen, PYChen <mmm198219@gmail.com>
Desc: Merge pull request #27515 from mpizza/bug_1123164_dsds_issue

Bug 1123164 - [Settings]There is no SIM settings icons when you insert SIM2 only in Settings -> Cellular & Data. r=arthurcc.

========

https://hg.mozilla.org/integration/gaia-central/rev/09416d1e0eff
Author: GaryChen, PYChen <mmm198219@gmail.com>
Desc: Bug 1123164 - [Settings]There is no SIM settings icons when you insert SIM2 only in Settings -> Cellular & Data. r=arthurcc.
2015-01-28 22:40:24 -08:00
B2G Bumper Bot
edbf871702 Bumping manifests a=b2g-bump 2015-01-28 20:22:07 -08:00
B2G Bumper Bot
b1f61ea892 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0545d82cefea
Author: Rex KM Lee <rexboy@mozilla.com>
Desc: Merge pull request #27699 from rexboy7/1123596-notification-sender

Bug 1123608 - [Stingray][Notification] Sender App initial commit. r=dwi2

========

https://hg.mozilla.org/integration/gaia-central/rev/7f166f3260a0
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 1123608 - [Stingray][Notification] Sender App initial commit
2015-01-28 20:20:24 -08:00
B2G Bumper Bot
5070daf242 Bumping manifests a=b2g-bump 2015-01-28 19:42:09 -08:00
B2G Bumper Bot
9cb7425c29 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2b5193598776
Author: Min-Zhong "John" Lu <jlu@mozilla.com>
Desc: Merge pull request #27743 from mnjul/bug_1125753_keyboard_build_integration_fix

Bug 1125753 - Fix Gaia Keyboard Build Integration Tests by fixing "expected" data. r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/dcd1849c9992
Author: John Lu [:mnjul] <jlu@mozilla.com>
Desc: Bug 1125753 - Fix Gaia Keyboard Build Integration Tests by fixing "expected" data

- Fix "expected" dictionaries.json by amending en-Africa, wo, th layout information into the data structure.

========

https://hg.mozilla.org/integration/gaia-central/rev/d495481beda5
Author: George <georgeiscoming@gmail.com>
Desc: Merge pull request #27698 from cctuan/1119731

Bug 1119731 - gaia-build (Gb) and gaia-build-unit tests (Gbu) are marked as successful even though they contain test failures

========

https://hg.mozilla.org/integration/gaia-central/rev/1971a6b805cb
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1119731 - correct callback for Commander, r=ricky
2015-01-28 19:40:25 -08:00
John Dai
f8fc080b07 Bug 1119136 - Contacts can't be imported from some special SIM cards to device. r=echen 2015-01-22 18:20:00 +08:00
B2G Bumper Bot
50ecd701fe Bumping manifests a=b2g-bump 2015-01-28 19:17:58 -08:00
B2G Bumper Bot
9f6e9bca67 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e8dcfec00f69
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #27700 from gasolin/issue-1115187

Bug 1115187 - [RTL] Make input text align right, r=pavel

========

https://hg.mozilla.org/integration/gaia-central/rev/7f48e7dbb037
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1115187 - [RTL] Make input text align right
2015-01-28 19:15:44 -08:00
B2G Bumper Bot
bd77e546e2 Bumping manifests a=b2g-bump 2015-01-28 18:57:30 -08:00
B2G Bumper Bot
ae72c5b686 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9b944c073ebc
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #27732 from Aspirar/cdma-fix

Bug 930871 - Fix CDMA data terminology r=arthurcc

========

https://hg.mozilla.org/integration/gaia-central/rev/56c71dbd618e
Author: Lakshya Gupta <theultimateaim@gmail.com>
Desc: Bug 930871 - Fix CDMA data terminology r=arthurcc
2015-01-28 18:55:33 -08:00
Wes Kocher
0efb7c3677 Merge m-c to b2g-inbound a=merge 2015-01-28 18:43:47 -08:00
Wes Kocher
a4cef467eb Merge fx-team to m-c a=merge 2015-01-28 18:36:42 -08:00
B2G Bumper Bot
3442511e9c Bumping manifests a=b2g-bump 2015-01-28 18:32:03 -08:00
B2G Bumper Bot
7150078ab5 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1c6928393f1a
Author: EragonJ (E.J.) <eragonj@eragonj.me>
Desc: Merge pull request #27487 from EragonJ/bug-1107696

Bug 1107696 - Fix not-in-range problem in Wifi panel, r=crh0716

========

https://hg.mozilla.org/integration/gaia-central/rev/b26052d0de03
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1107696 - Fix not-in-range problem in Wifi panel, r=crh0716

Right now we can decide whether we should show not-in-range wordings for
not in hidden_network and wifi_list. And also, in hidden_network panel,
we can show some useful information on connected AP now.
2015-01-28 18:30:23 -08:00
Wes Kocher
091ae96190 Merge inbound to m-c a=merge 2015-01-28 18:10:37 -08:00
Wes Kocher
6375d46640 Backed out changeset eedc4452c4c3 (bug 1126739) for static analysis and mochitest-4 bustage on a CLOSED TREE 2015-01-28 17:41:54 -08:00
Fabrice Desré
b6a8e00e73 Bug 1126047 - Imported apps that specify an origin are not correctly installed r=marco 2015-01-28 17:24:38 -08:00
B2G Bumper Bot
73aa0bddb0 Bumping manifests a=b2g-bump 2015-01-28 17:12:01 -08:00
B2G Bumper Bot
a6f52dd9cd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1069013 - Make crop and effect buttons aria radio buttons and label ... r=pdahiya

========

https://hg.mozilla.org/integration/gaia-central/rev/fb1d3e8fe6ff
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1069013 - Make crop and effect buttons aria radio buttons and label them.
2015-01-28 17:10:23 -08:00
Wes Kocher
8ac3d662a7 Merge b2g-inbound to m-c a=merge 2015-01-28 16:44:59 -08:00
Seth Fowler
ada986b250 Bug 1126739 - Add locking to SurfaceCache entry points that bypass the public API. r=tn CLOSED TREE a=KWierso
--HG--
extra : rebase_source : 88cf49ab4ccf6949a11b78d2a3c8518a55fa852d
2015-01-28 15:46:28 -08:00
Bill McCloskey
60707d7dcf Back out 94a2a4a7c84c (bug 1075670) for breaking context menu in e10s CLOSED TREE 2015-01-28 16:12:36 -08:00
Bill McCloskey
773e64f259 Back out 47de36ef3ab4 (bug 1075670) for breaking context menu in e10s CLOSED TREE 2015-01-28 16:11:56 -08:00
B2G Bumper Bot
1538530176 Bumping manifests a=b2g-bump 2015-01-28 14:52:06 -08:00
B2G Bumper Bot
e80b79c5fd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d334f4a705a9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27750 from Cwiiis/bug1120799-collapse-on-drag-expanded-group

Bug 1120799 - Don't leave space when dragging expanded group. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/999bc7951ae0
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1120799 - Don't leave space when dragging expanded group. r=kgrandon
2015-01-28 14:50:27 -08:00
Gregory Szorc
05d1135161 Merge old head into default; a=me
With this commit, there is now only a single topological head in
mozilla-central, the head of the default branch.

This work is tracked in bug 927219.

DONTBUILD
2015-01-28 14:42:59 -08:00
Kartikaya Gupta
8d93c66cb0 Bug 1116588 - Don't optimize away opacity:0 items if we're building event regions, unless the frame also has pointer-events:none. r=tn 2015-01-28 17:42:23 -05:00
B2G Bumper Bot
b1a4f5854a Bumping manifests a=b2g-bump 2015-01-28 14:32:17 -08:00
B2G Bumper Bot
03f8a358c9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ec68d581ee89
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1126953 - merge pull request #27755 from KevinGrandon:bug_1126953_autolander_test to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/edb9ea6be9cb
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1126953 - Autolander test bug, remove strings for quick settings dialog r=kgrandon
2015-01-28 14:30:38 -08:00
Giovanny Andres Gongora Granada
1adc493a26 Bug 1126738 - Use arrow functions in browser-data-submission-info-bar.js. r=dao 2015-01-28 23:18:14 +01:00
B2G Bumper Bot
8459e5c526 Bumping manifests a=b2g-bump 2015-01-28 14:12:03 -08:00
B2G Bumper Bot
9601de543b Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/89b933ff0c62
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #27758 from lightsofapollo/bug-1127051

Bug 1127051 - Switch to docker registry a=bustage r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/436b56eccc3f
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1127051 - Switch to docker registry a=bustage r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/f9e97c5b0316
Author: tamarahills <thills@mozilla.com>
Desc: Merge pull request #27756 from tamarahills/bugfix/1102344_call_counts_incorrect

Bug 1102344 - Make Call Counts show correctly in the rtl language.

========

https://hg.mozilla.org/integration/gaia-central/rev/ac8101e84c46
Author: Tamara Hills <thills@mozilla.com>
Desc: Bug 1102344 - Make Call Counts show correctly in the rtl language.
2015-01-28 14:10:24 -08:00
Gregory Szorc
11fb5a3c05 Merge closed branch head mobile into default 2015-01-28 14:01:51 -08:00
Gregory Szorc
6cfc0a7778 Merge closed branch head GECKO20b9_2011011018_RELBRANCH into default 2015-01-28 14:01:50 -08:00
Gregory Szorc
4dd0f6f175 Merge closed branch head GECKO20b8_20101214_RELBRANCH into default 2015-01-28 14:01:50 -08:00
Gregory Szorc
eb1e1053e7 Merge closed branch head COMM2000_20101116_RELBRANCH into default 2015-01-28 14:01:49 -08:00
Gregory Szorc
99575abeeb Merge closed branch head GECKO20b7_20101104_RELBRANCH into default 2015-01-28 14:01:48 -08:00
Gregory Szorc
3ace0a0fd0 Merge closed branch head GECKO20b7pre_20101029_RELBRANCH into default 2015-01-28 14:01:47 -08:00
Gregory Szorc
deb1c093e9 Merge closed branch head GECKO20b7pre_20101006_RELBRANCH into default 2015-01-28 14:01:46 -08:00
Gregory Szorc
eaaa137924 Merge closed branch head GECKO20b7pre_20100929_RELBRANCH into default 2015-01-28 14:01:46 -08:00
Gregory Szorc
ccfbf82693 Merge closed branch head GECKO20b5_20100831_RELBRANCH into default 2015-01-28 14:01:45 -08:00
Gregory Szorc
651ec74077 Merge closed branch head GECKO20b5pre_20100820_RELBRANCH into default 2015-01-28 14:01:44 -08:00