diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-25 22:46:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 22:46:40 +0200 |
| commit | 8f354e52d09d1bf2fadfbbfc141d4f32241599a4 (patch) | |
| tree | ca3fcaa2a72700b85221b2fe75bb7d46d5d424ce /browser/app | |
| parent | d5459982f0d1bab08b751dc140c4cbe047032617 (diff) | |
| parent | 72bab89cf6c77c9ee95a977c306e6ce317b84835 (diff) | |
| download | UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar.gz UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar.lz UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.tar.xz UXP-8f354e52d09d1bf2fadfbbfc141d4f32241599a4.zip | |
Merge pull request #386 from MoonchildProductions/revert-381-masterPM28.0.0a2_Unstable
Revert "Remove the Social API"
Diffstat (limited to 'browser/app')
| -rw-r--r-- | browser/app/profile/firefox.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ede62fd5e..e432c511d 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1118,6 +1118,13 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false); // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); +pref("social.sidebar.unload_timeout_ms", 10000); + +// Activation from inside of share panel is possible if activationPanelEnabled +// is true. Pref'd off for release while usage testing is done through beta. +pref("social.share.activationPanelEnabled", true); +pref("social.shareDirectory", "https://activations.cdn.mozilla.net/sharePanel.html"); + // Block insecure active content on https pages pref("security.mixed_content.block_active_content", true); |