Commit Graph

191820 Commits

Author SHA1 Message Date
Mark Banner
533e623513 Bug 1032741 Adapt to latest Loop server changes - update parameter name for /calls_url and add a callType parameter when starting a call. r=nperriault 2014-07-03 15:15:16 +01:00
Gijs Kruitbosch
d5721106ac Bug 1033568 - add pref for customizeToolbars security check, r=dao 2014-07-03 00:14:07 +01:00
Carsten "Tomcat" Book
d93074d010 Backed out changeset afdb479e6427 (bug 966895) for causing Bug 1034015 2014-07-03 14:40:34 +02:00
Carsten "Tomcat" Book
6cbc1d089e Merge mozilla-central to fx-team 2014-07-03 14:28:45 +02:00
Carsten "Tomcat" Book
27ead41013 merge fx-team to mozilla-central a=merge 2014-07-03 13:54:51 +02:00
Carsten "Tomcat" Book
cc1a9a6473 merge mozilla-inbound to mozilla-central a=merge 2014-07-03 13:46:41 +02:00
Patrick Brosset
1b822cb22c Bug 711941 - part 1 - Cubic-bezier widget; r=harth r=gerv 2014-07-03 12:49:16 +02:00
Carsten "Tomcat" Book
0c675e1752 merge b2g-inbound to mozilla-central a=merge 2014-07-03 12:41:25 +02:00
Mark Banner
65803c9c95 Bug 1032738 Desktop client fails to authenticate session tokens with the latest loop server - change to using a hex key for hawk. r=jparsons 2014-07-03 09:23:40 +01:00
Mark Banner
756395df34 Bug 1020876 Route desktop client XHRs though the mozLoop API to share hawk implementation with MozLoopService. r=ttaubert
--HG--
rename : browser/components/loop/content/shared/js/client.js => browser/components/loop/content/js/client.js
rename : browser/components/loop/test/shared/client_test.js => browser/components/loop/test/desktop-local/client_test.js
2014-07-03 09:23:38 +01:00
Henrik Skupin
c9f8a045da Bug 1033680 - TPS should use mozversion to retrieve the application data. r=jgriffin a=testonly DONTBUILD
---
 testing/tps/setup.py          | 1 +
 testing/tps/tps/testrunner.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
2014-07-03 07:27:06 +02:00
Blair McBride
9ce46da743 Bug 1026853 - Experiment is displayed as "pending removal" in detailed view. r=irving 2014-07-03 16:19:58 +12:00
Blair McBride
0ba830cad4 No bug - merge bustage fix on a CLOSED TREE. r=bustage 2014-07-03 15:33:27 +12:00
Wes Kocher
613b089a47 Merge m-c to fx-team 2014-07-02 19:10:42 -07:00
Wes Kocher
2e0c891a60 Merge fx-team to m-c a=merge 2014-07-02 17:24:00 -07:00
Wes Kocher
6e308c5f61 Merge b2g-inbound to m-c a=merge 2014-07-02 17:00:33 -07:00
Wes Kocher
6b3e1ca139 Merge inbound to m-c a=merge 2014-07-02 16:31:17 -07:00
Nick Alexander
b205a271ee Bug 1033535 - Exclude some source files when MOZ_NATIVE_DEVICES is disabled. r=rnewman
DONTBUILD NPOTB
2014-07-02 16:02:46 -07:00
B2G Bumper Bot
66e246465f Bumping manifests a=b2g-bump 2014-07-02 13:26:10 -07:00
B2G Bumper Bot
23fea78e70 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4e3596b10de8
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #21297 from jrburke/bug911412-email-view-icon

Bug 911412 - [Buri][fugu][Language][Email]The view the attachment Button is truncated r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/e4f160a2a0f1
Author: praveen.singapati <praveen.singapati@lge.com>
Desc: Bug 911412 - [Buri][fugu][Language][Email]The view the attachment Button is truncated

as per comments

small nit
2014-07-02 13:20:26 -07:00
B2G Bumper Bot
b3d5913d69 Bumping manifests a=b2g-bump 2014-07-02 12:51:48 -07:00
B2G Bumper Bot
da769c737d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/dad0a9071115
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #20823 from yzen/bug-1019362

Bug 1019362 - adding a number of gaia ui tests for the first time use ap...

========

https://hg.mozilla.org/integration/gaia-central/rev/ff5d9c34aaef
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1019362 - adding a number of gaia ui tests for the first time use app accessibility.
2014-07-02 12:50:29 -07:00
B2G Bumper Bot
49a8d2931d Bumping manifests a=b2g-bump 2014-07-02 11:31:36 -07:00
B2G Bumper Bot
79ea029392 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2c66d42bf145
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #21248 from DouglasSherk/1032502-callscreen-phone-label

Bug 1032502 - [Dialer][Contacts][Callscreen] Fix phone type label not being localized on callscreen. r=francisco

========

https://hg.mozilla.org/integration/gaia-central/rev/336e98ecf529
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1032502 - [Dialer][Contacts][Callscreen] Fix phone type label not being localized on callscreen. r=francisco
2014-07-02 11:25:22 -07:00
B2G Bumper Bot
7c503c4baf Bumping manifests a=b2g-bump 2014-07-02 11:14:25 -07:00
B2G Bumper Bot
398e134d19 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

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

Bug 1030655 - [Flame][Email] - fuzzy clear icon

========

https://hg.mozilla.org/integration/gaia-central/rev/196ebd9da323
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1030655 - [Flame][Email] - fuzzy clear icon

========

https://hg.mozilla.org/integration/gaia-central/rev/8ef1eb02fa74
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #21241 from DouglasSherk/1030546-dialer-share-localization

Bug 1030546 - [Dialer] Share keypad localization data across the dialer and emergency-call apps. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/e4dc541908ff
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1030546 - [Dialer] Share keypad localization data across the dialer and emergency-call apps. r=etienne
2014-07-02 11:10:30 -07:00
Honza Bambas
d54cb76071 Backing out 6c5c6cbad330 (bug 1032992) for Adnroid failures - GC doesn't work there as on other platforms..., r=backout 2014-07-02 19:53:00 +02:00
Ed Morley
1e0edbb24c Backed out changeset 1b9e9be1db29 (bug 1030277) for intermittent test failures 2014-07-02 18:17:50 +01:00
ffxbld
eeddbce286 No bug, Automated blocklist update from host b-linux64-hp-0034 - a=blocklist-update 2014-07-02 10:05:55 -07:00
ffxbld
48104012ec No bug, Automated HPKP preload list update from host b-linux64-hp-0034 - a=hpkp-update 2014-07-02 10:05:51 -07:00
ffxbld
50c4cd24ee No bug, Automated HSTS preload list update from host b-linux64-hp-0034 - a=hsts-update 2014-07-02 10:05:48 -07:00
B2G Bumper Bot
5140fa018e Bumping manifests a=b2g-bump 2014-07-02 09:46:47 -07:00
B2G Bumper Bot
a4c4147a79 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7af0e127fdda
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #21203 from jrburke/bug1031588-email-back-arrow

Bug 1031588 - [B2G][Email]Back arrow on 'New Account' page does not function after deleting two email acccounts r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/05822301a02d
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1031588 - [B2G][Email]Back arrow on 'New Account' page does not function after deleting two email acccounts

========

https://hg.mozilla.org/integration/gaia-central/rev/53bfafc3e7cc
Author: Jared Hirsch <ohai@6a68.net>
Desc: Merge pull request #21240 from 6a68/bug-1032938-use-fmd-prod-servers

Bug 1032938 - Point find my device at production servers

========

https://hg.mozilla.org/integration/gaia-central/rev/b59013cbba56
Author: Jared Hirsch <ohai@6a68.net>
Desc: Bug 1032938 - Point find my device at production servers
2014-07-02 09:45:25 -07:00
B2G Bumper Bot
98bd514442 Bumping manifests a=b2g-bump 2014-07-02 09:26:39 -07:00
B2G Bumper Bot
642e5b00c2 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/cbaa49bbefdc
Author: gitmai <mri@tid.es>
Desc: Merge pull request #21257 from gitmai/bug-1032836-event-listener-error-testing

Bug 1032836 - Intermittent image_loader_test.js | Image Loader Test Suit...
r=crdlc

========

https://hg.mozilla.org/integration/gaia-central/rev/ec9aabc8f53c
Author: mai <mri@tid.es>
Desc: Bug 1032836 - Intermittent image_loader_test.js | Image Loader Test Suite > imgsLoader resuming > resuming calls new Image() | expected Image to be called once but was called twice
2014-07-02 09:20:26 -07:00
Nils Ohlmeier [:drno]
4edb843817 Bug 1020024 - fix data channel connecting race conditions. r=jib 2014-07-02 18:08:00 +02:00
Yuan Xulei
453910b203 Bug 1027127 - Remove setTimeout to avoid intermittent test failure. r=dchan 2014-07-03 14:07:06 +08:00
B2G Bumper Bot
5c8e1ca916 Bumping manifests a=b2g-bump 2014-07-02 08:36:48 -07:00
B2G Bumper Bot
5599715c54 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/33d9ea721ccc
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21238 from clouserw/mkttests

add Marketplace to whitelist; Bug 1032953

========

https://hg.mozilla.org/integration/gaia-central/rev/283ce7489ab9
Author: Wil Clouser <clouserw@gmail.com>
Desc: add Marketplace to whitelist; Bug 1032953

========

https://hg.mozilla.org/integration/gaia-central/rev/a58717709799
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21224 from jfkthame/generic-sans-serif

[bug 1032754] Just use font-family:sans-serif

========

https://hg.mozilla.org/integration/gaia-central/rev/a353bbca7538
Author: Jonathan Kew <jfkthame@gmail.com>
Desc: [bug 1032754] Just use font-family:sans-serif rather than explicitly naming Fira Sans in Gaia CSS.
2014-07-02 08:35:27 -07:00
B2G Bumper Bot
7993302236 Bumping manifests a=b2g-bump 2014-07-02 08:21:48 -07:00
B2G Bumper Bot
b784e2e37d Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8bb248349e9c
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1033327 - Bump gaiatest version to 0.26. r=zcampbell
2014-07-02 08:20:27 -07:00
B2G Bumper Bot
e2232c0fd8 Bumping manifests a=b2g-bump 2014-07-02 08:16:20 -07:00
B2G Bumper Bot
c09e496d2b Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/9bb25e438865
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1033321 - Unable to launch apps with undefined localised names. r=zcampbell
2014-07-02 08:05:31 -07:00
Michael Wu
9c81d4ea04 Bug 1033209 - Lazily initialize gps callbacks, r=kanru 2014-07-02 22:59:46 +08:00
B2G Bumper Bot
de9cf226ae Bumping manifests a=b2g-bump 2014-07-02 07:43:41 -07:00
B2G Bumper Bot
8bbfc20deb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/eedabf36ee1f
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #18330 from rnowm/996441

Bug 996441 - [FTE] Apply progress step [BB] to Fx Accounts r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/611a0a511a74
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 996441 - [FTE] Apply progress step [BB] to Fx Accounts
2014-07-02 07:43:30 -07:00
Brad Lassey
ad82670b3e bug 1033013 - disable testMasterPassword, follow up to remove skip-if as well r=gbrown 2014-07-02 10:27:25 -04:00
Henrik Skupin
0a65320273 Bug 1032853 - TPS infinitely loops through the same phase of a test. r=ahal a=testonly DONTBUILD
---
 testing/tps/tps/firefoxrunner.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

--HG--
extra : rebase_source : 7785bb543c0d44ce6dd3380c8ce1db3bff88cdad
2014-07-02 15:37:30 +02:00
Carsten "Tomcat" Book
2b6d7c0109 merge b2g-inbound to mozilla-central a=merge
--HG--
extra : amend_source : 7fa8699b38befea0f21f1b84a1c998efb03f614e
2014-07-02 15:05:32 +02:00
Carsten "Tomcat" Book
536c8c08bc merge fx-team to mozilla-central a=merge
--HG--
extra : amend_source : 6b1927dd9d7d8eedfc694b66e8aceb7c3fc24935
2014-07-02 15:00:10 +02:00