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
Ryan VanderMeulen
deabeb4bb7
Bug 1173484 - Skip test_storageAreaListener.html on B2G debug builds due to frequent timeouts.
...
CLOSED TREE
--HG--
extra : rebase_source : bbeef6b0b37bd102e3177dc5cf8120ce2314d560
extra : amend_source : 5f58f1794e9b6e6b997f851c425b9193395a7d15
2015-06-10 15:22:33 -04:00
Ryan VanderMeulen
2fffd0165c
Bug 1170372 - Skip js1_5/Regress/regress-312588.js on SM(cgc) builds due to timeouts.
...
--HG--
extra : rebase_source : 31272a3f8fc2adf7bc96504f97e3c744af6f2e8a
2015-06-10 15:17:26 -04:00
Jonathan Griffin
6785d36bb1
Backed out changeset 58b09d4a5de5 for Mn OSX test_profile_management.py failures on a CLOSED TREE
2015-06-10 12:15:31 -07:00
B2G Bumper Bot
893a8a82ec
Bumping manifests a=b2g-bump
2015-06-10 11:57:21 -07:00
B2G Bumper Bot
68df097607
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/67e048984f96
Author: No-Jun Park <npark@mozilla.com>
Desc: Merge pull request #30496 from npark-mozilla/1172624
Bug 1172624 - Convert python marionette test_gallery_empty.py script to marionettejs test empty_image_test.js
========
https://hg.mozilla.org/integration/gaia-central/rev/a2db19bde9d3
Author: No-Jun Park <npark@mozilla.com>
Desc: Bug 1172624 - Convert python marionette test_gallery_empty.py script to marionettejs test
2015-06-10 11:55:25 -07:00
B2G Bumper Bot
29fbcb9e84
Bumping manifests a=b2g-bump
2015-06-10 11:22:15 -07:00
Aaron Klotz
70530b4506
Bug 1171453: Make ParentNPObjects aware of AsyncNPObject wrappers; r=jimm
...
--HG--
extra : rebase_source : 185651f571495b6b4313d335359a9d60b35074fa
2015-06-10 12:20:56 -06:00
Michael Comella
2bd8d89321
Bug 1170884 - Call TypedArray.recycle after use in TextSelectionHandle. r?capella
...
--HG--
extra : commitid : 9MafE98Uxi
extra : rebase_source : efb114af90b508af37cc1846980fe010853c40ca
2015-06-10 15:09:17 -07:00
Jarda Snajdr
f06270e506
Bug 1159922 - In rule view, update the computed values of a property after editing. r=pbro
2015-06-11 12:18:53 +02:00
B2G Bumper Bot
57974d8a9c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/517f0073f5f7
Author: lissyx <lissyx+github@lissyx.dyndns.org>
Desc: Merge pull request #30507 from lissyx/bug1169861
Bug 1169861 - Ignore holdcamera when lockscreen is locked r=etienne_s
========
https://hg.mozilla.org/integration/gaia-central/rev/a5caf26f085f
Author: Alexandre Lissy <lissyx+github@lissyx.dyndns.org>
Desc: Bug 1169861 - Ignore holdcamera when lockscreen is locked r=etienne_s
2015-06-10 11:20:19 -07:00
Jonathan Griffin
44e3816796
Bug 1166033 - Notice when the process has died, and restart it, r=dburns
2015-06-10 10:24:29 -07:00
Aaron Klotz
5b59e17534
Bug 1170676: Fix null dereference in PluginModuleParent::StreamCast; r=jimm
2015-06-10 11:08:46 -06:00
Kim Moir
cc90f6649e
a=me no bug update mozharness.json to a64e1cbfb998
2015-06-10 12:07:30 -04:00
B2G Bumper Bot
7271dbace0
Bumping manifests a=b2g-bump
2015-06-10 08:52:16 -07:00
B2G Bumper Bot
9117b3689a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/149e5389b756
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #30509 from arcturus/bug-1162769
Bug 1162769
- [Contacts] Importing contacts from Gmail or Outlook wil…
========
https://hg.mozilla.org/integration/gaia-central/rev/cd36c267858e
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1162769
- [Contacts] Importing contacts from Gmail or Outlook will display an 'Imported # contacts' with # = to the # of contacts from most previous SIM contact import r=ferjm
2015-06-10 08:50:20 -07:00
Andrew Osmond
b106718dcb
Bug 1173051 - Minor optimizations for device storage enumerate on parent and child. r=dhylands
2015-06-10 10:23:43 -04:00
Wander Lairson Costa
661f1a34ec
Bug 1173328: Dogfood builds always have "aries" as the platform name. r=garndt a=garndt
...
For dogfood builds, the variant doesn't play a role in the platform
name.
--HG--
extra : commitid : GEhohCuQSOv
extra : amend_source : 9b3b47c26d3d6488e06bf2bca172b6f981128de7
2015-06-10 10:38:37 -03:00
Carsten "Tomcat" Book
13d8c8bc5a
Merge mozilla-central to b2g-inbound
2015-06-10 15:27:48 +02:00
Carsten "Tomcat" Book
6aa1662524
merge mozilla-inbound to mozilla-central a=merge
2015-06-10 15:16:11 +02:00
Carsten "Tomcat" Book
2ff2cc5b39
merge b2g-inbound to mozilla-central a=merge
2015-06-10 15:14:38 +02:00
Georg Fritzsche
978b9197c2
Bug 1173310 - TelemetrySend.jsm is not importing Timer.jsm. r=dexter,a=tomcat
2015-06-10 12:31:44 +02:00
Tim Taubert
0f9a461afd
Bug 1173267 - Remove aOptions parameter from SessionStoreInternal.setTabState() r=Mossop
2015-06-10 11:09:09 +02:00
Jordan Santell
920c29995f
Bug 1172184 - Pull out logic from TimelineActor into a standalone module that can be consumed by other actors.
2015-06-09 22:16:48 -07:00
B2G Bumper Bot
97108ddd92
Bumping manifests a=b2g-bump
2015-06-09 20:32:20 -07:00
B2G Bumper Bot
cc9c8e7c22
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/c33bf7766d1b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30497 from KevinGrandon/bug_1172446_rename_tagged_sanitizer
Bug 1172446 - Rename Tagged to Sanitizer
========
https://hg.mozilla.org/integration/gaia-central/rev/f12cd20f4ba9
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1172446 - Rename Tagged to Sanitizer
2015-06-09 20:30:24 -07:00
B2G Bumper Bot
8d2a6d0401
Bumping manifests a=b2g-bump
2015-06-09 19:57:19 -07:00
B2G Bumper Bot
7400fafdc7
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/252447634b58
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Merge pull request #30443 from sean2449/Bug-1171881-pin-channel
Bug 1171881 - [Stingray][EPG] Pin channels to home through EPG, r=johnhu
========
https://hg.mozilla.org/integration/gaia-central/rev/c9f8e8327255
Author: Sung Chiu <suchiu@mozilla.com>
Desc: Bug 1171881 - [Stingray][EPG] Pin channels to home through EPG
* Add contextmenu to support pin/unpin channels to/from home (Procedure is the same as TVDeck)
* Use IAC to get TVDeck metadata from TVDeck app
* Add test cases
2015-06-09 19:55:23 -07:00
Wes Kocher
29d04186f3
Merge m-c to b2ginbound, a=merge
2015-06-09 19:29:46 -07:00
Wes Kocher
516ac5b38c
Merge b2ginbound to central, a=merge
2015-06-09 19:25:38 -07:00