Commit Graph

448444 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
edda9042a5 Merge mozilla-central to fx-team 2015-11-03 12:13:10 +01:00
Carsten "Tomcat" Book
8232c46c4f merge mozilla-inbound to mozilla-central a=merge 2015-11-03 12:00:30 +01:00
Carsten "Tomcat" Book
d32b29a5b6 merge fx-team to mozilla-central a=merge 2015-11-03 11:59:08 +01:00
Carsten "Tomcat" Book
0ce534c617 Backed out changeset f94a6394b5d1 (bug 1215147) for dom warnings
--HG--
extra : rebase_source : 3c30566912962ee1b3a32064aec87519c1d878b1
2015-11-03 11:40:29 +01:00
Nigel Babu
9ede18e7fe Backed out changeset ad08ab3d158e (bug 1203199) for widespread reftest bustage 2015-11-03 12:01:22 +05:30
Nigel Babu
9892fe78d6 Backed out changeset de50fec5c3a6 (bug 1219020) 2015-11-03 11:59:06 +05:30
Nigel Babu
aa60675f7f Backed out changeset 19e021ef5ba1 (bug 1216288) 2015-11-03 11:59:05 +05:30
Nigel Babu
10791e232a Backed out changeset 7b99659430b1 (bug 1203199) 2015-11-03 11:59:03 +05:30
B2G Bumper Bot
116bacb8cc Bumping manifests a=b2g-bump 2015-11-02 16:32:43 -08:00
B2G Bumper Bot
7b5fcd3bd5 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/53578330b307
Author: Wes Kocher <kwierso@gmail.com>
Desc: Revert "Merge pull request #31010 from punamdahiya/Bug1178290" for pick_test Gu failures

This reverts commit 3568ea50aa6d67583e2f66f69ce1a04ed139bdfc, reversing
changes made to ea37373cacce9f4f928eda2e15bb03e0b0e30454.
2015-11-02 16:30:36 -08:00
Ralph Giles
62347f7023 Bug 1220882 - Use LazyLogModule in MP4Metadata. r=kinetik
Use the new LazyLogModule to instantiate a log for the rust
mp4parse test code instead of using indiscriminate printf()s.

Access results with NSPR_LOG_MODULES=MP4Metadata:5.
2015-11-02 16:19:00 -08:00
Ralph Giles
87aab4c5c3 Bug 1219530 - Add MOZ_RUST_MP4PARSE feature switch. r=glandium
Add a switch to enable the rust mp4parser code through confvars.sh
and set this for browser targets. Configure will only pass this
through as a CPP define if the rust toolchain is available.

The MOZ_RUST check is hoisted to an outer conditional to
make it cleaner to add other features.

Thanks to zhoubcfan@163.com for the typo fix in configure.in.
2015-11-02 16:40:00 -08:00
Chris Peterson
4a9be99fc7 Bug 1220544 - Fix -Wunreachable-code warnings in xpcom. r=mccr8
xpcom/glue/PLDHashTable.cpp:471:10 [-Wunreachable-code-return] 'return' will never be executed
xpcom/tests/TestAutoPtr.cpp:324:9 [-Wunreachable-code] code will never be executed
xpcom/tests/TestBlockingProcess.cpp:6:11 [-Wunreachable-code-return] 'return' will never be executed
2015-11-02 21:03:03 -08:00
Wes Kocher
902cea2b9a Merge m-c to fx-team, a=merge
--HG--
extra : commitid : 9dyZ3yocWTJ
2015-11-02 15:59:07 -08:00
Wes Kocher
d538c9e039 Merge m-c to b2ginbound, a=merge
--HG--
extra : commitid : cjuh9JhGcr
2015-11-02 15:58:27 -08:00
Sunny Sidhu
1933664ca0 Bug 1210563 - Amends position property to relative with top/right adjustments and adds float property to right justify controls r=jryans 2015-11-02 17:33:37 -06:00
Fabrice Desré
d819fec749 Bug 1214554 - Implement getLocationListener on GeckoInterface r=reuben 2015-11-02 15:12:24 -08:00
B2G Bumper Bot
a3df26a7d2 Bumping manifests a=b2g-bump 2015-11-02 14:46:41 -08:00
B2G Bumper Bot
96d819741c Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/334d69694312
Author: No-Jun Park <npark@mozilla.com>
Desc: Merge pull request #32950 from npark-mozilla/1220814

Bug 1220814 - Imagecompare: test_settings_NC_RTL.py fails while waiting for call barring dialog

========

https://hg.mozilla.org/integration/gaia-central/rev/d2b845c3d1f8
Author: g5njpark <nojun.park@gmail.com>
Desc: Bug 1220814 - Imagecompare: test_settings_NC_RTL.py fails while waiting for call barring dialog

========

https://hg.mozilla.org/integration/gaia-central/rev/b9de565a53cb
Author: Reza Akhavan <reza@akhavan.me>
Desc: Merge pull request #32952 from jedireza/system-addon-alert-icon

Bug 1216446 - updated alert icon

========

https://hg.mozilla.org/integration/gaia-central/rev/973bd27cc964
Author: jedireza <reza@akhavan.me>
Desc: Bug 1216446 - updated alert icon
2015-11-02 14:44:36 -08:00
B2G Bumper Bot
264834c223 Bumping manifests a=b2g-bump 2015-11-02 13:46:40 -08:00
B2G Bumper Bot
9cec6ace1a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d9b7f7baa82c
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #31010 from punamdahiya/Bug1178290

Bug 1178290 - [Gallery] Use MediaFrame.maxImageDecodeSize to calculate output size in pick flow r=djf

========

https://hg.mozilla.org/integration/gaia-central/rev/ca2a50f6e0f9
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug 1178290 - [Gallery] Use MediaFrame.maxImageDecodeSize to calculate output size in pick flow r=djf
2015-11-02 13:44:36 -08:00
Wes Kocher
9ed1f72c5b Backed out changeset 54c770bf243e (bug 1194525) for apparently causing a spike in gij(11/12) failures a=merge
--HG--
extra : commitid : L4Z1aFtG6FI
extra : source : b892fb047ebc8f7970a59b2cee333223b97587d9
2015-11-02 13:29:30 -08:00
Wes Kocher
3696443a14 Merge inbound to m-c a=merge
--HG--
extra : commitid : Iy93sktRpdv
2015-11-02 15:12:16 -08:00
Wes Kocher
5fc22c639b Merge fx-team to central, a=merge
--HG--
extra : commitid : gBT26RNNX8
2015-11-02 14:26:35 -08:00
B2G Bumper Bot
c6c6d8c5a6 Bumping manifests a=b2g-bump 2015-11-02 12:07:20 -08:00
B2G Bumper Bot
ffcc889b19 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/137f1983327e
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #32944 from ferjm/bug1219245.forgotpassword.fxa.tv

Bug 1219245 - [TV Data Sync] 'Forgot your password' link shows activi…

========

https://hg.mozilla.org/integration/gaia-central/rev/f0db63691919
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1219245 - [TV Data Sync] 'Forgot your password' link shows activity chooser menu. r=yifan
2015-11-02 12:05:18 -08:00
B2G Bumper Bot
ef5587f36b Bumping manifests a=b2g-bump 2015-11-02 10:26:43 -08:00
B2G Bumper Bot
854c096bf3 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a5acce851893
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #32858 from mwargers/1219843

Bug 1219843 - Remove workaround for bug 1216394 in test_browser_clear_browsing_history.py

========

https://hg.mozilla.org/integration/gaia-central/rev/7f03c90c40e2
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1219843 - Remove workaround for bug 1216394 in test_browser_clear_browsing_history.py

========

https://hg.mozilla.org/integration/gaia-central/rev/23bb280000f9
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #32876 from mwargers/1219955

Bug 1219955 - test_fmradio_add_remove_from_favorites.py failure - UnicodeEncodeError

========

https://hg.mozilla.org/integration/gaia-central/rev/b861549ac8a1
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1219955 - test_fmradio_add_remove_from_favorites.py failure - UnicodeEncodeError

========

https://hg.mozilla.org/integration/gaia-central/rev/eea5081854b2
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #32874 from mwargers/1219971

Bug 1219971 - Failure in test_cost_control_reset_wifi.py, because of launch directly after a kill

========

https://hg.mozilla.org/integration/gaia-central/rev/d54589dbbde4
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1219971 - Failure in test_cost_control_reset_wifi.py, because of launch directly after a kill
2015-11-02 10:24:40 -08:00
Fabrice Desré
3ebab267bd Bug 1219032 - Rename B2GDroid to Firefox OS developer preview r=me 2015-11-02 09:54:21 -08:00
B2G Bumper Bot
249ac8cfb7 Bumping manifests a=b2g-bump 2015-11-02 09:26:42 -08:00
B2G Bumper Bot
163f2f4e6d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5f2f8e80254e
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #32937 from albertopq/1220487-intermittent-unpin

Bug 1220487 - Fixing intermittent test "Pin a page" r=mhenretty

========

https://hg.mozilla.org/integration/gaia-central/rev/a6165c9eff7f
Author: albertopq <albert.pastor@gmail.com>
Desc: Fixing intermittent test "Pin a page"
2015-11-02 09:24:40 -08:00
Fabrice Desré
5f7f5f2afc Bug 1220061 - Android UA is not correct when MOZ_UA_OS_AGNOSTIC is set r=gerv 2015-11-02 09:23:28 -08:00
B2G Bumper Bot
0942a15d26 Bumping manifests a=b2g-bump 2015-11-02 08:27:18 -08:00
B2G Bumper Bot
d320a0b747 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2b05f028ab47
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #32938 from mikehenrty/bug-1220634-unit-test-retries

Bug 1220634 - increase waiting tries for the test agent app to spin up

========

https://hg.mozilla.org/integration/gaia-central/rev/925f9b08a492
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1220634 - increase waiting tries for the test agent app to spin up
2015-11-02 08:25:17 -08:00
B2G Bumper Bot
e4753d7c08 Bumping manifests a=b2g-bump 2015-11-02 07:41:43 -08:00
B2G Bumper Bot
996ea9011b Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/203e030a009d
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #32934 from Phoxygen/bug1220561-system_statusbar_alignment

Bug 1220561 - [System][RTL] correct position of utilitray icons. r=apastor

========

https://hg.mozilla.org/integration/gaia-central/rev/011842ce0e27
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1220561 - [System][RTL] correct position of utilitray icons

========

https://hg.mozilla.org/integration/gaia-central/rev/f39cc2d8e07c
Author: Carsten Book <tomcat@mozilla.com>
Desc: Merge pull request #32917 from Cwiiis/bug1220379-homescreen-dataclone-error

Bug 1220379 - Handle idb put/delete exceptions. r=gmarty

========

https://hg.mozilla.org/integration/gaia-central/rev/839bb0967fe3
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1220379 - Handle idb put/delete exceptions. r=gmarty
2015-11-02 07:39:32 -08:00
B2G Bumper Bot
0b72882e5f Bumping manifests a=b2g-bump 2015-11-02 07:02:35 -08:00
B2G Bumper Bot
737885112f Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ca5de527812b
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #32899 from ferjm/bug1219245.forgotpassword.fxa.tv"

This reverts commit 79bd73d3f806e24010f883828f76e3289c0ecda6, reversing
changes made to f8cc75ad7106f52d3835c4e697062fc6ed6c1dfa.
2015-11-02 07:00:23 -08:00
Chris H-C
3193935f35 Bug 1220376 - Use %1$S instead of %1$s. r=gfritzsche
'%1$s' only takes the first character of the format parameter.

--HG--
extra : commitid : 1VbdalRLYyh
extra : amend_source : de65bdb1099a3cbd627f15216091a0b085569260
2015-11-02 06:37:00 -08:00
Matthew Noorenberghe
01ef877e80 Bug 1220884 - Friendlier string for the notification upgrade UI. r=kitcambridge
--HG--
extra : commitid : JK4ut7t32GU
2015-11-02 15:16:15 -08:00
Kit Cambridge
759a7eadce Bug 1220527 - Wait for the first window before showing the upgraded notifications alert. r=MattN
--HG--
extra : commitid : DDBFmrJtj1O
2015-11-02 14:59:52 -08:00
Chris Rafuse
3249757e08 Bug 1213906-Change email invitation to fit new user journey, r=dmose 2015-11-02 14:09:39 -08:00
B2G Bumper Bot
d9e8aa3976 Bumping manifests a=b2g-bump 2015-11-02 05:01:29 -08:00
B2G Bumper Bot
cf130c50ba Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/24f8079efb81
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #32899 from ferjm/bug1219245.forgotpassword.fxa.tv

Bug 1219245 - [TV Data Sync] 'Forgot your password' link shows activi…

========

https://hg.mozilla.org/integration/gaia-central/rev/8a688abc0ee3
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1219245 - [TV Data Sync] 'Forgot your password' link shows activity chooser menu. r=yifan

========

https://hg.mozilla.org/integration/gaia-central/rev/2b8456e27201
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #32498 from michielbdejong/1215473-store-variable-in-scope

Bug 1215473 - Avoid accessing global placesStore variable. r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/d7d10d729519
Author: Michiel de Jong <mbdejong@mozilla.com>
Desc: Bug 1215473 - Avoid accessing global placesStore variable, r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/395031374311
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #32886 from michielbdejong/1218293-remove-fxsyncId

Bug 1218293 - Get rid of fxsyncId field in bookmarks_store, r=ferjm

========

https://hg.mozilla.org/integration/gaia-central/rev/4129f7c60830
Author: Michiel de Jong <mbdejong@mozilla.com>
Desc: Bug 1218293 - Get rid of fxsyncId field in bookmarks_store, r=ferjm
2015-11-02 04:59:29 -08:00
Gijs Kruitbosch
5f80c7d2db Bug 120684 - followup: adjust DOM interface test, implied-r=smaug,bustage
--HG--
extra : commitid : 9D0nIBFVsK9
2015-11-02 12:36:35 +00:00
B2G Bumper Bot
8d7333579d Bumping manifests a=b2g-bump 2015-11-02 04:02:21 -08:00
B2G Bumper Bot
7b76c61391 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/5fbe01096e9b
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #32918 from albertopq/1216415-unpin-3

Bug 1216415 - Fail to unpin the pinned site. r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/d9fc1611b514
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1216415 - Fail to unpin the pinned site.
2015-11-02 04:00:21 -08:00
B2G Bumper Bot
b904b0c274 Bumping manifests a=b2g-bump 2015-11-02 03:15:33 -08:00
B2G Bumper Bot
155d866c58 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/73e95182508e
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #32906 from ferjm/bug1219708.nosync.offline

Bug 1219708 - Should not attempt to sync while offline. r=michielbdej…

========

https://hg.mozilla.org/integration/gaia-central/rev/965fd08c0c74
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Bug 1219708 - Should not attempt to sync while offline. r=michielbdejong, yifan

========

https://hg.mozilla.org/integration/gaia-central/rev/7ddaca2524cb
Author: danhuang1202 <dhuang@mozilla.com>
Desc: Merge pull request #32921 from danhuang1202/1219609_change_header_from_bookmark_to_bookamrkd

Bug 1219609 - update bookmark list header title from Bookmark to Book…

========

https://hg.mozilla.org/integration/gaia-central/rev/493caa34d884
Author: danhuang1202 <danhuang1202@gmail.com>
Desc: Bug 1219609 - change bookmark list header title from Bookmark to Bookmsrks. r=yifan
2015-11-02 03:15:16 -08:00
Carsten "Tomcat" Book
d22b2c9770 Merge mozilla-central to b2g-inbound 2015-11-02 12:06:26 +01:00