Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 14:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,503 Commits 206 Branches 552 Tags 519 MiB
bc0806581c
Commit Graph

11874 Commits

Author SHA1 Message Date
Jason Robinson
bc0806581c
Merge pull request #2777 from matrix-org/jaywink/ensure-scalar-token 
Ensure scalar_token is valid before opening integrations manager
 2019-03-13 12:00:04 +02:00
Jason Robinson
02ff1763a2 Ensure scalar_token is valid before opening integrations manager 
Since Scalar (and other integration managers) are loaded as apps into
an iframe, a valid `scalar_token` must exist when loading the app.

It is possible that a scalar_token becomes invalid between the time
when the integration manager button was rendered and the user clicking
the link. Here we make a call to integration manager `/account`
before trying to render the integration manager, which ensures we
have a valid token for the integration manager to work with.

Moving the scalar token revalidation to the cases where it is actually
needed could make it possible to decrease the amount of Scalar /account
calls we do when switching rooms, which is currently 3.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
 2019-03-13 11:47:00 +02:00
Travis Ralston
09600dcabd
Merge pull request #2775 from matrix-org/travis/auth-escape-hatch 
Provide an escape from the registration process
 2019-03-12 10:56:49 -06:00
Travis Ralston
9b252cace5 Invert to be if(!form) goback 2019-03-12 10:39:38 -06:00
David Baker
b39a7e01d3
Merge pull request #2770 from matrix-org/dbkr/fix_instant_rrs_pt2 
Fix instantly sending RRs
 2019-03-12 10:59:26 +00:00
J. Ryan Stinnett
0791f220fb
Merge pull request #2776 from matrix-org/erikj/fix_null_counter 
Fix simple header counters to correctly handle zero, take two
 2019-03-12 10:46:51 +00:00
David Baker
9f4de60f9b Merge branch 'dbkr/fix_instant_rrs_pt2' of github.com:matrix-org/matrix-react-sdk into dbkr/fix_instant_rrs_pt2 2019-03-12 10:29:44 +00:00
David Baker
374be0b3b4 Rename more things 2019-03-12 10:28:47 +00:00
Erik Johnston
1a35130869 Fix simple header counters to correctly handle zero, take two 2019-03-12 10:00:10 +00:00
David Baker
08e21ff5d4 Fix comment 2019-03-12 09:40:17 +00:00
J. Ryan Stinnett
2d074d0de6
Rename 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-03-12 09:37:55 +00:00
J. Ryan Stinnett
ea01853233
Rename 
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
 2019-03-12 09:37:38 +00:00
David Baker
63d19a899b Rest of the naming changes 2019-03-12 09:37:00 +00:00
Travis Ralston
7eea62a22b
Merge pull request #2764 from matrix-org/travis/fix-hover 
Fix sticky hover state by listening for hover on the document
 2019-03-11 16:35:25 -06:00
Travis Ralston
9794e32f48 Provide an escape from the registration process 
Fixes https://github.com/vector-im/riot-web/issues/6560

Would be better improved by https://github.com/matrix-org/matrix-doc/pull/1921 or similar in the future.
 2019-03-11 16:32:50 -06:00
Travis Ralston
1165c51c77
Merge pull request #2772 from matrix-org/erikj/fix_null_counter 
Fix header counters to correctly handle zero
 2019-03-11 15:10:53 -06:00
J. Ryan Stinnett
c38a7e6756 Pass correct args when creating event permalink in context menu 
After the permalink API was changed in
https://github.com/matrix-org/matrix-react-sdk/pull/2671, it seems we forgot to
update this call site, so it was creating `<room>/<room>` links, instead of
`<room>/<event>`.

Fixes https://github.com/vector-im/riot-web/issues/9110
 2019-03-11 15:05:05 +00:00
Erik Johnston
03d60e6af2 Fix header counters to correctly handle zero 
Currently if you set the value to zero the counter is not displayed.
 2019-03-11 14:04:15 +00:00
David Baker
ce9f3d8a57 Rename 2019-03-11 11:38:54 +00:00
David Baker
3cab5eba44 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 85.6% (1330 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2019-03-11 10:08:20 +00:00
Weblate
f0850b78c2 Merge branch 'origin/develop' into Weblate. 2019-03-11 10:02:30 +00:00
roket1428
281e21d624 Translated using Weblate (Turkish) 
Currently translated at 41.1% (638 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-03-11 10:02:28 +00:00
Kenneth Larsson
e1a7f07a9f Translated using Weblate (Swedish) 
Currently translated at 79.5% (1235 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2019-03-11 10:02:28 +00:00
Paulo Miranda
e7b0ab14ae Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 85.6% (1330 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2019-03-11 10:02:17 +00:00
Karol Kosek
15ca7331ef Translated using Weblate (Polish) 
Currently translated at 75.0% (1165 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-03-11 10:02:13 +00:00
Szimszon
1c0bc7ddf9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-03-11 10:02:12 +00:00
Akarshan Biswas
a36dde10e3 Translated using Weblate (Hindi) 
Currently translated at 46.7% (726 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2019-03-11 10:02:12 +00:00
Samu Voutilainen
ce10588cba Translated using Weblate (Finnish) 
Currently translated at 89.2% (1385 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-03-11 10:02:08 +00:00
Victor Grousset
626d5c5f9d Translated using Weblate (Esperanto) 
Currently translated at 66.3% (1030 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-03-11 10:02:03 +00:00
Stanislav Lukeš
5cf6d0d603 Translated using Weblate (Czech) 
Currently translated at 98.1% (1523 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2019-03-11 10:02:02 +00:00
pogback
bef42d0121 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2019-03-11 10:02:02 +00:00
Adrià
765eb357fb Translated using Weblate (Catalan) 
Currently translated at 54.5% (846 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2019-03-11 10:01:36 +00:00
Evilham
c58e034a7d Translated using Weblate (Catalan) 
Currently translated at 54.5% (846 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2019-03-11 10:01:34 +00:00
Slavi Pantaleev
cfc1eb2d2a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1552 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-03-11 10:01:29 +00:00
Besnik Bleta
ee0f81a3f0 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1547 of 1552 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: http://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-03-11 10:01:29 +00:00
Bruno Windels
99f82a3de9
Merge pull request #2766 from matrix-org/bwindels/scrolling 
Scroll investigation changes
 2019-03-11 09:57:13 +00:00
Bruno Windels
10496cd4e8 also remove disconnecting from ResizeObserver 2019-03-11 10:32:30 +01:00
Travis Ralston
e1f9482107
Merge pull request #2757 from matrix-org/anoa/accept_all_invites 
Ability to bulk accept all invites (and fix rejecting all invites)
 2019-03-08 14:55:59 -07:00
David Baker
999ebe6a19 Missed the removes 
also fix more indenting
 2019-03-08 21:51:14 +00:00
David Baker
b404d21bba PR feedback 2019-03-08 17:41:04 +00:00
Travis Ralston
14b3d55a76
Merge pull request #2768 from matrix-org/travis/verify-email-state 
Don't trample over existing sessions when verifying email addresses
 2019-03-08 10:06:59 -07:00
Travis Ralston
1d71c05201 Localstorage -> LocalStorage 2019-03-08 09:55:50 -07:00
Travis Ralston
47b6356e10
Merge pull request #2767 from matrix-org/travis/misc-status-message-fixes 
Misc fixes to StatusMessageContextMenu
 2019-03-08 08:20:28 -07:00
David Baker
7e424ce95b Fix call to stop() 2019-03-08 15:09:44 +00:00
David Baker
ce1623691e Fix instantly sending RRs 
Splits UserActivity into a tristate of 'active' (last < 1s), 'passive' (lasts a
couple of mins) and neither. Read receipts are sent when 'active', read markers
are sent while 'passive'.

Also fixed a document / window mix-up on the 'blur' handler.

Also adds a unit test for UserActivity because it's quite complex now
(and changes UserActivity to make it testable by accessing the singleton
via sharedInstance() rather than exporting it directly).

Fixes https://github.com/vector-im/riot-web/issues/9023
 2019-03-08 12:46:38 +00:00
David Baker
2e081982ee
Merge pull request #2769 from matrix-org/dbkr/fix_instant_rrs 
Fix erroneously sending RRs, pt1.
 2019-03-08 11:53:10 +00:00
David Baker
de1ec06110 oops, didn't mean to leave this in 2019-03-08 10:44:48 +00:00
David Baker
89eb321ace copyright 2019-03-08 10:31:30 +00:00
David Baker
1cb6c3f3cf Fix erroneously sending RRs, pt1. 
Firefox fires the blur event on both document and window. Chrome
only fires it on window, so on chrome we were not seeing the window
being un-focused. window seems to be the standard so just use that.

This isn't the end of the story though since wer can get mousemove
events without the window ever having gained focus, in which case
we'll continue to think the user is active for another 2 mins when
in fact all they did was pass their cursor over the window.

https://github.com/vector-im/riot-web/issues/9023
 2019-03-08 10:23:18 +00:00
J. Ryan Stinnett
b0863768e4
Merge pull request #2765 from jryans/dropdown-redesign 
Tweak country dropdown for redesign
 2019-03-08 10:08:45 +00:00