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
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
3969629382
Bug 1225921 - Regression tests. r=billm
...
--HG--
extra : commitid : 4MkFmSCJAK8
extra : rebase_source : 6e5d89f6d142aa145b91d84f971a490d53660a5a
extra : amend_source : 99e021ab8f0b7d9db1311ef2c589c881aa0d54a0
2015-12-02 13:48:05 -05:00
85bac0ef81
Bug 1230618 - Update pdf.js to version 1.3.56. r=bdahl
...
--HG--
extra : rebase_source : 39726f96f49770b8ada4f555583a2c95fff4234d
2015-12-04 11:10:12 -05:00
92b2551106
Bug 1207146 - Add a link to expert technical information in the cert error page. r=Gijs,keeler
2015-12-04 19:46:13 +02:00
729eb4c878
Bug 1230192 - Loop's desktop unit tests are doing lots of unnecessary console.log of dispatcher actions. r=dcritch
2015-12-04 17:26:14 +00:00
59f45711a5
Bug 1218249 - followup: re-add 'content.' to the Node reference in content.js, rs=bustage
...
--HG--
extra : commitid : GHo3vAFpWeY
extra : rebase_source : e39a434dbe2f70d94c0b816e1e1bad670446e91a
2015-12-04 15:21:43 +00:00
34af26c5b6
Bug 1228976 - Remove array comprehensions from Places .r=mak
2015-12-03 16:26:58 +05:30
4918920221
Bug 1218249 - check type of node before using xlink:href, r=felipe,f=longsonr
...
--HG--
extra : commitid : Lh3cVtsYgac
extra : rebase_source : 737f7510384015d13be970ddb22f2fffc84d2ba3
2015-12-02 14:10:39 +00:00
9930c8ae16
Bug 1229474 - only create widgets in browser windows, r=jaws
...
--HG--
extra : commitid : DyFeq4QIv9e
extra : rebase_source : fe42eb4a04c783f975de86f226e6f6029adb1fa6
2015-12-02 16:11:56 +00:00
673a539ce8
Bug 1177310 - Don't flush windows synchronously on application shutdown. r=billm,feedback=ttaubert
...
Instead of synchronously flushing the windows, we use AsyncShutdown to
wait for all window flushes to finish.
--HG--
extra : commitid : 1dDdTLBcZrt
extra : rebase_source : ea10bed3dc4920e769e73a6469510d4f303b88dc
2015-11-13 14:46:37 -05:00
c9f1c242db
Bug 1177310 - TabStateFlusher Promises should always resolve. r=Yoric
...
They'll always resolve, but might receive a negative success state
and a message. We're doing this so that we can maintain a Set of
in-flight flushes that we can call Promise.all on (which will
fast-fail if any Promise rejects, or will just never resolve if
one or more of the Promises never resolve).
--HG--
extra : commitid : AkIM83IZCxK
extra : rebase_source : 4fb8eb059589299c87fcbd3c4e519a81a8b93def
2015-11-24 18:41:32 -05:00
5f4425d536
Bug 1230088 - Update Loop's use of eslint and eslint-plugin-react, fix warnings in latest versions and add a few more rules. r=mancus
2015-12-03 12:18:53 +00:00
576539a934
Merge mozilla-central to fx-team
2015-12-03 12:08:49 +01:00
df451fe7b0
merge mozilla-inbound to mozilla-central a=merge
2015-12-03 12:00:42 +01:00
4e9e4bed5a
merge fx-team to mozilla-central a=merge
2015-12-03 11:58:40 +01:00
60cdb632cf
Bug 1214215: Part 3 - disable functional tests temporarily until bug 1229926 is resolved. r=Standard8
2015-12-03 11:12:57 +01:00
a0a723f7cf
Bug 1214215: Part 2 - remove screen sharing controls entirely from the conversation window. r=Standard8
2015-12-03 11:12:54 +01:00
fe8d3fc344
Bug 1214215: Part 1 - start sharing browser tabs when owner joins the room. r=Standard8
2015-12-03 11:12:52 +01:00
902d0fde8c
Bug 1228999 - Undo css workaround in Loop's system-addon that was necessary as AUTHOR_SHEETS were previously not working correctly. r=mikedeboer
2015-12-03 07:43:25 +00:00
5c5a4d1119
Bug 1190688: Part 2 - [webext] Add tests for executeScript permission checks. r=billm
...
--HG--
rename : browser/components/extensions/test/browser/browser_ext_tabs_executeScript.js => browser/components/extensions/test/browser/browser_ext_tabs_executeScript_good.js
extra : commitid : iRaiDjAAti
extra : rebase_source : 3906f8f3ffaf91815f9463564b9e6243f443750c
extra : source : 1d5e9f3d094d075cfda767dd2108b07c7f8557de
2015-12-02 15:07:02 -08:00
a41140702e
No bug, Automated blocklist update from host bld-linux64-spot-369 - a=blocklist-update
2015-12-02 14:59:19 -08:00
5adcabb340
merge mozilla-inbound to mozilla-central a=merge
2015-12-02 15:20:57 +01:00
66c9592a32
Bug 1190688: Part 1 - [webext] Implement the activeTab permission. r=billm
...
--HG--
extra : commitid : 7CvbJtxVmuS
extra : rebase_source : 88dadc60ac17cd9036f85c81ac19dfb3db1d0c91
extra : source : 4a10c564dfca3189ab521c3ccfa92330163189b1
2015-12-01 20:37:41 -08:00
ccd1557027
Bug 1193837: Part 2 - [webext] Enforce host matching and load URI restrictions on tabs.executeScript and insertCSS. r=billm
...
--HG--
extra : commitid : 14Ay1RxALKN
extra : rebase_source : 539fce3e4d8a8456d73bd2d1736338e835e264da
extra : source : ebe2433705a55c4b91d5726ed81574e3bcb5c6fb
2015-12-01 20:32:18 -08:00
ed06cf5e06
Bug 1229168 - UITour: Use the correct window in initForBrowser to handle windows with no tabs. r=Dexter
...
--HG--
extra : commitid : KqRYnsV6Z9M
extra : rebase_source : 3149ba3d9b48cb284607fa14a60dd645c686d359
2015-12-02 15:26:23 -08:00
4d0b5df661
Bug 1226629 - Increment "urlbar" BrowserUITelemetry/FHR for all searchengine results clicked in the urlbar. r=mak
2015-12-02 16:26:07 -08:00
2df6ae44b6
Bug 1229603 - Make most of browser/base lintable by removing non-standard syntax. r=Mossop
...
--HG--
extra : commitid : 5Dg6Q0MzXTN
2015-12-02 17:51:26 -02:00
cee022405a
bug 1229667 - ship a hidden search plugin for Yahoo Canada, r=florian
2015-12-03 01:42:58 -05:00
18989b2ba8
Bug 1201331 (part 5) - Use a new non-animated icon for the sync button. r=Gijs
2015-12-03 10:05:04 +11:00
a795eb0690
Bug 1201331 (part 4) - replace "Tabs from other devices" with "Synced Tabs" on menus and history panel. r=Gijs
2015-12-03 10:05:03 +11:00
64831b8ba3
Bug 1201331 (part 3) - add a Synced Tabs panel. r=Gijs
2015-12-03 10:05:03 +11:00
c0c731c7d0
Bug 1201331 (part 2) - update tests that use the sync-button as a placeholder for "generic XUL button". r=Gijs
2015-12-03 10:05:03 +11:00
a9596f0e57
Bug 1201331 (part 1) - use a broadcaster to manage the Sync status. r=adw
...
This patch leverages broadcasters to keep the various sync UI elements sane.
Rather than adding yet another button ID to browser-syncui, we now just update
the broadcaster and let all the elements automagically get the attributes.
2015-12-03 10:05:03 +11:00
499e992e6a
Bug 1228975 - Remove Array generics usage from Places code. r=mak
2015-12-01 15:40:30 +05:30
66050f6f32
Backed out 2 changesets (bug 1193837) because the web extension tests are failing CLOSED TREE
...
Backed out changeset ebe2433705a5 (bug 1193837)
Backed out changeset c3307a5ac126 (bug 1193837)
2015-12-02 13:23:18 -08:00
fdc2d1bcff
Backed out 2 changesets (bug 1190688) for browser_ext_tabs_executeScript.js permatimeouts
...
Backed out changeset 1d5e9f3d094d (bug 1190688)
Backed out changeset 4a10c564dfca (bug 1190688)
2015-12-02 11:22:31 -08:00
fc88dbf721
Bug 1229097: Land an initial .eslintrc for browser and toolkit. r=gijs, r=Standard8
...
Currently all rules are commented out except eol-last.
--HG--
extra : commitid : LNskOtOlV0S
extra : rebase_source : f58910dde85902a33d0c148df19d18244b7202a4
2015-11-30 10:45:45 -08:00
a1d2cbe369
Bug 1229831 - tab group migration code loses group titles, r=felipe
...
--HG--
extra : commitid : KTKQdwPfrDm
extra : rebase_source : 89f76dba7cac7fae2e8da250752bc72b882c1cac
extra : amend_source : 05ffb2bfcf9eb33097b910d82d10ea085c95e0a4
2015-12-02 17:31:22 +00:00
Carsten "Tomcat" Book
Vidhuran Harichandra Babu
Bill McCloskey
Ryan VanderMeulen
Wes Kocher
Kris Maglione
Mike Conley
Mark Banner
Panos Astithas
Gijs Kruitbosch
simplyblue
Mike de Boer
ffxbld
Matthew Noorenberghe
Drew Willcoxon
Felipe Gomes
Mike Connor
Mark Hammond
Dave Townsend