d0d66ace26
Bug 1230735 - AddonWatcher.alerts is now a map;r=Felipe
...
--HG--
extra : rebase_source : ca58121921c8630d50774b5170887aa94cb6b6ec
2015-12-14 22:57:13 +01:00
d72068aa11
Bug 1237091. Remove WAP telemetry probe. r=mcmanus
2016-01-06 12:15:41 -06:00
d051a1eb3c
Merge m-c to inbound. a=merge
2016-01-06 09:50:26 -05:00
ceb519e5ff
Merge fx-team to m-c. a=merge
2016-01-06 09:48:18 -05:00
1d22ec87d3
Merge inbound to m-c. a=merge
2016-01-06 09:43:47 -05:00
5be82970fe
Bug 1178304 - Facebook share button in conversation when waiting alone. r=dmose
2016-01-06 10:20:15 +00:00
ce6c1f316c
Merge m-c to b2ginbound, a=merge
...
--HG--
extra : commitid : I9Ga5BF9cFv
2016-01-05 16:53:17 -08:00
5c5db39163
Merge fx-team to m-c a=merge CLOSED TREE
...
--HG--
extra : commitid : 8cnDWzxc5CW
2016-01-05 16:34:06 -08:00
99b0b99f71
Bug 1224703 - part 2: Enable tests on emulator r=billm
2016-01-05 15:37:06 -08:00
c5e6c70005
Bug 1224703 - part 1: fix the way we get the message manager r=fabrice
2016-01-05 15:37:01 -08:00
3a0c205904
Backed out changeset b94d7e7648e1 (bug 1200169) for frequent browser_AddonWatcher.js failures CLOSED TREE a=merge
...
--HG--
extra : commitid : 5m9wrfczrS0
extra : source : 27729c6262ee9a64bf3bc281591637b7f317e62d
2016-01-05 14:26:22 -08:00
2262c1271c
merge mozilla-inbound to mozilla-central a=merge
2016-01-05 11:58:56 +01:00
d27b150c08
Bug 1214462: P3. Add FFmpeg license's link to about:license. r=gerv
2016-01-06 23:03:51 +11:00
854d200e7d
Bug 1236416 - Remove some misc toolkit content UI from Fennec r=margaret
2016-01-04 21:35:13 -05:00
22a2bb5ba7
Bug 1236409 - Remove toolkit impl of XUL prompt for nsICookiePromptService r=margaret
2016-01-04 20:40:00 -05:00
38b4594c7d
Bug 1234099 - Unhide Adobe GMP on Windows XP. r=spohl
2015-12-21 16:06:41 +13:00
9fada46aff
Bug 1109714 - Make the feed subscriber UI work in e10s r=mrbkap,jaws
2016-01-04 18:59:44 -05:00
8a67d78afe
Bug 1200164 - Only do isOfficialTelemetry checks for Telemetry uploads. r=dexter
2015-12-18 19:35:05 +07:00
24b28ec36c
Bug 590127 - Remove toolkit implementation of about:addons r=margaret
2016-01-06 00:49:03 -05:00
d07edece47
Bug 1218942 - Add histogram probe to measure state of different restrictable items in restricted profiles. r=sebastian p=mfinkle
...
--HG--
extra : commitid : 4S8mwn564Qw
extra : rebase_source : 2ce34f4f52b4a08d537cc8ba6ef045f3dd6e98ff
2015-12-24 14:37:29 -05:00
4f7b1b59b7
Merge m-c to fx-team, a=merge
...
--HG--
extra : commitid : DtA94EPxpak
2016-01-05 16:54:04 -08:00
81ee0b7dad
Bug 1237122 - Use base test suite eslintrc files for WebExtension tests. r=trivial
...
--HG--
extra : commitid : LQJzTvLEHsW
2016-01-05 16:10:33 -08:00
7c21dd4518
Bug 1227451: Follow-up: Fix ESLint errors. r=trivial
...
--HG--
extra : commitid : FetQWqfKA2Z
2016-01-05 15:54:32 -08:00
83d60ea279
Bug 1230027 - Stop burnCPOWInSandbox from being GC'd during tests. r=yoric
...
Since no one is holding a reference to the burnCPOWInSandbox function
in the child process, it might get GC'd during the test. Binding it to
the global object should keep the function alive long enough for the
test to call it via CPOW.
--HG--
extra : transplant_source : %60%97%A0%8D%1D%B6%D1G%A0h%2B%11%A9%05%C1%13%25%10cc
2015-12-22 20:15:17 +02:00
52d6f76bb9
Bug 1227451 - chrome.alarms API doesn't check 'alarms' permission. r=billm
2016-01-04 10:21:00 -05:00
586d29faf7
Bug 1233957 - profile selector should set the focus correctly to the accept button, r=ehsan
2016-01-05 14:48:25 +00:00
ae7a25d2a4
Merge mozilla-central to mozilla-inbound
2016-01-05 12:01:44 +01:00
2b6f00954d
Bug 1200169 - Making the slow add-on watcher more tolerant;r=Felipe
...
Showing alerts more than once is annoying for the user and basically
useless. We therefore change a bit our strategy:
- if an add-on has behaved correctly for the last 5 minutes, reset our counter of offences;
- don't display alerts for an add-on more than once per 6 hours.
The only exception is if the add-on freezes the browser (i.e. causes
it to stop for more than 5 seconds at a time), in which case we
display the alert regardless of past offences, up to once per 10
minutes.
--HG--
extra : rebase_source : 7c2a875cc0b68eb2e212abdd6a7c1cf8e30c774e
2015-12-15 11:21:37 +01:00
86f03db916
Bug 1229142: Link browser and toolkit test directory to the shared eslintrc files. r=Standard8
...
--HG--
extra : commitid : CKT2WDkxE4k
extra : rebase_source : 0be50c483317355b1e9af5985d53e85604748432
extra : histedit_source : 65d203f57ebd38b8c130e5db9aaa8ae3f507e7ac
2015-11-30 13:05:00 -08:00
6b2396cfd7
Bug 1235023 - Relax no-multi-spaces Eslint rule with ObjectExpression. r=Gijs
...
--HG--
extra : commitid : 3fACSH0Bv5l
extra : rebase_source : abd1e4cfbd1d67ba4059359e9b2296ad738bdd01
2015-12-30 16:12:17 +01:00
7995665048
Merge m-c to fx-team. a=merge
2016-01-01 19:36:51 -05:00
f93b41b27c
Merge inbound to m-c. a=merge
2016-01-01 19:29:16 -05:00
b8be325607
Bug 1224579 - Allow leading dot in domain in cookies.set. r=billm
...
--HG--
extra : commitid : 3GdmVM5UxFx
extra : rebase_source : 822b37f75aa11d4f35c73d9af1b8aa7931362a15
extra : amend_source : 6a5e52d627a2c11dc1cad8c95a89aa3648921ef8
2015-12-21 07:14:00 -08:00
a49250b7f4
Bug 1234755: Follow-up: Fix additional failures. r=trivial
...
--HG--
extra : commitid : 4Ef0fj48IPr
extra : amend_source : 839e710a618fc403c156e79e80d91276aa9a0f1d
2015-12-31 16:17:00 -08:00
fbbdff2da8
Bug 1224579: [webext] Fix the handling of domain cookies. r=evilpie
...
--HG--
extra : commitid : 90fX4lH7xMk
extra : rebase_source : a553deb3f3f8863d8aa0712ba0b7e286f22fa619
2015-12-23 11:18:38 -05:00
a31ad54f9b
Bug 1234755: [webext] Make JS in HTML files pass ESLint. r=billm
...
This also changes the `type` attribute in our script tags to text/javascript,
since that's currently all the eslint-html plugin supports.
--HG--
extra : commitid : GiKqZCFKBda
extra : rebase_source : bc50d3724e4bcb6b5fd9faa5283fa04c72c21724
2015-12-22 23:43:23 -05:00
d29d7963fa
Bug 1207890 - Post: Hacks to make --disable-compile-environment work on Mac OS X. r=glandium
...
--HG--
extra : commitid : BJ6pEARC8bF
extra : rebase_source : 6fb8638fc55c0f402fbe011b8fd10904a4681d13
2015-12-23 16:50:47 -08:00
6bad741446
Bug 1231518. Load about:blank if thumbnail service fails. r=adw
2016-01-04 16:24:58 -08:00
923addc829
Bug 1235066 - SVG elements should not display title attributes as tooltips. r=enndeakin
2016-01-04 22:16:23 +00:00
57bef6b196
Bug 1232219 (part 3) - Fix remaining -Wunused warnings. r=glandium.
...
--HG--
extra : rebase_source : 357474b4c7729b78a3030dfefd720aad4e1b2576
2015-12-16 22:57:51 -08:00
e0dc3b7265
Merge m-c to inbound, a=merge CLOSED TREE
...
--HG--
extra : commitid : 4JS7aaOzaVD
extra : amend_source : 249ac0feaf4a6ea8ad5d2ef9de63d4c5baee012b
2016-01-05 16:52:09 -08:00
42614dcf9a
Backed out changeset b94d7e7648e1 (bug 1200169) for frequent browser_AddonWatcher.js failures CLOSED TREE
...
--HG--
extra : commitid : 74M37BsgWfU
2016-01-05 14:26:22 -08:00
59f626fe96
Bug 1232780 - Disable mochitests which fail on e10s so we can get that suite running, a=test-only
2016-01-05 12:02:47 -08:00
91f6d2449c
Bug 1227300, Part 4 - Implement `showAlert` for the libnotify alerts backend. r=karlt
...
--HG--
extra : commitid : LTTy50oCXfw
extra : rebase_source : 025b682fad77f853b72d930b0e975e2fa5cf39bc
2015-12-31 12:13:27 -07:00
87582e390a
Bug 1227300, Part 2 - Implement `showAlert`. r=MattN,wchen
...
--HG--
extra : commitid : HrMh88lKFVK
extra : rebase_source : e8a8def77f0e12152ecb48986f3c1a850d6ac9c4
2015-12-31 12:04:24 -07:00
0d37a8bacb
Bug 1227300, Part 1 - Add an alert notification component. r=MattN,wchen
...
--HG--
extra : commitid : Jd0utRQq7sC
extra : rebase_source : 1ff47988d3e031af5fb7169e2c604b3dbf76c2d8
2015-12-03 08:44:25 -08:00
a3a5bda88d
Merge inbound to m-c a=merge
...
--HG--
extra : commitid : LoYhgKpsXCV
2015-12-30 17:34:05 -08:00
d518830bd1
Bug 1235061 - Create histogram probe to measure how often users have zoomed view enabled/disabled. r=mfinkle p=vladan
...
--HG--
extra : commitid : KD4RdbOwTZO
extra : rebase_source : 43607b5dfce37c495578fdd62e39802061fd5577
extra : amend_source : 80b97e3d2fa0de7c39fe55665b24ae9918eb78e8
2015-12-24 13:58:21 -05:00
a3c6a0004c
Bug 1234936 - part 2: always focus tabs when they show an onbeforeunload dialog, r=billm
...
--HG--
extra : commitid : KValcdxvJt8
extra : rebase_source : f10dd511583205a4f6801e1a7d93fa7b97bd17dd
extra : histedit_source : 98b663def3645375e9c39fe2557f6550f3e6e659
2015-12-29 18:49:27 +00:00
aa5ce3db49
merge mozilla-inbound to mozilla-central a=merge
2015-12-30 12:00:03 +01:00
David Rajchenbach-Teller
Mike Taylor
Ryan VanderMeulen
Fernando Campo
Wes Kocher
Fabrice Desré
Bill McCloskey
Carsten "Tomcat" Book
Jean-Yves Avenard
Mark Finkle
Chris Pearce
George Wright
Georg Fritzsche
Margaret Leibovic
Kris Maglione
Sami Jaktholm
Luca Greco
Andrea Marchesini
Dave Townsend
Marco Bonardo
Tom Schuster
Nick Alexander
Mason Chang
Robert Longson
Nicholas Nethercote
Jonathan Griffin
Kit Cambridge
Gijs Kruitbosch