dcd5150ad9
Merge m-c to inbound, a=merge
...
--HG--
extra : commitid : wg0tOahMU6
2015-12-15 15:52:44 -08:00
d179d6529b
Bug 1230831 - fix treatment of tabs with no group information, r=mconley
...
--HG--
extra : commitid : 5MCJ6ORdoaJ
extra : rebase_source : 3a554a60593b1164fed76fde9074cadbcfe230f3
2015-12-14 13:49:13 +00:00
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
e70ec2d790
Merge m-c to m-i
2015-12-14 22:22:33 -08:00
1d2b3f2fb6
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
2015-12-14 15:15:51 -05:00
9fefd487d5
Bug 1232196 - Update pdf.js to version 1.3.76. r=bdahl
2015-12-13 11:15:26 -05:00
4afea84f23
Bug 1231553 - Inset shadow makes most of the notification bar dark. r=mikedeboer
2015-12-12 18:34:27 -05:00
290c6af070
Merge m-c to f-t
2015-12-11 21:30:33 -08:00
f61cbd01dd
Merge m-i to m-c, a=merge
2015-12-11 21:20:03 -08:00
5484d2d1d8
Bug 1232015 - Update pdf.js to version 1.3.72. r=bdahl
2015-12-11 14:06:30 -05:00
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
8c8e1c0526
Merge mozilla-central to mozilla-inbound
2015-12-11 11:42:10 +01:00
b25476080d
merge mozilla-inbound to mozilla-central a=merge
2015-12-11 11:38:17 +01:00
3d567c8694
Bug 1195295 - Fix browser_tab_detach_restore.js and browser_popupNotifications_4.js r=felipe
...
These tests seemed to rely on the synchronous infrastructure that the
now defunct SyncHandler for SessionStore provided. This moves them
to safer, more modern alternatives.
--HG--
extra : commitid : QYhBXsLvPO
extra : rebase_source : bea13b3d34d7375e8d1f44491844742f68d81c11
extra : __touch-noise__ : 4185659896
extra : histedit_source : bc0f22800f4976f8bd622c606ef47e245bd1a7be
2015-12-10 17:44:26 -05:00
b7869a821a
Bug 1229874: Support defineLazyServiceGetter in components-import eslint helper. r=miker
...
--HG--
extra : commitid : JasCECgeDvZ
extra : rebase_source : 4f2bc306a845e8b2f561be4430d6741f44b204ec
extra : amend_source : 8955e75045f39f47b758587b635d7d2cec85f7f5
extra : source : 6745f48efb28b3ec118166e1211b02354ab01769
2015-12-02 16:49:50 -08:00
59623fd557
Merge mozilla-central to fx-team
2015-12-11 11:44:43 +01:00
7cd042d5ea
Bug 1215570 - Update the rooms context whenever the domain/tab changes whilst tab sharing. r=standard8
2015-12-08 07:44:00 +01:00
f2127e9ebb
Bug 1195295 - Remove SessionStore's SyncHandler since all tab and window flushing is now async. r=ttaubert
...
--HG--
extra : commitid : 20kUFlNpMz6
extra : rebase_source : 89f89eea235b8a68f6c76e3324909be7d7da0ede
2015-12-01 14:34:25 -05:00
1eefb717c6
Bug 1231728 - Fixes sync/setup.js switch statement. r=markh
...
--HG--
extra : commitid : D6gDBTXrBPU
2015-12-10 14:39:12 -05:00
bddd338cd7
Bug 1231728 - Fixes some code to follow eslint rules. r=mak
...
--HG--
extra : commitid : 2pB0pOqsHVW
2015-12-10 14:38:30 -05:00
19f1667df6
Bug 1231728 - Enable no-dupe-args, no-dupe-keys, no-duplicate-case, no-obj-calls, no-with rules globally, no-redlecare and consistent-return in browser. r=Mossop
...
--HG--
extra : commitid : Axo4haH85oJ
2015-12-10 14:34:44 -05:00
7bc5ad9c02
Bug 1231535 - remove sync spinner and add ellipsis to Synced Tabs panel. r=Gijs
2015-12-10 09:28:54 -05:00
ffb37c03fb
merge mozilla-inbound to mozilla-central a=merge
2015-12-10 12:05:03 +01:00
67fde71130
merge fx-team to mozilla-central a=merge
2015-12-10 12:02:37 +01:00
66cabf4a78
Bug 1079858, Deal with deprecation of SHA1 (SHA-1) Authenticode signatures for Windows signing, part 2 (swap cert, relanding), r=catlee, a=lizzard
...
--HG--
extra : amend_source : f8c7d16e30c6e06cd3f9c04d1e63fe3befe09160
2015-12-09 17:22:19 -05:00
8edff14fd8
Bug 1213844 - Update Loop's user journey strings with final versions [r=mikedeboer]
...
--HG--
extra : amend_source : 6ca2be5cd5d58ff0f47734889eb6cea99d8d4c4d
2015-12-09 14:55:47 -05:00
ea26f3c2e6
Bug 1079858, Deal with deprecation of SHA1 (SHA-1) Authenticode signatures for Windows signing, part 1 with two certs, r=catlee, a=lizzard
...
--HG--
extra : amend_source : aacafc1ae4b3aadd26705196280ed22a8258711f
2015-12-09 12:42:20 -05:00
a408867daf
Backed out 2 changesets (bug 1079858)
...
Backed out changeset a8965ae93c5d (bug 1079858)
Backed out changeset ba03ae4ac5df (bug 1079858)
2015-12-09 12:40:58 -05:00
3d540d76ec
merge fx-team to mozilla-central a=merge
2015-12-09 11:46:15 +01:00
421eb47a4b
Bug 1079858, Deal with deprecation of SHA1 (SHA-1) Authenticode signatures for Windows signing, part 2 (swap cert), r=catlee, a=lizzard
...
--HG--
extra : amend_source : 450203e03ee0f46929ca4b4ce1a1e43b4ea6df97
2015-12-08 16:16:55 -05:00
23f09f2b29
Bug 1079858, Deal with deprecation of SHA1 (SHA-1) Authenticode signatures for Windows signing, part 1, r=catlee, a=lizzard
...
--HG--
extra : amend_source : 90642316bf1b25d73c8a2b5f4278ec1f9625ed9d
2015-12-08 16:06:26 -05:00
3918e226e0
Bug 1206683 - Enable eslint rule for no unused variables for Loop. r=Mardak
2015-12-08 08:08:06 -05:00
5f74e29a2e
merge mozilla-inbound to mozilla-central a=merge
2015-12-07 14:15:43 +01:00
e110224e1d
Bug 1227105 - Add cryptoKey to storeState for use in retry action and fix for TypeError in standaloneRoomViews to make retrying work better in more instances. r=Standard8
2015-12-06 12:22:50 +00:00
943c4d11f0
Bug 1227105 - Add an onerror handler for Get requests in standaloneMozLoop so that issues contacting the server are correctly reported to the user. r=Standard8
2015-12-06 12:22:50 +00:00
18a0bcc6d7
Bug 1208257 - [webext] Fix failing test
2015-12-06 11:01:20 -08:00
6e0bf624bf
Bug 1208257 - [webext] tabs.json (r=kmag)
2015-12-06 08:50:24 -08:00
505a9bb407
Bug 1208257 - [webext] windows.json (r=kmag)
2015-12-06 08:50:24 -08:00
289a16635a
Merge fx-team to m-c. a=merge
2015-12-05 15:09:41 -05:00
39967e9806
Backed out changeset 0ea0832d052d (bug 1079858) for causing bug 1230631 a=backout
...
--HG--
extra : commitid : GeBy210BpUB
2015-12-04 14:58:55 -08:00
b729a30707
Bug 1229874: Part 3 - Enable ESLint in WebExtension code. r=billm
...
The base .eslintrc is essentially a merge of the root Toolkit .eslintrc and
the devtools .eslintrc, with some minor changes to match our prevalent style.
For the most enforces the coding styles that we've been using most
consistently. There are a couple of significant differences, though:
* The rule for opening brace alignment can only be applied globally, and
doesn't make exceptions for top-level functions. I chose to turn it on, and
change the brace style of existing top-level functions that violated it,
since the rule seemed worth using, and that's the direction most Toolkit JS
code has been headed anyway.
* The rule for switch/case statements requires an added indentation level for
case statements. Most of our switch statements did not use an extra level
of indentation, and I initially wrote the rule to enforce that style, until
I came across case statements that used blocks, and required the extra
indentation level for sanity.
--HG--
rename : devtools/.eslintrc => toolkit/components/extensions/.eslintrc
extra : commitid : 4aDZOi5MNPc
extra : rebase_source : f34ba43aeb8046a0c971cb76b76410497bd12b42
extra : source : 2a7eb4ef7b375e5fd52d843ca206a071367a6475
2015-12-02 16:58:53 -08:00
62d3c9701a
Bug 1229874: Part 2 - Fix the major errors detected by ESLint. r=billm
...
--HG--
extra : commitid : 8MfFtdlzGEG
extra : rebase_source : 744d65868d5a3d217bd5f6428a3486e95fa14716
extra : source : 880fc261adae00a344e227ea2fa246b771cd57a6
2015-12-02 16:58:24 -08:00
51e9466a0f
Bug 1226333 - Add tests for async window flushing. r=billm.
...
--HG--
extra : commitid : 9ji0WXf0vH0
extra : rebase_source : 31ffb2e4df2cf6f4e3902fb4504fae2984dee55a
2015-12-02 09:46:06 -05:00
29741a4cfc
Bug 1230147 - Loop is attempting to load OpenTok SDK's configs from the wrong places. r=mikedeboer
2015-12-03 18:00:32 +00:00
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
a2544368f2
Bug 1227235 - Color tweaks to the tabbar svg icons. r=dao
2015-12-06 02:40:00 +01:00
b24758ed1d
Bug 1228980 - Display favicons of tab entries in aboutSessionRestore-based pages. r=ttaubert
...
--HG--
extra : transplant_source : W%9D%B1hn%AD%84%B9%605%1ClKc%A2D%BAC%E8Q
2015-12-08 12:35:28 +00:00
5ea6c92cf4
Bug 1102025 - Make this test pass in e10s. r=bholley
2015-12-10 14:17:09 -05:00
7edc2a1cc9
Bug 1231364 - the audio icon in tabs should be removed only if the location changes for real, r=ehsan
2015-12-10 13:40:57 -05:00
904acbd272
Bug 1225921 - Have SessionStore keep a list of window data that might be saved during a flush. r=billm
...
This helps us keep track of what windows we've chosen to forget, and helps
us avoid the problem of accidentally saving a window we've chosen to forget.
--HG--
extra : commitid : 4sAF1DKyhKp
extra : rebase_source : c1e967bc38ebd32ced25ba3ee6ed5912b0f2e50a
2015-12-02 13:48:19 -05:00
Wes Kocher
Gijs Kruitbosch
Phil Ringnalda
ffxbld
Ryan VanderMeulen
Manuel Casas Barrado
Steve Fink
Carsten "Tomcat" Book
Mike Conley
Kris Maglione
Felipe Gomes
Mark Hammond
Matt Howell
Chris Rafuse
Nick Thomas
Mark Banner
Vidhuran Harichandra Babu
Bill McCloskey
Dave Townsend
Tim Nguyen
Luis Miguel [:quicksaver]
Blake Kaplan
Andrea Marchesini