398449 Commits

Author SHA1 Message Date
Paolo Amadini
18c8d8408d Bug 931776 - Use Downloads.jsm functions to get download directories in Firefox for Android. r=margaret 2014-12-24 18:10:04 +00:00
Gijs Kruitbosch
02652044b5 Bug 1079303 - part 2: fix tests to not expect sync behaviour from notification.reshow, r=dolske 2014-11-25 01:06:36 +00:00
Gijs Kruitbosch
23f90eeccd Bug 1079303 - fix popupnotifications.jsm to not hide its async-ness and immediately dismiss open notifications when another anchor is clicked, r=dolske 2014-11-24 23:54:33 +00:00
Gijs Kruitbosch
a648dfb0cf Backed out changeset c8f1dab5c9e5 (bug 305085) 2014-12-24 16:14:09 +00:00
Gijs Kruitbosch
7536d15fda Backed out changeset 618a0ea01af9 (bug 305085) 2014-12-24 16:14:07 +00:00
Gijs Kruitbosch
eab4ce4ebd Bug 305085 - fix permitUnload usages in tab/window closing so we never show a permitUnload twice for the same page, r=jaws
--HG--
extra : rebase_source : 29d6d43e3ee8d831b3debc97a1e12c422e5c0bb8
extra : histedit_source : cd3004e8f6da17acb8af122b0755bf85e3d8fb0c
2014-12-04 18:10:12 -08:00
Gijs Kruitbosch
9d67d39aaf Bug 305085 - add a test for beforeunload uses, r=jaws
--HG--
extra : rebase_source : 56f5d53be23a811d9a5eeec68a089824f538942b
extra : histedit_source : af42dfab71d3c56a54ff337b0c02e05dde856572
2014-12-19 21:41:57 +00:00
Gregory Szorc
9ebe70267b Bug 930808 - Upgrade to psutil 2.1.3; r=glandium
psutil 2.1.3 is replacing psutil 1.0.1. There are numerous bug fixes and
feature enhancements in psutil worth obtaining.

Source code was obtained from
https://pypi.python.org/packages/source/p/psutil/psutil-2.1.3.tar.gz and
uncompressed into python/psutil without modification except for the
removal of the egg-info directory and the .travis.yml file.

--HG--
extra : source : 697eb6db7d96dc21e817cd27a7e46ed4ab00f9bb
2014-12-23 10:45:15 -08:00
Gregory Szorc
6644cc93eb Bug 930808 - Catch all exceptions when importing psutil; r=glandium
This is the same workaround applied in 7be399d00f9a (bug 908296). It
should stop |make check| from complaining on OS X.

--HG--
extra : rebase_source : 7cf18c8261d375437187a1c256b0b7f8ae0cbb30
extra : amend_source : 952eef1f385962005833c12f643ebb5ea02c93f3
extra : histedit_source : 285bda4330b2997afcc048ecc81f84173d422582
2014-12-23 21:34:01 -08:00
Phil Ringnalda
79da0af62d Backed out changeset 697eb6db7d96 (bug 930808) for OS X make check failures 2014-12-23 21:04:19 -08:00
Richard Newman
a19b9550b2 Bug 1075558 - Fix Notifications.unregisterHandler. r=mcomella 2014-12-23 18:02:20 -08:00
Gregory Szorc
9ee889e5ba Bug 930808 - Upgrade to psutil 2.1.3; r=glandium
psutil 2.1.3 is replacing psutil 1.0.1. There are numerous bug fixes and
feature enhancements in psutil worth obtaining.

Source code was obtained from
https://pypi.python.org/packages/source/p/psutil/psutil-2.1.3.tar.gz and
uncompressed into python/psutil without modification except for the
removal of the egg-info directory and the .travis.yml file.

--HG--
extra : rebase_source : 90b02e514e5dd1249d97d83223ef8fcf20c9da94
extra : histedit_source : 2e96344e1796b6156ccf279684687b2e8995be92
2014-12-23 10:45:15 -08:00
Gregory Szorc
fa97bf9388 Bug 930808 - Upgrade virtualenv to 12.0.2; r=glandium
Source archive downloaded from
https://pypi.python.org/packages/source/v/virtualenv/virtualenv-12.0.2.tar.gz
and uncompressed into python/virtualenv. The egg-info directory was
removed.

--HG--
extra : rebase_source : e96572c694b2e780ed143a08b3c6670273a39fdb
extra : histedit_source : 17d490c968fdadd4dacad3b880bfcb1fc7b3e148
2014-12-23 10:26:10 -08:00
Wes Kocher
c2ed039ff2 Merge m-c to fx-team a=merge CLOSED TREE 2014-12-23 16:56:21 -08:00
Wes Kocher
ab27d8e9b0 Merge inbound to mozilla-central a=merge CLOSED TREE 2014-12-23 16:47:42 -08:00
Wes Kocher
ce6e0dc416 Merge b2g-inbound to mozilla-central a=merge CLOSED TREE 2014-12-23 16:36:48 -08:00
B2G Bumper Bot
d6d3be481e Bumping manifests a=b2g-bump 2014-12-23 13:19:04 -08:00
Ryan VanderMeulen
9efa5f5a79 Backed out changesets 248e0f88fa0a and 41995e096743 (bug 1033952) for B2G debug asserts/crashes. 2014-12-23 16:15:38 -05:00
Richard Newman
494aac9b1b Bug 1115075 - Part 1: add telemetry for DBUtils.ensureDatabaseIsNotLocked. r=mfinkle 2014-12-23 12:58:28 -08:00
Richard Newman
3d54dc2d06 Bug 1115075 - Part 0: rename HistogramAdd -> addToHistogram. r=mfinkle 2014-12-23 12:58:28 -08:00
Richard Newman
cf06fe7534 Bug 1109361 - Handle empty files when loading ProfileInformationCache. r=mcomella 2014-12-23 14:28:46 -08:00
Richard Newman
af9ea30eac Bug 1102604 - SysInfo.getLocale() is wrong. r=mcomella 2014-12-23 14:28:46 -08:00
Nick Alexander
694a293c49 Bug 1115064 - Fix small errors and make Gradle integration work in Android Studio 1.0.2. r=me
The important change here is that we allow the Android-Gradle plugin
to be version 0.14.4 or version 1.0.0, which appears to work in
IntelliJ 14.0.2 and in Android Studio 1.0.2.

Testing feedback came from imjalpreet and garvank.

--HG--
extra : rebase_source : 2b93dd91603666f1c6a1d2fe0fa7721d5741bdda
2014-12-23 11:39:15 -08:00
Kyle Machulis
8c0529c446 Bug 1098220 - Only print exception message in SettingsService in exceptional situations; r=gerard-majax 2014-12-23 11:11:20 -08:00
B2G Bumper Bot
b3a4cb616e Bumping manifests a=b2g-bump 2014-12-23 10:56:54 -08:00
B2G Bumper Bot
2ca81e770d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/71b84df868bb
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #26700 from Delphine/patch-4

Bug 1067554 / Bug Bug 1109383: Adding fi, hy-Am, ee, wo and ln locales t...

========

https://hg.mozilla.org/integration/gaia-central/rev/3023d02b77fd
Author: Delphine <delphine@mozilla.com>
Desc: Bug 1067554 / Bug Bug 1109383: Adding fi, hy-Am, ee, wo and ln locales to Firefox OS
2014-12-23 10:52:15 -08:00
Ryan VanderMeulen
42a3e6c0ea Merge m-c to inbound. a=merge 2014-12-23 13:18:02 -05:00
Ryan VanderMeulen
539cbb2493 Merge inbound to m-c. a=merge 2014-12-23 13:17:16 -05:00
Carsten "Tomcat" Book
405ad2ed16 merge fx-team to mozilla-inbound a=merge 2014-12-23 16:04:26 +01:00
Carsten "Tomcat" Book
5ea9eda8dd merge b2g-inbound to mozilla-central a=merge 2014-12-23 15:50:00 +01:00
Carsten "Tomcat" Book
693c44368a Backed out changeset 39853e6515eb (bug 1073003) for breaking B2G non-unified builds on a CLOSED TREE 2014-12-23 13:36:00 +01:00
Carsten "Tomcat" Book
45a3193668 Backed out changeset 4f6693a2f21b (bug 1073003) 2014-12-23 13:35:23 +01:00
Carsten "Tomcat" Book
ee357ede50 Backed out changeset a12d10d57fd5 (bug 1073003) 2014-12-23 13:35:18 +01:00
Carsten "Tomcat" Book
4d35b56fd1 Backed out changeset 07b42d1d60aa (bug 1073003) 2014-12-23 13:35:17 +01:00
Carsten "Tomcat" Book
6c63afac81 Backed out changeset d778ea49056a (bug 1073003) 2014-12-23 13:35:15 +01:00
Carsten "Tomcat" Book
c892ecf785 Backed out changeset 033bfc2c3483 (bug 1073003) 2014-12-23 13:35:13 +01:00
Carsten "Tomcat" Book
5df02ec579 Backed out changeset a0ef52a09f98 (bug 1073003) 2014-12-23 13:35:11 +01:00
Carsten "Tomcat" Book
d4099a3098 Backed out changeset 42e5e10c44f5 (bug 1073003) 2014-12-23 13:35:07 +01:00
Carsten "Tomcat" Book
bf58b7f6ca Backed out changeset aef3ce3b89b9 (bug 1073003) 2014-12-23 13:35:05 +01:00
Carsten "Tomcat" Book
86c35b85c1 Backed out changeset 3d81c5b78567 (bug 1073003) 2014-12-23 13:35:04 +01:00
Carsten "Tomcat" Book
2ab649cfb7 Backed out changeset ad0bb596da2c (bug 1073003) 2014-12-23 13:35:02 +01:00
Carsten "Tomcat" Book
42f8b57b0a Backed out changeset 4902a8efe178 (bug 1073003) 2014-12-23 13:34:57 +01:00
Carsten "Tomcat" Book
619828717a Backed out changeset 232c0f30075c (bug 1031203) for j1 test failures 2014-12-23 11:51:29 +01:00
Carsten "Tomcat" Book
592726d322 Backed out changeset 776c989112f1 (bug 1031203) 2014-12-23 11:51:08 +01:00
Bobby Holley
51e382d00c Bug 1114830 - Only enter buffering mode when the pending request is waiting for data. r=cpearce a=philor 2014-12-22 20:54:01 -08:00
B2G Bumper Bot
0eec681d66 Bumping manifests a=b2g-bump 2014-12-22 20:19:04 -08:00
B2G Bumper Bot
1c6d57438c Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/51051a09cdd5
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #26953 from dominickuo/bug-1092969

Bug 1092969 - [Music] only enable the text selection in the tiles and list search inputs, r=jimporter

========

https://hg.mozilla.org/integration/gaia-central/rev/29560fe9d77f
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 1092969 - [Music] only enable the text selection in the tiles and list search inputs
2014-12-22 20:18:47 -08:00
Wes Kocher
e9cc9d9d1d Merge inbound to m-c to fix wError bustage a=merge CLOSED TREE 2014-12-22 15:31:29 -08:00
Ryan VanderMeulen
93534bdf01 Merge inbound to m-c. a=merge 2014-12-22 17:55:32 -05:00
Ryan VanderMeulen
f9e95a3452 Merge fx-team to m-c. a=merge 2014-12-22 17:35:26 -05:00