Wes Kocher
d6129f3edf
Merge m-c to b2ginbound, a=merge
2015-06-02 18:43:50 -07:00
Wes Kocher
6cbdb228c3
Merge b2ginbound to central, a=merge
2015-06-02 18:34:21 -07:00
Wes Kocher
dd975b7704
Merge inbound to central, a=merge
2015-06-02 18:20:12 -07:00
B2G Bumper Bot
7943b007dd
Bumping manifests a=b2g-bump
2015-06-02 18:17:11 -07:00
B2G Bumper Bot
b19e334f8e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2cde57100c35
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #30376 from gaye/bug-1170120-again
Bug 1170120 - Dependencies should be declared by the package that uses them
========
https://hg.mozilla.org/integration/gaia-central/rev/6981fb5ec04d
Author: gaye <gaye@mozilla.com>
Desc: Bug 1170120 - Dependencies should be declared by the package that uses them
2015-06-02 18:15:16 -07:00
B2G Bumper Bot
f856034c6f
Bumping manifests a=b2g-bump
2015-06-02 17:03:19 -07:00
B2G Bumper Bot
eed2b507f9
Bumping manifests a=b2g-bump
2015-06-02 15:47:14 -07:00
B2G Bumper Bot
64e4005be9
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/9351ee7e1708
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #30333 from mwargers/1170006
Bug 1170006 - Intermittent failure in test_privileged_app_audio_capture_prompt.py at user_media.tap_audio1_button()
========
https://hg.mozilla.org/integration/gaia-central/rev/905a140df9ea
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1170006 - Intermittent failure in test_privileged_app_audio_capture_prompt.py at user_media.tap_audio1_button()
2015-06-02 15:45:17 -07:00
B2G Bumper Bot
c2b9ffbed8
Bumping manifests a=b2g-bump
2015-06-02 13:17:20 -07:00
B2G Bumper Bot
b4eac7a539
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d5e509fd9697
Author: gaye <gaye@mozilla.com>
Desc: Revert "Merge pull request #30367 from gaye/bug-1170120"
This reverts commit 2fbadd586461010cabc2f08191f62090172b127e, reversing
changes made to 4f23badde371569716cbc209d2227ab2006fd096.
2015-06-02 13:15:21 -07:00
Ryan VanderMeulen
e8686eca4b
Backed out changeset 5f2e8622f945 (bug 1139376) for causing frequent Win8 w-p-t timeouts.
2015-06-02 16:05:41 -04:00
Tim Taubert
77ebbff749
Bug 1170669 - Fix intermittent browser_514751.js crashes by not loading mozilla.org r=mconley
2015-06-02 21:18:31 +02:00
James Long
8e613d669a
Bug 1163540 - make sure the debugger treats XBL inline sources correctly r=Gijs
2015-06-02 15:41:09 -04:00
Sunny
9b1cf5cdc2
Bug 1107652 - Make cmd/ctrl + zoom in Scratchpad. r=past
2015-06-02 22:32:32 +03:00
Robert Strong
deec12e5fd
Bug 1168489 - Combine XPCSHELL_TESTS_MANIFESTS entries in moz.build. r=spohl
2015-06-02 12:17:45 -07:00
B2G Bumper Bot
f27fcada59
Bumping manifests a=b2g-bump
2015-06-02 11:52:26 -07:00
B2G Bumper Bot
244ac2974e
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f80611cfeb39
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30321 from KevinGrandon/bug_1169785_calendar_gaia_switch
Bug 1169785 - [Calendar] Convert switches to gaia-switch component
========
https://hg.mozilla.org/integration/gaia-central/rev/5696ea590dea
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1169785 - [Calendar] Convert switches to gaia-switch component r=mmedeiros
2015-06-02 11:50:29 -07:00
B2G Bumper Bot
8b59d599ad
Bumping manifests a=b2g-bump
2015-06-02 11:37:23 -07:00
B2G Bumper Bot
81222bb8bc
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/4f0ae2cade95
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #30367 from gaye/bug-1170120
Bug 1170120 - Move dependency declarations from jsmarionette packages which landed in gaia to their appropriate fs location
========
https://hg.mozilla.org/integration/gaia-central/rev/2e71b1a9939d
Author: gaye <gaye@mozilla.com>
Desc: Revert "Revert "Bug 1170120 - Move dependency decls from jsm pkgs to appropriate manifests""
This reverts commit 6d477a7884273886605049b20f60af5c1583a150.
Conflicts:
package.json
========
https://hg.mozilla.org/integration/gaia-central/rev/1bf1636c105c
Author: gaye <gaye@mozilla.com>
Desc: Bug 1170120 - Rebuild local in-tree modules when using npm-cache r=nullaus
2015-06-02 11:35:25 -07:00
B2G Bumper Bot
d0bb96fed8
Bumping manifests a=b2g-bump
2015-06-02 11:22:27 -07:00
B2G Bumper Bot
02fe05787d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/74fae3d5a5fc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30258 from KevinGrandon/bug_1168860_settings_display_panel_gaia_switch
Bug 1168860 - [Settings] Initial usage of gaia-switch in the display panel
========
https://hg.mozilla.org/integration/gaia-central/rev/98d22318e507
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1168860 - [Settings] Initial usage of gaia-switch in the display panel r=arthurcc
2015-06-02 11:20:23 -07:00
B2G Bumper Bot
51ef64aa84
Bumping manifests a=b2g-bump
2015-06-02 10:58:24 -07:00
B2G Bumper Bot
8880d4ecf2
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/746a0e67279e
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #30246 from yzen/bug-1167344
Bug 1167344 - added support for filtering add-on's based on the app.
========
https://hg.mozilla.org/integration/gaia-central/rev/ee0a7881a4b1
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1167344 - added support for filtering add-on's based on the app. r=arthurcc
Change-Id: I6858ec3823d495aa1898596aa327a27d67e92e6e
========
https://hg.mozilla.org/integration/gaia-central/rev/6f42cad84533
Author: Eli Perelman <eli@eliperelman.com>
Desc: Merge pull request #30369 from eliperelman/bug-1170533
Bug 1170533 - Fixing entry race condition and bad memory parsing
========
https://hg.mozilla.org/integration/gaia-central/rev/f51dd7409bec
Author: Eli Perelman <eli@eliperelman.com>
Desc: Bug 1170533 - Fixing entry race condition and bad memory parsing
2015-06-02 10:56:24 -07:00
B2G Bumper Bot
13802e16ca
Bumping manifests a=b2g-bump
2015-06-02 09:32:23 -07:00
B2G Bumper Bot
377d343aa2
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fc09df812d2a
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #30318 from hfiguiere/bug1169363-test-fixes
Bug 1169363 - Check promise rejection. r=arthur
========
https://hg.mozilla.org/integration/gaia-central/rev/56f3ccd9be0d
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1169363 - Check promise rejection.
Also fix test:
- bind saveConfig callback the the right object.
- fake XHR send() reponse now properly handled.
- fix usage of sinon.
- set the right theme for the wallpaper test.
- use valid manifest URLs
- enableSelection() is never called on saveConfig
2015-06-02 09:30:27 -07:00
B2G Bumper Bot
311105d02c
Bumping manifests a=b2g-bump
2015-06-02 07:58:15 -07:00
B2G Bumper Bot
71ef64a81b
Bumping manifests a=b2g-bump
2015-06-02 07:33:19 -07:00
B2G Bumper Bot
61329c4ed2
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/75794fa0bcea
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30314 from sousmangoosta/v3.0
Bug 1157609 - If user taps enter key in add contact page, device will add phone field automatically. Depends on Bug 809452 R=francisco
========
https://hg.mozilla.org/integration/gaia-central/rev/c69117533d09
Author: Ronald Claveau <sousmangoosta@ovh.fr>
Desc: Bug 1157609 - If user taps enter key in add contact page, device will add phone field automatically. Depends on Bug 809452 R=francisco
2015-06-02 07:31:24 -07:00
B2G Bumper Bot
cba7fe62ed
Bumping manifests a=b2g-bump
2015-06-02 05:37:22 -07:00
B2G Bumper Bot
a5858900cd
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/6913ca7d53a9
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #30329 from atiqueahmedziad/019921
Bug 1127559 - [Dialer] End call button gets wider when putting a call on hold r=gsvelto
========
https://hg.mozilla.org/integration/gaia-central/rev/335367e9eb28
Author: Atique Ahmed Ziad <softfilebd@gmail.com>
Desc: Bug 1127559 - [Dialer] End call button gets wider when putting a call on hold
Now the End call button doesn't get wider after putting a call on hold
2015-06-02 05:35:26 -07:00
B2G Bumper Bot
f5d87201f2
Bumping manifests a=b2g-bump
2015-06-02 05:02:28 -07:00
B2G Bumper Bot
d3155e8c73
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/acbe9e56752b
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #30331 from mwargers/1170003
Bug 1170003 - Failure in test_music_share_ringtone.py at player_view.tap_share_button()
========
https://hg.mozilla.org/integration/gaia-central/rev/56c452807265
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1170003 - Failure in test_music_share_ringtone.py at player_view.tap_share_button()
2015-06-02 05:00:26 -07:00
B2G Bumper Bot
28a3146494
Bumping manifests a=b2g-bump
2015-06-02 04:42:55 -07:00
B2G Bumper Bot
3dde05cb7d
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b99c394563d7
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #30330 from ferjm/bug1165248.fxa.confirmemail
Bug 1165248 - [FxA] The long email address will be cut off in 'Confir…
========
https://hg.mozilla.org/integration/gaia-central/rev/8a4f4449c226
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1165248 - [FxA] The long email address will be cut off in 'Confirm Your Account' view. r=arthurcc
2015-06-02 04:40:30 -07:00
Carsten "Tomcat" Book
d87f515bd7
Merge mozilla-central to b2g-inbound
2015-06-02 13:25:08 +02:00
Carsten "Tomcat" Book
0cfe58cf94
merge mozilla-inbound to mozilla-central a=merge
2015-06-02 13:11:05 +02:00
Carsten "Tomcat" Book
4a30832618
merge fx-team to mozilla-central a=merge
2015-06-02 12:57:52 +02:00
B2G Bumper Bot
609e5ade90
Bumping manifests a=b2g-bump
2015-06-02 03:48:58 -07:00
B2G Bumper Bot
de16609ff0
Bumping manifests a=b2g-bump
2015-06-02 03:23:14 -07:00
B2G Bumper Bot
fa0005534d
Bumping manifests a=b2g-bump
2015-06-02 03:02:22 -07:00
B2G Bumper Bot
c44973170c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/bf4c861acea2
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Merge pull request #30339 from sean2449/Bug-1170067-move-program
Bug 1170067 - [Stingray][EPG] Make program element as a web component, r=johnhu
========
https://hg.mozilla.org/integration/gaia-central/rev/6f3eac44dc65
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Bug 1170067 - [Stingray][EPG] Make program element as a web component
* Make program element as a web component in epg_program
* Move out related css
* Add test cases
2015-06-02 03:00:26 -07:00
Carsten "Tomcat" Book
bf3314cafb
merge b2g-inbound to mozilla-central a=merge
2015-06-02 11:57:58 +02:00
B2G Bumper Bot
b54470a45a
Bumping manifests a=b2g-bump
2015-06-02 02:47:24 -07:00
B2G Bumper Bot
31f64b9e69
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7901ee8df0bb
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #30293 from albertopq/1168061-statusbar-icons
Bug 1168061 - Moving statusbar icons HTML to each icon file r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/4626ba02c333
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1168061 - Moving statusbar icons HTML to each icon file
2015-06-02 02:45:28 -07:00
Thomas Zimmermann
0f08e85d05
Bug 1168806: Use 'consumer thread' in socket interface, r=kmachulis
...
The socket IPC interfaces still use 'main thread' in a number of
places. This patch changes all such interfaces and documentation
to speak of 'consumer thread' instead.
2015-06-02 10:01:58 +02:00
Thomas Zimmermann
fb090327db
Bug 1168806: Configurable consumer thread for socket IPC classes, r=kmachulis
...
The consumer thread handles socket creation, destruction, and
data processing for socket IPC. Traditionally this has been
done on the main thread.
This patch extends the socket IPC classes to support arbitrary
consumer threads. The thread is configured when establishing a
connection, and performs all of the above operations until the
socket is closed.
2015-06-02 10:01:57 +02:00
Thomas Zimmermann
d8e16014cd
Bug 1168806: Configurable I/O thread for socket IPC classes, r=kmachulis
...
The I/O thread sends and receives data on a file descriptor. This
has traditionally been performed on a single I/O thread.
This patch extends the socket IPC classes to support arbitrary I/O
threads. The thread is configured when a connection is established
and used until the socket gets closed.
2015-06-02 10:01:57 +02:00
B2G Bumper Bot
b86d1d9857
Bumping manifests a=b2g-bump
2015-06-02 00:37:26 -07:00
B2G Bumper Bot
d46a1d5977
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/f1e40b13dde0
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #30276 from ian-liu/bluetooth/bug1168325_cannot_get_default_adatper_in_bluetooth_app
Bug 1168325 - revised the incorrected event name for Bluetooth APIv2
========
https://hg.mozilla.org/integration/gaia-central/rev/e24f7efa2590
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 1168325 - revised the incorrected event name for Bluetooth APIv2
2015-06-02 00:35:28 -07:00
Baptiste Emmanuel
57d20c53fa
Bug 1166596 - Rename "Marketplace" link on about:home to "Apps". r=adw
2015-06-02 09:34:30 +02:00