Commit Graph

425989 Commits

Author SHA1 Message Date
Wes Kocher
8127240e63 Merge b2ginbound to central, a=merge 2015-06-11 17:37:23 -07:00
Wes Kocher
c07c3dd3d8 Merge fx-team to central, a=merge 2015-06-11 17:18:11 -07:00
Wes Kocher
2aa142fe5e Merge inbound to central, a=merge 2015-06-11 17:02:47 -07:00
Ryan VanderMeulen
6bced0aeb7 Backed out changeset bdaede62fdcf (bug 1169653) for introducing new rooting hazards.
CLOSED TREE
2015-06-11 15:48:09 -04:00
Ryan VanderMeulen
d452161188 Backed out changeset 67527d8c0688 (bug 1169331) for being the most-likely cause of semi-frequent Android debug reftest failures.
CLOSED TREE
2015-06-11 15:39:27 -04:00
Eddy Bruël
ef17d64c59 Bug 1164564 - Refactor Promise-backend.js so it can be required as a CommonJS module on the main thread;r=paolo 2015-06-11 21:24:15 +02:00
Ryan VanderMeulen
fdb32e04fb Backed out changeset 32c21104e02c (bug 1164510) for causing frequent browser_UITour_loop.js failures. 2015-06-11 15:14:56 -04:00
Ryan VanderMeulen
20eb4e1566 Backed out 3 changesets (bug 974089) for causing OSX/Windows test_bug867104.html permafail.
Backed out changeset 1dcfd15bb387 (bug 974089)
Backed out changeset 8c6a7d5efe3a (bug 974089)
Backed out changeset e511c79f2211 (bug 974089)

CLOSED TREE
2015-06-11 15:10:06 -04:00
B2G Bumper Bot
219cd2ef28 Bumping manifests a=b2g-bump 2015-06-11 11:22:22 -07:00
B2G Bumper Bot
d8fb9f3192 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/8583025b84cd
Author: No-Jun Park <npark@mozilla.com>
Desc: Merge pull request #30527 from npark-mozilla/986960

Bug 986960 - Intermittent erroring test, fullscreen_image_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/ecfec5ebea42
Author: No-Jun Park <npark@mozilla.com>
Desc: Bug 986960 - Intermittent erroring test, fullscreen_image_test.js

fixing the script so it matches the current gallery app behavior
2015-06-11 11:20:26 -07:00
Ryan VanderMeulen
0b43d41761 Backed out changeset 51234d23d640 (bug 1160837) for browser_projecteditor_contextmenu_02.js failures.
--HG--
extra : rebase_source : e31d51bfb853753e29f8f8713b159848c772109f
2015-06-11 14:18:46 -04:00
Marina Samuel
3512c5b545 Bug 1172987 - Incorrect padding for various locales. r=Mardak. 2015-06-11 14:09:13 -04:00
B2G Bumper Bot
b12dfc3268 Bumping manifests a=b2g-bump 2015-06-11 11:07:22 -07:00
B2G Bumper Bot
609c03961b Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f32079b110a9
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30539 from tauzen/Bug1173444_mising_nfccore_dep

Bug 1173444 - [NFC] Adding utilities.js as a dependecy in NfcCore, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/21f9dc6bb295
Author: Krzysztof Mioduszewski <kmioduszewski@gmail.com>
Desc: Bug 1173444 - [NFC] Adding utilities.js as a dependecy in NfcCore, r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/203b3f702f32
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30085 from Cwiiis/bug1053747-searchbar-on-homescreen

Bug 1053747 - Add a collapsible rocketbar to homescreens.

========

https://hg.mozilla.org/integration/gaia-central/rev/b7fd7803355d
Author: Chris Lord <chrislord.net@gmail.com>
Desc: Bug 1053747 - Add a rocketbar to homescreens. r=alive
2015-06-11 11:05:23 -07:00
B2G Bumper Bot
08bc3054fc Bumping manifests a=b2g-bump 2015-06-11 09:07:20 -07:00
B2G Bumper Bot
62144c8d10 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e88bedf0e7b0
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #30221 from albertopq/1163524-action-menu-rocketbar

Bug 1163524 - Closing search when opening an activity r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/c2314215273a
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1163524 - Closing search when opening an activity
2015-06-11 09:05:25 -07:00
B2G Bumper Bot
ffcbf212d0 Bumping manifests a=b2g-bump 2015-06-11 08:47:14 -07:00
B2G Bumper Bot
1c25fcd1ad Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1c2d68fe8da9
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #29532 from punamdahiya/Bug1080122

Bug 1080122 - [Gallery] Add gallery activities marionette tests

========

https://hg.mozilla.org/integration/gaia-central/rev/52f6ae01a37e
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug 1080122 - [Gallery] Add gallery activities marionette tests r=djf
2015-06-11 08:45:17 -07:00
Carsten "Tomcat" Book
bce194793c merge fx-team to mozilla-central a=merge 2015-06-11 14:41:37 +02:00
Wander Lairson Costa
d4c5783ea8 Bug 1173507: Avoid cache bustage. r=garndt
As we cache binaries, this might end up resulting wildcard copies
expanding to more than one file, causing the task to fail.

--HG--
extra : commitid : 8l5iig5qsXc
extra : rebase_source : 6825949c0fb1a1585805e7bc27dad6ea5ee229eb
2015-06-11 06:04:25 -03:00
B2G Bumper Bot
3890c82ac6 Bumping manifests a=b2g-bump 2015-06-11 08:17:23 -07:00
B2G Bumper Bot
18ebdf1afd Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6ce419d1397f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1173268 - [Contacts] follow-up, fix linter error
2015-06-11 08:15:27 -07:00
B2G Bumper Bot
57bd6a3241 Bumping manifests a=b2g-bump 2015-06-11 06:52:15 -07:00
B2G Bumper Bot
944c40af5e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/48747618f3a0
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #30523 from fcampo/updatephoto_out_contacts_1173268

Bug 1173268 - [Contacts][NGA] Move 'updatePhoto' out of contacts.js

========

https://hg.mozilla.org/integration/gaia-central/rev/d6004ea70a17
Author: Fernando Campo <fernando.campo@telefonica.com>
Desc: Bug 1173268 - [Contacts][NGA] Move 'updatePhoto' out of contacts.js
2015-06-11 06:50:19 -07:00
B2G Bumper Bot
4256095981 Bumping manifests a=b2g-bump 2015-06-11 06:32:24 -07:00
B2G Bumper Bot
b5150a7c39 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/752d9be7ee05
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #30522 from borjasalguero/bug_1173326

Bug 1173326 - [Contacts][NGA] Extract 'Navigation' out of 'contacts.j…

========

https://hg.mozilla.org/integration/gaia-central/rev/b6ad5a36de64
Author: borjasalguero <fbsc@tid.es>
Desc: Bug 1173326 - [Contacts][NGA] Extract 'Navigation' out of 'contacts.js' r=arcturus
2015-06-11 06:30:27 -07:00
vivek
16870cb3b7 Bug 1055264 : Default profile image layout for sync setup screen -r=nalexander.
--HG--
extra : commitid : 5n0zUuXEbGA
extra : rebase_source : 25e438f563693e46a84f7a2c80aef3c621b4d31f
2015-06-10 21:23:00 -07:00
vivek
441e18b628 Bug 1055264 : Build flags added for firefox account profile -r=nalexander.
--HG--
extra : commitid : CB7Oe2LjdWO
extra : rebase_source : e914a08754618a5a44ad620afa422985bd09fdc7
2015-06-10 21:22:00 -07:00
J. Ryan Stinnett
342faa7ed0 Bug 1159043 - Record WebIDE runtime info in Telemetry. r=ochameau 2015-06-10 23:35:19 -05:00
Phil Ringnalda
045e232914 Merge m-c to b-i 2015-06-10 20:55:35 -07:00
Phil Ringnalda
0bc6a90310 Merge m-c to f-t 2015-06-10 20:53:34 -07:00
Phil Ringnalda
dfef8b95e8 Back out 3c8a737a5f8a (bug 1168658) for frequent Gij(10) failures in homescreen_navigation_test.js and edges_gesture_test.js, a=backout 2015-06-10 20:37:27 -07:00
Allison Naaktgeboren
bf0635a24a Bug 1136477 - Unify terminology of Passwords/Logins for about:logins (nee about:passwords).1/2.r=margaret
--HG--
rename : mobile/android/chrome/content/aboutPasswords.js => mobile/android/chrome/content/aboutLogins.js
rename : mobile/android/chrome/content/aboutPasswords.xhtml => mobile/android/chrome/content/aboutLogins.xhtml
rename : mobile/android/locales/en-US/chrome/aboutPasswords.dtd => mobile/android/locales/en-US/chrome/aboutLogins.dtd
rename : mobile/android/locales/en-US/chrome/aboutPasswords.properties => mobile/android/locales/en-US/chrome/aboutLogins.properties
rename : mobile/android/tests/browser/robocop/testAboutPasswords.java => mobile/android/tests/browser/robocop/testAboutLogins.java
rename : mobile/android/tests/browser/robocop/testAboutPasswords.js => mobile/android/tests/browser/robocop/testAboutLogins.js
rename : mobile/android/themes/core/aboutPasswords.css => mobile/android/themes/core/aboutLogins.css
2015-06-10 18:52:27 -07:00
Wes Kocher
6178ef95c2 Merge m-c to fx-team, a=merge 2015-06-10 18:40:51 -07:00
Wes Kocher
68f351b859 Merge m-c to b2ginbound, a=merge 2015-06-10 18:39:02 -07:00
Wes Kocher
b124d4653d Merge b2ginbound to central, a=merge 2015-06-10 18:36:06 -07:00
Wes Kocher
4eedce1509 Merge inbound to central, a=merge 2015-06-10 18:29:39 -07:00
B2G Bumper Bot
ffaa4135a4 Bumping manifests a=b2g-bump 2015-06-10 17:53:13 -07:00
B2G Bumper Bot
f303371df8 Bumping manifests a=b2g-bump 2015-06-10 17:02:20 -07:00
B2G Bumper Bot
ec1e47ed2a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/32ad502c3fb2
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #30531 from lissyx/bug1169861-reland

Bug 1169861 - Ignore holdcamera when lockscreen is locked r=etienne_s

========

https://hg.mozilla.org/integration/gaia-central/rev/03423edcf9d4
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 1169861 - Ignore holdcamera when lockscreen is locked r=etienne_s
2015-06-10 17:00:25 -07:00
B2G Bumper Bot
fe0a7958b2 Bumping manifests a=b2g-bump 2015-06-10 15:17:13 -07:00
B2G Bumper Bot
49f2a813f8 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e203d0ae7ccd
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1173554 - Update marionette content in readme after location change
2015-06-10 15:15:17 -07:00
B2G Bumper Bot
6a843bb521 Bumping manifests a=b2g-bump 2015-06-10 15:02:24 -07:00
B2G Bumper Bot
8f7aec97a7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

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

Bug 1173530 - Remove unused _timer property from settings_listener.js

========

https://hg.mozilla.org/integration/gaia-central/rev/0ad850053f1d
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1173530 - Remove unused _timer property from settings_listener.js
2015-06-10 15:00:27 -07:00
Wes Kocher
cf5c546ab3 Backed out 2 changesets (bug 1129957) for frequent browser_privatebrowsing_DownloadLastDirWithCPS.js timeouts a=merge
Backed out changeset 9ac1d4aadc38 (bug 1129957)
Backed out changeset 109474240d8c (bug 1129957)

--HG--
extra : source : 02bf142b27ad4ca025afbfd0c98ece6813251327
2015-06-10 14:38:40 -07:00
Wes Kocher
ffb3250537 Merge fx-team to m-c a=merge 2015-06-10 18:08:46 -07:00
B2G Bumper Bot
c63d050068 Bumping manifests a=b2g-bump 2015-06-10 13:22:12 -07:00
B2G Bumper Bot
111e8559b1 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2e9a1e5808b9
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #30507 from lissyx/bug1169861"

This reverts commit fb7e0cec2aefbd1b2a90af3af17b0036915db0b3, reversing
changes made to d63847b857c0626e266a60dccfa4532f5b809f25.
2015-06-10 13:20:16 -07:00
Kartikaya Gupta
eb7580bebc Back out 3 csets from bug 1125325 for introducing bug 1173224. r=me 2015-06-10 15:55:34 -04:00
Ryan VanderMeulen
22d21b961c Backed out changeset 7e51efbbf1d6 (bug 1170809) for somehow making ASAN opt builds perma-timeout.
CLOSED TREE
2015-06-10 15:30:10 -04:00