Ryan VanderMeulen
f93b41b27c
Merge inbound to m-c. a=merge
2016-01-01 19:29:16 -05:00
Matthew Noorenberghe
42c5460e46
Bug 1229076 - Follow-up to remove leftover component references for the C++ Edge Reading List Migrator. r=bustage
...
--HG--
extra : commitid : FWCWkBs2E4h
2016-01-01 16:24:33 -05:00
Gijs Kruitbosch
e0cb4c6f0e
Bug 1229076 - use JS module for reading ESE database, r=MattN
...
--HG--
extra : commitid : 6bOAdWBbIzZ
extra : rebase_source : ab98cabe12a9018150eec86a7a540890164c324f
extra : amend_source : b9c668f02b2212749680353399e1b4c414ed3958
2015-12-01 20:24:54 +00:00
Kris Maglione
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
Shane Caraveo
eabb5f6400
Bug 1215694 move pocket to a system addon, r=Gijs, r=glandium
...
part 1: reorganize file locations, r=Gijs
part 2: remove built-in pocket code, r=Gijs
part 3: l10n support, r=glandium
part 4: move code/functionality from part 2 into the addon, r=Gijs
part 5: remove dead code, r=Gijs
part 6: create a simple api for addons to add to reader mode, r=Gijs
part 7: various test fixes related to cui behaviour and pocket, r=me
--HG--
rename : browser/components/pocket/Pocket.jsm => browser/extensions/pocket/content/Pocket.jsm
rename : browser/components/pocket/main.js => browser/extensions/pocket/content/main.js
rename : browser/components/pocket/panels/css/firasans.css => browser/extensions/pocket/content/panels/css/firasans.css
rename : browser/components/pocket/panels/css/normalize.css => browser/extensions/pocket/content/panels/css/normalize.css
rename : browser/components/pocket/panels/css/saved.css => browser/extensions/pocket/content/panels/css/saved.css
rename : browser/components/pocket/panels/css/signup.css => browser/extensions/pocket/content/panels/css/signup.css
rename : browser/components/pocket/panels/fonts/FiraSans-Regular.woff => browser/extensions/pocket/content/panels/fonts/FiraSans-Regular.woff
rename : toolkit/themes/shared/reader/pocket.svg => browser/extensions/pocket/content/panels/img/pocket.svg
rename : browser/components/pocket/panels/img/pocketerror@1x.png => browser/extensions/pocket/content/panels/img/pocketerror@1x.png
rename : browser/components/pocket/panels/img/pocketerror@2x.png => browser/extensions/pocket/content/panels/img/pocketerror@2x.png
rename : browser/components/pocket/panels/img/pocketlogo@1x.png => browser/extensions/pocket/content/panels/img/pocketlogo@1x.png
rename : browser/components/pocket/panels/img/pocketlogo@2x.png => browser/extensions/pocket/content/panels/img/pocketlogo@2x.png
rename : browser/components/pocket/panels/img/pocketlogosolo@1x.png => browser/extensions/pocket/content/panels/img/pocketlogosolo@1x.png
rename : browser/components/pocket/panels/img/pocketlogosolo@2x.png => browser/extensions/pocket/content/panels/img/pocketlogosolo@2x.png
rename : browser/components/pocket/panels/img/pocketmenuitem16.png => browser/extensions/pocket/content/panels/img/pocketmenuitem16.png
rename : browser/components/pocket/panels/img/pocketmenuitem16@2x.png => browser/extensions/pocket/content/panels/img/pocketmenuitem16@2x.png
rename : browser/components/pocket/panels/img/pocketsignup_button@1x.png => browser/extensions/pocket/content/panels/img/pocketsignup_button@1x.png
rename : browser/components/pocket/panels/img/pocketsignup_button@2x.png => browser/extensions/pocket/content/panels/img/pocketsignup_button@2x.png
rename : browser/components/pocket/panels/img/pocketsignup_devices@1x.png => browser/extensions/pocket/content/panels/img/pocketsignup_devices@1x.png
rename : browser/components/pocket/panels/img/pocketsignup_devices@2x.png => browser/extensions/pocket/content/panels/img/pocketsignup_devices@2x.png
rename : browser/components/pocket/panels/img/pocketsignup_hero@1x.png => browser/extensions/pocket/content/panels/img/pocketsignup_hero@1x.png
rename : browser/components/pocket/panels/img/pocketsignup_hero@2x.png => browser/extensions/pocket/content/panels/img/pocketsignup_hero@2x.png
rename : browser/components/pocket/panels/img/signup_firefoxlogo@1x.png => browser/extensions/pocket/content/panels/img/signup_firefoxlogo@1x.png
rename : browser/components/pocket/panels/img/signup_firefoxlogo@2x.png => browser/extensions/pocket/content/panels/img/signup_firefoxlogo@2x.png
rename : browser/components/pocket/panels/img/signup_help@1x.png => browser/extensions/pocket/content/panels/img/signup_help@1x.png
rename : browser/components/pocket/panels/img/signup_help@2x.png => browser/extensions/pocket/content/panels/img/signup_help@2x.png
rename : browser/components/pocket/panels/img/signup_or@1x.png => browser/extensions/pocket/content/panels/img/signup_or@1x.png
rename : browser/components/pocket/panels/img/signup_or@2x.png => browser/extensions/pocket/content/panels/img/signup_or@2x.png
rename : browser/components/pocket/panels/img/tag_close@1x.png => browser/extensions/pocket/content/panels/img/tag_close@1x.png
rename : browser/components/pocket/panels/img/tag_close@2x.png => browser/extensions/pocket/content/panels/img/tag_close@2x.png
rename : browser/components/pocket/panels/img/tag_closeactive@1x.png => browser/extensions/pocket/content/panels/img/tag_closeactive@1x.png
rename : browser/components/pocket/panels/img/tag_closeactive@2x.png => browser/extensions/pocket/content/panels/img/tag_closeactive@2x.png
rename : browser/components/pocket/panels/js/messages.js => browser/extensions/pocket/content/panels/js/messages.js
rename : browser/components/pocket/panels/js/saved.js => browser/extensions/pocket/content/panels/js/saved.js
rename : browser/components/pocket/panels/js/signup.js => browser/extensions/pocket/content/panels/js/signup.js
rename : browser/components/pocket/panels/js/tmpl.js => browser/extensions/pocket/content/panels/js/tmpl.js
rename : browser/components/pocket/panels/js/vendor/handlebars.runtime.js => browser/extensions/pocket/content/panels/js/vendor/handlebars.runtime.js
rename : browser/components/pocket/panels/js/vendor/jquery-2.1.1.min.js => browser/extensions/pocket/content/panels/js/vendor/jquery-2.1.1.min.js
rename : browser/components/pocket/panels/js/vendor/jquery.tokeninput.min.js => browser/extensions/pocket/content/panels/js/vendor/jquery.tokeninput.min.js
rename : browser/components/pocket/panels/license.txt => browser/extensions/pocket/content/panels/license.txt
rename : browser/components/pocket/panels/saved.html => browser/extensions/pocket/content/panels/saved.html
rename : browser/components/pocket/panels/signup.html => browser/extensions/pocket/content/panels/signup.html
rename : browser/components/pocket/panels/tmpl/saved_premiumextras.handlebars => browser/extensions/pocket/content/panels/tmpl/saved_premiumextras.handlebars
rename : browser/components/pocket/panels/tmpl/saved_premiumshell.handlebars => browser/extensions/pocket/content/panels/tmpl/saved_premiumshell.handlebars
rename : browser/components/pocket/panels/tmpl/saved_shell.handlebars => browser/extensions/pocket/content/panels/tmpl/saved_shell.handlebars
rename : browser/components/pocket/panels/tmpl/signup_shell.handlebars => browser/extensions/pocket/content/panels/tmpl/signup_shell.handlebars
rename : browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars => browser/extensions/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars
rename : browser/components/pocket/pktApi.js => browser/extensions/pocket/content/pktApi.jsm
rename : browser/locales/en-US/chrome/browser/browser-pocket.properties => browser/extensions/pocket/locales/en-US/pocket.properties
2015-12-29 15:40:52 -08:00
Ehsan Akhgari
e6e0501a06
Bug 1175659 - Increase the timeout of browser_sessionHistory.js
2015-12-31 17:42:28 -05:00
Ehsan Akhgari
19f515547b
Bug 1170881 - Increase the timeout of browser_586068-apptabs.js
2015-12-31 17:41:25 -05:00
Ehsan Akhgari
46a0be4a93
Bug 1207351 - Increase the timeout of browser_975719_customtoolbars_behaviour.js
2015-12-31 17:36:33 -05:00
Ehsan Akhgari
2f9e71d6b5
Bug 1101300 - Increase the timeout of browser_970511_undo_restore_default.js
2015-12-31 17:35:47 -05:00
Ehsan Akhgari
c5ba70be3a
Bug 1184150 - Increase the timeout of browser_bootstrapped_custom_toolbar.js
2015-12-31 17:35:20 -05:00
Ehsan Akhgari
d7cfc7c09f
Bug 1162761 - Increase the timeout of browser_938980_navbar_collapsed.js
2015-12-31 17:29:44 -05:00
Ehsan Akhgari
8679055963
Bug 1203732 - Increase the timeout of browser_522545.js
2015-12-31 17:29:26 -05:00
Ehsan Akhgari
c9cf809f36
Bug 1224066 - Increase the timeout of browser_formdata_cc.js
2015-12-31 17:28:22 -05:00
Ehsan Akhgari
a7d06a4cb4
Bug 1225698 - Increase the timeout of browser_privacypane_4.js
2015-12-31 17:25:13 -05:00
Ehsan Akhgari
d30a731cc8
Bug 1229248 - Increase the timeout of browser_ext_tabs_query.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
6bd3322851
Bug 1230439 - Increase the timeout of browser_ext_tabs_executeScript_good.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
b0f5bc7ec2
Bug 1224087 - Increase the timeout of browser_ext_tabs_onUpdated.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
5181cfbb4f
Bug 1164242 - Increase the timeout of browser_600545.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
ce68c60e50
Bug 1215768 - Increase the timeout of browser_cookies_exceptions.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
5185a3fdd0
Bug 1221013 - Increase the timeout of browser_crashedTabs.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
7c0246cea3
Bug 1212418 - Increase the timeout of browser_880164_customization_context_menus.js
2015-12-30 22:27:40 -05:00
Ehsan Akhgari
4cca37e414
Bug 1215768 - Increase the timeout of browser_cookies_exceptions.js
2015-12-30 22:27:40 -05:00
Olli Pettay
2b2b2cc690
Bug 1155730, implement History.scrollRestoration r=jst
2015-12-26 12:59:09 +02:00
Ryan VanderMeulen
9a3523097f
Merge fx-team to m-c. a=merge
2015-12-25 20:33:39 -05:00
Andrew McCreight
0f12a580d4
Backed out changeset 18eec0849a1f (Bug 1195295) for leaking.
...
This changeset is causing shutdown leaks (bug 1234697 and bug 1220517).
2015-12-23 15:59:15 -05:00
Wes Kocher
1f00d8d838
Backed out 4 changesets (bug 1218996) for talos svg failures CLOSED TREE
...
Backed out changeset ba750628c4f3 (bug 1218996)
Backed out changeset 2205cce34824 (bug 1218996)
Backed out changeset 9410cbc0545e (bug 1218996)
Backed out changeset 7839222071ac (bug 1218996)
--HG--
extra : commitid : Ju4TBTVoAIr
2015-12-23 11:09:05 -08:00
Bill McCloskey
a2c4e965e2
Bug 1208257 - [webext] context_menus.json (r=kmag)
2015-12-23 08:57:13 -08:00
Bill McCloskey
63346aac54
Bug 1208257 - [webext] page_action.json (r=kmag)
2015-12-23 08:57:13 -08:00
Bill McCloskey
a3d3a41850
Bug 1208257 - [webext] browser_action.json (r=kmag)
2015-12-23 08:57:13 -08:00
Bill McCloskey
75122447dd
Bug 1208257 - [webext] bookmarks.json (r=kmag)
2015-12-23 08:57:13 -08:00
Olivier Yiptong
c04bec08b0
Bug 1218996 - Allow Remote New Tab to ride release trains r=marcosc
...
--HG--
extra : rebase_source : f8df0d27eddf8e4d112d7fa8e954c08f38f22069
2015-12-21 16:14:38 -05:00
Olivier Yiptong
e725cd46a8
Bug 1218996 - Remove now redundant messaging code for remote newtab r=marcosc
...
--HG--
extra : rebase_source : b79e21fb4898742b2e8ccefd4309f6eea2bd5ff5
2015-12-21 16:14:33 -05:00
Olivier Yiptong
6070b36fc1
Bug 1218996 - Fuse aboutNewTabService and RemoteNewTabLocation and return resource URLS r=marcosc,oyiptong
...
--HG--
extra : rebase_source : 15564dee02ae241c7f563ba7e362c5c2e0f37ded
2015-12-21 16:14:29 -05:00
Olivier Yiptong
b27d95d0b3
Bug 1218996 - AboutRedirector uses aboutNewTabService exclusively for about:newtab r=marcosc,mconley
...
--HG--
extra : rebase_source : 0fff8d01aa58f86c018dc2c2e73490f3b8fe8e9a
2015-12-21 16:14:23 -05:00
Kris Maglione
589f766eac
Bug 1230776: Fix ESLint failures in HTML test files. r=trivial
...
--HG--
extra : commitid : EXptoLWcoGy
extra : rebase_source : b5cd56ccd779abe263c7b6f5351736c7c1726f82
2015-12-22 22:26:36 -05:00
Mark Hammond
2fc3a1793d
Bug 1234199 - fix mobile promo links in synced tabs menu. r=adw
2015-12-23 08:57:46 +11:00
Carsten "Tomcat" Book
f39a0181bb
merge fx-team to mozilla-central a=merge
2015-12-21 11:50:09 +01:00
Markus Stange
8d6e827631
Bug 1209970 - Fire scroll events early in the refresh tick. r=mats
...
With APZ we want to be firing scroll events to content more consistently, so
we tie them to the refresh driver tick rather than firing them on paint or
haphazardly on the next spin of the event loop.
Patch by Markus Stange, test fixes by Kartikaya Gupta
--HG--
extra : commitid : 7nnkRC8afAJ
2015-12-17 17:19:30 -05:00
Carsten "Tomcat" Book
a77b9d40f7
merge mozilla-inbound to mozilla-central a=merge
2015-12-16 12:01:46 +01:00
Chris Rafuse
638a0198fc
Bug 1219158 - update Hello FTU panel height, r=mikedeboer
2015-12-15 16:28:27 -08:00
Wes Kocher
dcd5150ad9
Merge m-c to inbound, a=merge
...
--HG--
extra : commitid : wg0tOahMU6
2015-12-15 15:52:44 -08:00
Gijs Kruitbosch
e1743f0fb6
Bug 1225800 - only import items that have valid URLs, r=MattN
...
--HG--
extra : commitid : 1P2Spaxd6iT
extra : rebase_source : 9e73392a354a02d2b65d5fa9e4906eee8600e6ac
2015-12-10 12:27:52 -05:00
Dave Townsend
9c612a4946
Bug 1231828: Fix JS parsing errors in toolkit and browser XBL files. r=felipe
...
--HG--
extra : commitid : Ig2Yj9oB8m5
extra : rebase_source : 9a83b71125ccbb482e51b649ca09a6c348a5c111
2015-12-10 16:53:46 -05:00
Kit Cambridge
f9c7a31d28
Bug 1219030 - Collect notification management telemetry. r=wchen,MattN; p=ally
...
--HG--
extra : commitid : JvHyMCNBrk9
extra : amend_source : 72c46fbd3ead7ed3f101dd98114cb435a691c706
2015-11-13 21:22:59 -08:00
Alessio Placitelli
f6771c3cb0
Bug 1234491 - Remove FHR's UITourMetricsProvider. r=gps
2015-12-23 00:52:00 +01:00
Jim Mathies
44fade98a9
Bug 1232368 - If accessibility recently ran, don't prompt to try e10s. r=felipe
2015-12-14 15:32:54 -06:00
Jim Mathies
295c22e49a
Bug 1232408 - E10SAccessibilityCheck relies on incorrect AppConstants variable XP_WIN. r=felipe
2015-12-14 15:32:44 -06:00
Phil Ringnalda
f61cbd01dd
Merge m-i to m-c, a=merge
2015-12-11 21:20:03 -08:00
Steve Fink
23b3232cce
Bug 1231879 - Fix tests: getElementById returns null on failure, not undefined, r=mrbkap
...
--HG--
extra : source : c54865e0b60bc496bbcfc61eefceb4690726e123
extra : amend_source : 5991d2c0b81cfbb7e2284d9968a6bd4fe723c5e3
2015-12-10 21:49:18 -08:00
Carsten "Tomcat" Book
8c8e1c0526
Merge mozilla-central to mozilla-inbound
2015-12-11 11:42:10 +01:00