Commit Graph

199664 Commits

Author SHA1 Message Date
Ed Morley
88acc3bbf6 Merge mozilla-central and fx-team 2014-08-15 17:37:16 +01:00
Ed Morley
451be40554 Merge mozilla-central and b2g-inbound 2014-08-15 17:35:28 +01:00
B2G Bumper Bot
221867bc1a Bumping manifests a=b2g-bump 2014-08-15 09:26:50 -07:00
Ed Morley
3075128fec Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-15 17:08:21 +01:00
Ed Morley
000d251175 Merge latest green b2g-inbound changeset and mozilla-central; a=merge 2014-08-15 16:54:17 +01:00
B2G Bumper Bot
e56260a0a0 Bumping manifests a=b2g-bump 2014-08-15 08:36:55 -07:00
B2G Bumper Bot
6390eb7030 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/220c395b5767
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22928 from KevinGrandon/bug_1047645_missed_transitions_take_2

Bug 1047645 - Use manual timeout to guard _closed event from not firing

========

https://hg.mozilla.org/integration/gaia-central/rev/7068d0898564
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive
2014-08-15 08:30:24 -07:00
B2G Bumper Bot
33ab11d5ed Bumping manifests a=b2g-bump 2014-08-15 08:21:26 -07:00
B2G Bumper Bot
89779becd1 Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fa98ec6a7a04
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #22849 from 6a68/bug-1041034-email-input-obscured

Bug 1041034 - Remove FF logo from FxA to ensure email input is not obscu...

========

https://hg.mozilla.org/integration/gaia-central/rev/70751d06d8ba
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 1041034 - Hide FF logo when FxA email input is focused. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/ce530d50c3df
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #22851 from 6a68/bug-1048994-fxa-tospp-l10n-back-button

Bug 1048994 - Properly render tos/pp in v2.0 after hitting 'back' button...

========

https://hg.mozilla.org/integration/gaia-central/rev/22700243c361
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 1048994 - Properly render tos/pp in v2.0 after hitting 'back' button in FxA flow. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/40629bda6e9e
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 1046602 - Make the browser accept rtsp:// URLs r=benfrancis
2014-08-15 08:15:30 -07:00
B2G Bumper Bot
efca9bbd06 Bumping manifests a=b2g-bump 2014-08-15 05:41:16 -07:00
B2G Bumper Bot
10fbcc3d55 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/87505dbb861f
Author: Ed Morley <emorley@mozilla.com>
Desc: Revert "Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive" for JS exceptions

This reverts commit e13cc05b6d615664d769e55b60754480848d076b.
2014-08-15 05:35:30 -07:00
Hannes Verschore
8c1cd0bd8e Backout changeset c01dea53dd60, r=faulty 2014-08-15 14:29:47 +02:00
B2G Bumper Bot
47864b1148 Bumping manifests a=b2g-bump 2014-08-15 05:26:16 -07:00
B2G Bumper Bot
c16f34a27f Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7e70d8cbb8b0
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22925 from pivanov/bug-1053418

Bug 1053418 - typos in shared/style/icons/icons.html and shared/style/icons/selection.json

========

https://hg.mozilla.org/integration/gaia-central/rev/cb72f27db413
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1053418 - typos in shared/style/icons/icons.html and shared/style/icons/selection.json r=pivanov
2014-08-15 05:20:31 -07:00
Jan de Mooij
bc4a8d8b4e Bug 1046585 part 5 - Stop using WTF_* defines. r=sunfish 2014-08-15 14:01:10 +02:00
B2G Bumper Bot
4c589729ea Bumping manifests a=b2g-bump 2014-08-15 04:56:14 -07:00
B2G Bumper Bot
52460d3504 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/18c3b948728e
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #22914 from pivanov/bug-1035680

Bug 1035680 - [FTU] - check missing images

========

https://hg.mozilla.org/integration/gaia-central/rev/fb881bfc2318
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1035680 - [FTU] - check missing images
2014-08-15 04:50:27 -07:00
Thomas Zimmermann
6d48625e03 Bug 1050126: Convert Bluedroid status codes and error handlers (under bluetooth2/), r=btian
This patch converts Bluedroid status codes in Gecko to the
backend-neutral data type |BluetoothStatus|. All error handlers
have been adapted. The Bluedroid type |bt_status_t| only remains
in |BluetoothInterface|.
2014-08-15 13:41:19 +02:00
Thomas Zimmermann
2df1175640 Bug 1050126: Convert Bluetooth AVRCP data types in |BluetoothAvrcpInterface| (under bluetooth2/), r=btian
With this patch |BluetoothAvrcpInterface| is responsible for converting all
Bluetooth data types to Bluedroid types. All callers have been adapted.
2014-08-15 13:41:19 +02:00
Thomas Zimmermann
f5815c691d Bug 1050126: Convert Bluetooth A2DP data types in |BluetoothA2dpInterface| (under bluetooth2/), r=btian
With this patch |BluetoothA2dpInterface| is responsible for converting all
Bluetooth data types to Bluedroid types. All callers have been adapted.
2014-08-15 13:41:19 +02:00
Thomas Zimmermann
95f487bc6c Bug 1050126: Convert Bluetooth Handsfree data types in |BluetoothHandsfreeInterface| (under bluetooth2/), r=btian
With this patch |BluetoothHandsfreeInterface| is responsible for converting all
Bluetooth data types to Bluedroid types. All callers have been adapted.
2014-08-15 13:41:19 +02:00
Thomas Zimmermann
5318420588 Bug 1050126: Convert Bluetooth Socket data types in |BluetoothSocketInterface| (under bluetooth2/), r=btian
With this patch |BluetoothSocketInterface| is responsible for converting all
Bluetooth data types to Bluedroid types. All callers have been adapted.
2014-08-15 13:41:18 +02:00
Thomas Zimmermann
b39228ca25 Bug 1050126: Convert Bluetooth data types in |BluetoothInterface| (under bluetooth2/), r=btian
With this patch, |BluetoothInterface| is responsible for converting
all Bluetooth data types to Bluedroid types. All callers have been
adapted.
2014-08-15 13:41:18 +02:00
B2G Bumper Bot
b903832e36 Bumping manifests a=b2g-bump 2014-08-15 04:41:15 -07:00
B2G Bumper Bot
173a371773 Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3f84cc0571ef
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Merge pull request #22606 from allstarschh/Bug1046554

Bug1046554 - B2G NFC: pass NFCPeerEvent in onpeerready. r=johu, dkuo, punam, francisco, daleharvey, alive

========

https://hg.mozilla.org/integration/gaia-central/rev/75f2f2ebac71
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 1046554 - Part 6: System app change

========

https://hg.mozilla.org/integration/gaia-central/rev/9563d4aceaba
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 1046554 - Part 5: Contacts app change.

========

https://hg.mozilla.org/integration/gaia-central/rev/93bc1d924ddd
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 1046554 - Part 4: Browser app change

========

https://hg.mozilla.org/integration/gaia-central/rev/2f6e90a41960
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 1046554 - Part 3: Music app change

========

https://hg.mozilla.org/integration/gaia-central/rev/2a3c24e45ba5
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 1046554 - Part 2: Video app change.

========

https://hg.mozilla.org/integration/gaia-central/rev/8008f4f3fb20
Author: Yoshi Huang <allstars.chh@mozilla.com>
Desc: Bug 1046554 - Part 1: Gallery change.
2014-08-15 04:35:28 -07:00
B2G Bumper Bot
dad5040554 Bumping manifests a=b2g-bump 2014-08-15 04:11:50 -07:00
B2G Bumper Bot
eefee0d0e6 Bumping manifests a=b2g-bump 2014-08-15 03:51:54 -07:00
B2G Bumper Bot
2595bea662 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

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

Bug 1053936 - Add hit states to browser chrome buttons r=cwiiis

========

https://hg.mozilla.org/integration/gaia-central/rev/66fea35fe3d8
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 1053936 - Add hit states to browser chrome buttons

========

https://hg.mozilla.org/integration/gaia-central/rev/83cb89331d8f
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #22633 from wilsonpage/1015294

Bug 1015294 - [Homescreen] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/04ed5a73b1cc
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1015294 - [Homescreen] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/b0b25be8f3e4
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #22636 from wilsonpage/1050404

Bug 1050404 - [Collections] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/9031364b6a60
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1050404 - [Collections] Update to use gaia-header
2014-08-15 03:50:28 -07:00
B2G Bumper Bot
6953cef98e Bumping manifests a=b2g-bump 2014-08-15 02:48:40 -07:00
B2G Bumper Bot
83ac7bdd7e Bumping gaia.json for 8 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5569b3caa439
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #22562 from gasolin/issue-818624

Bug 818624 - Link to about:credits on Firefox OS, r=eragon

========

https://hg.mozilla.org/integration/gaia-central/rev/0f6890f78def
Author: gasolin <gasolin@gmail.com>
Desc: Bug 818624 - Link to about:credits on Firefox OS

========

https://hg.mozilla.org/integration/gaia-central/rev/fb0433a91f59
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #22906 from steveck-chung/1051792-cmas-first-ui

Bug 1051792 - CMAS First UI implementation r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/4d7f38e5d1d1
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1051792 - CMAS First UI implementation r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/b103971859b6
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #19705 from yor-mozilla-com/gaia-header-bluetooth

Bug 1016818 - [Bluetooth] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/e3ad8b112e6f
Author: Yan Or <yor@mozilla.com>
Desc: Bug 1016818 - [Bluetooth] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/8b93611d9566
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #19659 from yor-mozilla-com/gaia-header-clock

Bug 1015293 - [Clock] Update to use gaia-header

========

https://hg.mozilla.org/integration/gaia-central/rev/536e27b426e2
Author: Yan Or <yor@mozilla.com>
Desc: Bug 1015293 - [Clock] Update to use gaia-header
2014-08-15 02:48:29 -07:00
Paolo Amadini
78b764b146 Bug 1053357 - Search terms with multiple spaces are displayed with plus signs in the location bar. r=gavin 2014-08-15 10:19:31 +01:00
Wes Johnston
072c4af638 Bug 732169 - Associate prompts with tabs. r=lucasr 2014-08-14 23:17:04 -07:00
Wes Johnston
0395008ae9 Bug 732169 - Refactor message processing prompts. r=lucasr 2014-08-14 23:17:02 -07:00
Ryan VanderMeulen
1559619ad7 Merge inbound to m-c. a=merge 2014-08-14 22:15:29 -04:00
Ryan VanderMeulen
810f213425 Merge fx-team to m-c. a=merge 2014-08-14 22:10:07 -04:00
Yoshi Huang
5abc967016 Bug 1053116 - Part 2: add error code in NfcGonkMessages.h. r=dimi 2014-08-15 10:04:51 +08:00
Ryan VanderMeulen
cf0ad6a55d Merge b2g-inbound to m-c. a=merge 2014-08-14 22:03:46 -04:00
Yoshi Huang
5806e79929 Bug 1053116 - Part 1: update error code in nfc_consts.js. r=dimi 2014-08-15 10:02:01 +08:00
B2G Bumper Bot
c240a0cdc8 Bumping manifests a=b2g-bump 2014-08-15 02:31:16 -07:00
B2G Bumper Bot
5bf037faa9 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d307fbe7da88
Author: You-Sheng Yang <vicamo@gmail.com>
Desc: Merge pull request #22865 from vicamo/bugzilla/878533/MozSmsFilter-webidl

Bug 878533 - replace MozSmsFilter with plain js object. r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/6ca936f864c9
Author: You-Sheng Yang <vicamo@gmail.com>
Desc: Bug 878533 - replace MozSmsFilter with plain js object. r=schung
2014-08-15 02:25:30 -07:00
B2G Bumper Bot
6cb88571b1 Bumping manifests a=b2g-bump 2014-08-15 01:31:18 -07:00
B2G Bumper Bot
61f73c7333 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0539edb9187e
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #22909 from gasolin/issue-1054132

Bug 1054132 - [Settings] simplify hour12 detection way, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/2659a7f67799
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1054132 - [Settings] simplify hour12 detection way
2014-08-15 01:25:29 -07:00
B2G Bumper Bot
adc8b02832 Bumping manifests a=b2g-bump 2014-08-15 01:01:56 -07:00
B2G Bumper Bot
969abfb25a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5ca5ac2fe9b2
Author: Greg Weng <snowmantw@gmail.com>
Desc: Merge pull request #22870 from snowmantw/issue1035754

Bug 1035754 - [Gaia][lock screen] support 24 hour time format

========

https://hg.mozilla.org/integration/gaia-central/rev/9b0e6e3bdd6f
Author: Greg Weng <snowmantw@gmail.com>
Desc: Bug 1035754 - [Gaia][lock screen] support 24 hour time format
2014-08-15 01:00:29 -07:00
B2G Bumper Bot
1f7271b28a Bumping manifests a=b2g-bump 2014-08-14 23:36:15 -07:00
B2G Bumper Bot
1f508accd3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/af5d777fc37a
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #22907 from ian-liu/settings/bug1054122_remove_redundant_BT_code_in_settings_app_since_rebase_missed

Bug 1054122 - There are still some redundant BT code in settings app, r=arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/1ca3485118d7
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 1054122 - There are still some redundant BT code in settings app
2014-08-14 23:30:29 -07:00
B2G Bumper Bot
7a6dedb946 Bumping manifests a=b2g-bump 2014-08-14 23:21:23 -07:00
B2G Bumper Bot
501529c942 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/80345329b7a2
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #22873 from gasolin/issue-1001312

Bug 1001312 - [meta] [Settings] Device Information UX update, r=eragon

========

https://hg.mozilla.org/integration/gaia-central/rev/550ac8020b0f
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1001312 - [meta] [Settings] Device Information UX update
2014-08-14 23:15:35 -07:00
B2G Bumper Bot
5a87d6680c Bumping manifests a=b2g-bump 2014-08-14 22:26:21 -07:00
B2G Bumper Bot
f17d9431cd Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1047645 - Use manual timeout to guard _closed event from not firing

========

https://hg.mozilla.org/integration/gaia-central/rev/ff972ac0c0c0
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1047645 - Use manual timeout to guard _closed event from not firing r=alive
2014-08-14 22:20:34 -07:00