Commit Graph

8471 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
42b456808a merge fx-team to mozilla-central a=merge 2014-07-17 16:31:33 +02:00
Bill McCloskey
c5dad44ba0 Bug 1024391 - Fix popup blocking bug (r=felipe) 2014-07-16 23:05:17 -07:00
Wes Kocher
ac9763a813 Bug 1017273 - Fix merge conflicts to help fix the CLOSED TREE 2014-07-16 21:32:46 -07:00
Wes Kocher
a6eb8171b1 NO BUG - Fix mistake introduced in a merge to fix this CLOSED TREE 2014-07-16 21:15:04 -07:00
Shane Caraveo
90b5356528 Bug 1036581 add telemetry probes to social buttons and sidebar, r=dolske 2014-07-16 19:15:02 -07:00
Wes Kocher
6dc0a1cdb8 Merge m-c to fx-team 2014-07-16 17:46:33 -07:00
Dão Gottwald
e38c455134 Bug 1037017 - Remove cui-areatype from removable=false widgets. r=gijs 2014-07-16 22:04:06 +02:00
Trishul Goel
7a685663c3 Bug 1038604 - Rename disableMCB to allowMixedContent. r=dao 2014-07-16 22:03:15 +02:00
Mark Banner
793348cd7b Follow up to bug 1017273 - Move the loop-call-button to the correct place in the toolbar to match its default position. rs=gijs 2014-07-16 15:15:08 +01:00
Mark Banner
2c1e0f5872 Bug 1017273 Change Loop from compile-time enabled to runtime-enabled with a pref. r=dolske,r=jesup,r=glandium,r=gijs 2014-07-16 15:15:07 +01:00
Alexander Seleznev
a198316ce9 Bug 1038607 - Fix text color in search field on about:newtab page. r=dao 2014-07-15 03:39:00 +02:00
Tom Schuster
4e27ccd62e Bug 673569 - Let each frame script have its own scope (r=smaug) 2014-06-13 19:56:38 +02:00
Mark Hammond
f49b194318 Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
Mark Hammond
133f66860f Bug 1013064 (part 1) - prompt for master-password unlock when interacting with about:accounts. r=ttaubert
From 18f9d132020afee6004e63c9006245e4d3b04e18 Mon Sep 17 00:00:00 2001
---
 browser/base/content/aboutaccounts/aboutaccounts.js | 9 +++++++++
 1 file changed, 9 insertions(+)
2014-06-11 17:34:24 +10:00
Carsten "Tomcat" Book
4457b01a36 merge fx-team to mozilla-central a=merge 2014-07-15 16:08:30 +02:00
Allison Naaktgeboren
4eb98e74f5 Bug 693555 - Update inline spellchecker underlining for multiprocess(e10s).r=ehsan, mrbkap 2014-07-01 15:24:27 -07:00
Wes Kocher
0c43bada3a Backed out changeset 8673477f5fc2 (bug 862563) for Windows mochitest-5 failures 2014-07-11 17:00:08 -07:00
Georg Fritzsche
a517f367e0 Bug 862563 - Remove implicit acceptance for data reporting notification and notify on first run; r=gps
The data reporting notification was over-complicated. It wasn't
displayed for +24hr after first run and it had a weird, non-required
policy around what constituted acceptance of the policy.

The notification is now shown shortly after first startup.

The logic around "notification accepted" has been greatly simplified by
rolling it into "notification shown." Where we once were checking
whether the notification has been "accepted," we now check whether it
has been displayed. The overly complicated logic around the implicit
acceptance of the policy has also been removed.

The end result is the code for managing the state of the notification is
greatly simplified.

--HG--
extra : rebase_source : 808efdf1edd103552f6aa10b5c4309b64e514773
extra : amend_source : e4252e6a850a348d1b5aca733121dd07cbc6a70a
extra : histedit_source : 10ec20a07677674a8c9a705a3ffb4dc46a22b890%2Ca9442934d5964f16e9ad1101b786b4d094ac228d
2014-07-09 14:32:29 -07:00
Shane Caraveo
e6c852f5dd Bug 926417 add microdata support for share/marks, r=markh, r=felipe 2014-07-11 08:50:34 -07:00
Dão Gottwald
f72e42203b Bug 1034845 - Re-enable pasting data URIs to the location bar. r=gijs
--HG--
extra : rebase_source : e03b3d39e47dd1c917e0e343621d8c51f500685e
2014-07-11 00:39:55 +02:00
Gijs Kruitbosch
ba4ae2ee67 Bug 577892 - allow icons to change when href attribute is set directly, with automated test, r=dolske,bz
--HG--
extra : rebase_source : 8b74cb3e4c60df4b84c207f2ae1bc371e238d19d
2014-07-03 22:40:52 +01:00
Ryan VanderMeulen
6199750f94 Merge inbound to m-c on a CLOSED TREE. a=merge 2014-07-10 18:22:38 -04:00
Adam Roach [:abr]
db9c984ac9 Bug 1015486 Bypass the video and audio permission prompts for Loop, as Loop will provide its own mechanisms. Patch by abr, tests by Standard8. r=jesup,r=florian 2014-07-10 21:14:57 +01:00
Gijs Kruitbosch
8e02226b89 Bug 1014313 - part 3: add labels specifically for this context menu, r=dao 2014-07-09 22:59:43 +01:00
Carsten "Tomcat" Book
5442e17dfc merge fx-team to mozilla-central a=merge 2014-07-10 14:54:35 +02:00
Ed Lee
bd1da84e4a Bug 1036280 - Newly added links are type=undefined instead of history [r=adw]
Include history type and make link creation the same by removing bgColor/imageURI.
2014-07-09 21:16:48 -07:00
Gijs Kruitbosch
48df14e59a Bug 1014313 - part 2: add undo close tab item to alltabs-button menu, r=dao 2014-07-03 00:17:15 +01:00
Carsten "Tomcat" Book
5789eb261c Merge mozilla-central to fx-team 2014-07-10 15:15:52 +02:00
Drew Willcoxon
90052e7eb6 Bug 1005601 - "gContextMenu is null" thrown for first textarea context menu in a window. r=Gijs 2014-07-10 03:31:04 -07:00
Carsten "Tomcat" Book
ea15fbd89c Merge mozilla-central to fx-team 2014-07-09 16:15:17 +02:00
Carsten "Tomcat" Book
8d6946d993 merge fx-team to mozilla-central a=merge
--HG--
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/css/ot.min.css => browser/components/loop/content/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png => browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif => browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js => browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js
2014-07-09 16:05:08 +02:00
Shane Caraveo
aedc3b6357 Bug 1029942 allow activation from about: chrome urls, r=felipe 2014-07-08 16:48:12 -07:00
Gijs Kruitbosch
b8ef5bf613 Bug 1014313 - part 1: add tabs options to tabstrip context menu, r=dao 2014-07-02 23:23:48 +01:00
Wes Kocher
267a796ba5 Backed out changeset ca2fd67a4cf7 (bug 1029942) for bc1 orange 2014-07-08 15:11:31 -07:00
Shane Caraveo
99408869c7 Bug 1029942 allow activation from about: chrome urls, r=felipe 2014-07-08 13:50:13 -07:00
Gijs Kruitbosch
8c6a9eaae3 Bug 987230 - use consumeanchor attribute to fix button click, r=enn,mconley
--HG--
extra : rebase_source : 8e52a377eeb708e258f0190fcbc5902c5477c2b8
2014-07-01 01:09:43 +01:00
Blake Kaplan
7b09b38e37 Bug 1001957 - Don't use a CPOW for reload. r=felipe/mccr8/smaug
Original patch from billm.
2014-07-08 18:27:59 -07:00
Wes Kocher
22e853cb38 Backed out changeset 76a96d6f0330 (bug 1001957) for mochitest-2 bustage on a CLOSED TREE 2014-07-08 17:55:35 -07:00
Blake Kaplan
4767b88b60 Bug 1001957 - Don't use a CPOW for reload. r=felipe/mccr8/smaug
Original patch from billm.
2014-07-08 16:19:10 -07:00
Mark Banner
50bafcdcd0 Fix packaged unit test bustage from bug 1032469. rs=bustage fix for CLOSED TREE 2014-07-08 21:11:06 +01:00
Mark Banner
2a1f3ed8fe Bug 1032469 Update Loop to OpenTok library v2.2.6. rs=gijs for test change,r=abr
--HG--
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/css/ot.min.css => browser/components/loop/content/libs/sdk-content/css/ot.css
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-copy-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-copy-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-denied-firefox.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-denied-firefox.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-predenied-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-predenied-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/access-prompt-chrome.png => browser/components/loop/content/libs/sdk-content/images/rtc/access-prompt-chrome.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-publisher.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-publisher.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/audioonly-subscriber.png => browser/components/loop/content/libs/sdk-content/images/rtc/audioonly-subscriber.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/buttons.png => browser/components/loop/content/libs/sdk-content/images/rtc/buttons.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/loader.gif => browser/components/loop/content/libs/sdk-content/images/rtc/loader.gif
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/mic-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/mic-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-off.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-off.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/images/rtc/speaker-on.png => browser/components/loop/content/libs/sdk-content/images/rtc/speaker-on.png
rename : browser/components/loop/content/libs/otcdn/webrtc/v2.2.5/js/dynamic_config.min.js => browser/components/loop/content/libs/sdk-content/js/dynamic_config.min.js
2014-07-08 19:40:59 +01:00
Ryan VanderMeulen
e68b639905 Merge m-c to inbound. a=merge 2014-07-09 16:16:12 -04:00
Birunthan Mohanathas
124259226c Bug 1024668 - Wait for initial payload event in healthreport_testRemoteCommands.html. r=wchen 2014-07-14 12:35:30 -07:00
Neil Deakin
7f3b5b5800 Bug 1027057, use correct origin for arrowpanel animations in rtl, r=dao 2014-07-14 13:39:04 -04:00
Birunthan Mohanathas
3c00cc1470 Bug 994708 - Part 2: Record submission event for plugin crashes. r=gps 2014-07-09 08:14:42 -07:00
David Keeler
e5399ce31b bug 1034270 - test adding a certificate exception via about:certerror r=felipe 2014-07-07 15:32:34 -07:00
David Keeler
e99adf1589 bug 1034270 - expose the channel that failed to load to onAboutCertError in browser.js r=felipe 2014-07-07 15:33:07 -07:00
Marco Bonardo
0383cc2ef4 Bug 1023292 - split up browser_popupNotification.js r=adw,MattN
--HG--
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_2.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_3.js
rename : browser/base/content/test/general/browser_popupNotification.js => browser/base/content/test/popupNotifications/browser_popupNotification_4.js
rename : browser/base/content/test/general/head.js => browser/base/content/test/popupNotifications/head.js
2014-07-06 10:14:48 +02:00
Dão Gottwald
9ae37d3736 Bug 1034077 - Location bar shouldn't strip whitespace when pasting. r=Gijs 2014-07-04 17:16:55 +02:00
Tim Taubert
59aa45bbe8 Bug 1032243 - about:newtab should use native Promise implementation r=adw 2014-07-02 16:38:20 -07:00