Commit Graph

43521 Commits

Author SHA1 Message Date
Wes Kocher
f9e9d69899 Merge inbound to m-c a=merge CLOSED TREE 2016-11-16 17:07:26 -08:00
Wes Kocher
aa3b64b5f5 Merge autoland to central, a=merge 2016-11-16 16:42:21 -08:00
Wes Kocher
2efcd6796f Bug 1113747 - ESlint followup a=bustage DONTBUILD 2016-11-16 11:00:05 -08:00
Wes Kocher
3d5a132e27 Backed out changeset 6f0fbd9f0a0e (bug 113747) for landing with the wrong bug number a=backout 2016-11-16 10:59:47 -08:00
Wes Kocher
8aa6b455ef Bug 113747 - ESlint followup a=bustage 2016-11-16 10:58:24 -08:00
ffxbld
e2540ea298 No bug, Automated blocklist update from host bld-linux64-spot-013 - a=blocklist-update 2016-11-16 06:23:31 -08:00
Carsten "Tomcat" Book
d2ed86fefb merge autoland to mozilla-central a=merge 2016-11-16 14:04:04 +01:00
ffxbld
fec3f69009 No bug, Automated blocklist update from host bld-linux64-spot-318 - a=blocklist-update 2016-11-15 06:02:26 -08:00
Carsten "Tomcat" Book
8cfa5253e8 merge mozilla-inbound to mozilla-central a=merge 2016-11-15 12:26:41 +01:00
Phil Ringnalda
8304bb1bd5 Backed out changeset 21b69215ab80 (bug 1316870) for forthcoming merge conflicts 2016-11-15 19:53:23 -08:00
Jared Wein
c08df9c1a6 Bug 1316870 - Enable no-shadow eslint rule for browser/. r=mossop
MozReview-Commit-ID: 17vLN6W4BVj

--HG--
extra : rebase_source : cd7807455c2123aa972b34c184a577df84df0f54
2016-11-15 21:09:00 -05:00
Drew Willcoxon
ed42034845 Bug 1113747 - New search UI breaks if too many open search providers are offered. r=florian
Based on an earlier patch by Nihanth Subramanya <nhnt11@gmail.com>

MozReview-Commit-ID: 4TZzFgovIJm

--HG--
extra : rebase_source : 0712c2145bf1c9e86b2c8a5eab0c240991b555e2
2016-11-16 10:00:51 -08:00
Shane Caraveo
d981ec07ec Bug 1311576 fix webrequest filter for tabId and windowId, r=kmag
MozReview-Commit-ID: FzW53LXktWz

--HG--
extra : rebase_source : e19987aa7f2bfa711f07abebaf37b75464508177
2016-11-15 16:34:33 -08:00
Chris Manchester
f6538f4a81 Bug 1313787 - Find relevant dlls on Windows when packaging an artifact build. r=glandium
MozReview-Commit-ID: KJq8ouh6Umi

--HG--
extra : rebase_source : 1fc3f2ca3b70ab8894358349941a177bde3fce0e
2016-11-11 00:20:17 -08:00
Gijs Kruitbosch
40e616f749 Bug 1317268 - fix direction of label in bookmarks/history tooltip in RTL, r=mak
MozReview-Commit-ID: CSzdJ980d3P

--HG--
extra : rebase_source : d370887e1bfbfa05fc3e72433da08c0d3f6ce3f2
2016-11-14 12:01:20 +00:00
Phil Ringnalda
aee7b7f39e Merge m-c to autoland 2016-11-14 20:08:18 -08:00
ffxbld
a2a15254fc No bug, Automated blocklist update from host bld-linux64-spot-1086 - a=blocklist-update 2016-11-14 06:09:12 -08:00
ffxbld
d07aca95ba Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2016-11-14 13:29:32 +01:00
Carsten "Tomcat" Book
c7a033c3e2 merge mozilla-inbound to mozilla-central a=merge 2016-11-14 10:22:06 +01:00
Carsten "Tomcat" Book
163bd81281 merge autoland to mozilla-central a=merge 2016-11-14 10:20:15 +01:00
ffxbld
886d5186f0 No bug, Automated blocklist update from host bld-linux64-spot-319 - a=blocklist-update 2016-11-13 06:05:09 -08:00
ffxbld
ccc9315906 No bug, Automated blocklist update from host bld-linux64-spot-363 - a=blocklist-update 2016-11-12 06:06:55 -08:00
Wes Kocher
cee41d5b80 Merge inbound to central, a=merge 2016-11-11 13:56:45 -08:00
Carsten "Tomcat" Book
04d8c62b62 Merge mozilla-central to autoland 2016-11-11 16:44:44 +01:00
Carsten "Tomcat" Book
1863b25bd6 merge autoland to mozilla-central a=merge 2016-11-11 16:32:08 +01:00
ffxbld
b2c47f0fe0 No bug, Automated blocklist update from host bld-linux64-spot-267 - a=blocklist-update 2016-11-11 06:20:54 -08:00
Carsten "Tomcat" Book
cc5d30c616 Merge mozilla-central to mozilla-inbound
--HG--
extra : rebase_source : 658b3ffdfa71afff2d44129f50e50e2fbecbd06e
2016-11-11 16:43:07 +01:00
Felipe Gomes
554ee6118d Bug 1314429 - Allow every add-on to run on e10s, except those explictly marked with multiprocessCompatible=false. r=mconley
There's also an existing blocklist of add-ons in bootstrap.js that currently only includes TabMixPlus

MozReview-Commit-ID: 5ocmfpxApxn
2016-11-11 13:43:03 -02:00
Carsten "Tomcat" Book
56781b3922 Backed out changeset 9cfc41a2869e (bug 1267810) for eslint failures 2016-11-11 09:08:33 +01:00
Carsten "Tomcat" Book
bff71a740a Backed out changeset 7ef35cccfd7b (bug 1267810) 2016-11-11 09:08:18 +01:00
Wes Kocher
93dca6f437 Backed out changeset 15886f6c3dd1 (bug 1311576) for test_ext_webrequest_filter.html failures a=backout 2016-11-10 23:36:07 -08:00
Alastor Wu
d82876475a Bug 1308153 - part4 : add tooltip for unblock icon. r=jaws
MozReview-Commit-ID: LkfYpYGaG0e

--HG--
extra : rebase_source : e317b178dcd4b95d4d25a2708196a9d3da9e6c0a
2016-11-11 10:43:21 +08:00
Alastor Wu
89935ef264 Bug 1308153 - part3 : implement the logic about showing the unblocking icon. r=jaws
Showing unblocking icon when the tab's media is blocked, and hide the icon when user clicks unblocking icon or opens that tab.

MozReview-Commit-ID: LHxop9qL0uf

--HG--
extra : rebase_source : 57070ab5a3e60561c48f6330dbd26f3ecf52f93e
2016-11-11 10:42:40 +08:00
Alastor Wu
2638d094fd Bug 1308153 - part2 : Add media-unblocking icon. r=jaws
Add the new svg for unblocking icon.
See bug1308399 for more UX details.

MozReview-Commit-ID: 6AYXJsFRQTh

--HG--
extra : rebase_source : 8009f1dbefc4e1b7e480e2eb8bafeefa3bc2d4bc
2016-11-11 10:42:38 +08:00
Alastor Wu
b2b31d2a59 Bug 1308153 - part1 : notify tabbrowser when the tab was blocked. r=baku,jaws
We need to notify tabbrowser about media-blocking so that we can show the unblocking tab icon.
See bug1308399 for more UX details.

MozReview-Commit-ID: E25lEhZLCZk

--HG--
extra : rebase_source : dcb6cb520bb0983010dfcc728f7251994a886612
2016-11-11 10:42:35 +08:00
Matthew Wein
b3b4cd18df Bug 1267810 - Use the new module to implement the omnibox api. r=aswan,robwu
MozReview-Commit-ID: GYzueGSijyd

--HG--
extra : rebase_source : b55464fb90f63317822ba8acd47388ace84e4b96
2016-11-11 02:06:43 +00:00
Matthew Wein
a860065ecd Bug 1267810 - Add a module for registering keywords and handling keyword input sessions. r=adw
MozReview-Commit-ID: Ghqe5xLw67Y

--HG--
extra : rebase_source : 4a319a11cc8f76e24edfccf15256404d3e858087
2016-11-11 12:41:05 +00:00
Matthew Wein
3a3ce1cac9 Bug 1267810 - Use the new module to implement the omnibox api. r=aswan,robwu
MozReview-Commit-ID: GYzueGSijyd

--HG--
extra : rebase_source : 0d35faa215e9a4f675d20a5a4d550a371382464f
2016-11-11 02:06:43 +00:00
Matthew Wein
1dc56d3c39 Bug 1267810 - Add a module for registering keywords and handling keyword input sessions. r=adw
MozReview-Commit-ID: Ghqe5xLw67Y

--HG--
extra : rebase_source : ef23c5eb90a7e882c09736724ed5b63773be061c
2016-11-11 02:06:14 +00:00
Carsten "Tomcat" Book
4b6cab91f9 merge mozilla-inbound to mozilla-central a=merge 2016-11-10 16:59:38 +01:00
Carsten "Tomcat" Book
ebe55e2d67 merge autoland to mozilla-central a=merge 2016-11-10 16:57:59 +01:00
ffxbld
5d1eaca102 No bug, Automated blocklist update from host bld-linux64-spot-555 - a=blocklist-update 2016-11-10 06:09:43 -08:00
djmdev
f08897dbcb Bug 1274860 - Modify getContexts function so that page context is applied properly. r=kmag
--HG--
extra : rebase_source : 62f9766eafa3a8a1e3b0b1f3bc95c22904ec6047
2016-11-11 17:49:44 +05:30
Carsten "Tomcat" Book
846adaea6c merge mozilla-inbound to mozilla-central a=merge 2016-11-09 16:38:04 +01:00
Carsten "Tomcat" Book
61fea2322c merge autoland to mozilla-central a=merge 2016-11-09 16:36:48 +01:00
ffxbld
426cccbbc7 No bug, Automated blocklist update from host bld-linux64-spot-252 - a=blocklist-update 2016-11-09 06:21:47 -08:00
Yoshi Huang
f69409d97b Bug 1315927 - ignore firstPartyDomain and userContextId in PermissionStatus. r=baku 2016-11-09 18:04:31 +08:00
Gijs Kruitbosch
faba7fa1af Bug 1309310 - followup to fix test that's upset, rs=bustage
MozReview-Commit-ID: EeBRAUrE9UK

--HG--
extra : rebase_source : f463dd7b32f1f494261e3385a2ad3d3ffed7850c
2016-11-11 13:09:49 +00:00
Nihanth Subramanya
6c920ce172 Bug 989197 - Strings for alternate UI in cert error pages when a captive portal is active. r=MattN
MozReview-Commit-ID: AQVUJHR4GNk

--HG--
extra : rebase_source : 32775cafe45d7f98ba85f91502a4d3f343fdbd14
2016-11-11 02:02:00 +05:30
Nihanth Subramanya
c80139bad5 Bug 1315969 - Update captive portal notification string to not indicate that we automatically opened the login page. rs=MattN
MozReview-Commit-ID: 1Ug7YDXCdTQ

--HG--
extra : rebase_source : 966bf99bb4e34cb311b37f06a4fb887249d7a811
extra : amend_source : d253df6c3ad2f3d24f5cc34361a37a7b1ca0aa81
2016-11-11 02:08:51 +05:30