mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
11823 commits 217 branches 561 tags 411 MiB
Commit graph

11823 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
467cdd2f1f Merge branch 'develop' into bwindels/optimizememberlist 2018-09-07 18:32:13 +02:00
David Baker
830edeb9ca v0.13.4-rc.1 2018-09-07 14:35:44 +01:00
David Baker
1cab61f560 Prepare changelog for v0.13.4-rc.1 2018-09-07 14:35:44 +01:00
David Baker
2380f2cb1f js-sdk rc.1 2018-09-07 14:31:45 +01:00
David Baker
73c28f3aae Merge translations from #2157 to release 2018-09-07 14:23:26 +01:00
David Baker
b419652e4e
Merge pull request #2157 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-09-07 14:10:30 +01:00
Weblate
1592e7a22f Merge remote-tracking branch 'origin/develop' into develop 2018-09-07 12:57:35 +00:00
David Baker
877e949d1c
Merge pull request #2156 from matrix-org/bwindels/dontrefreshmembersforotherrooms 
avoid memberlist refresh for events related to rooms other but the current
 2018-09-07 13:57:29 +01:00
Jeff Huang
603fe4f92b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1252 of 1252 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-09-07 12:47:46 +00:00
Weblate
b21faea25d Merge remote-tracking branch 'origin/develop' into develop 2018-09-07 12:37:06 +00:00
Kenneth Larsson
6e795a2d08 Translated using Weblate (Swedish) 
Currently translated at 99.6% (1247 of 1251 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-09-07 12:37:06 +00:00
Milena Brum
69f2f06468 Translated using Weblate (Spanish) 
Currently translated at 99.7% (1248 of 1251 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-07 12:37:06 +00:00
Szimszon
f8cc510542 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-09-07 12:37:05 +00:00
Kévin C
55271c858e Translated using Weblate (French) 
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-09-07 12:37:05 +00:00
David Baker
7143a8ef3c
Merge pull request #2155 from matrix-org/dbkr/error_on_splash_page 
Error on splash screen if sync is failing
 2018-09-07 13:36:59 +01:00
Bruno Windels
101dad83aa same for right panel 2018-09-07 14:16:26 +02:00
Bruno Windels
9cc9fbf924 avoid memberlist refresh for events related to rooms other but the current 2018-09-07 14:05:26 +02:00
David Baker
fa669bf096 Error on splash screen if sync is failing 
Display an error on the splash screen with the spinner if the sync
request is not working, rather than just sitting there with a spinner
as if nothing is wrong.

Fixes https://github.com/vector-im/riot-web/issues/7148
 2018-09-07 12:18:25 +01:00
Bruno Windels
fec7d2ee5f avoid updating the memberlist while the spinner is shown 
the memberlist gets updated constantly while the LL members
are being added to the room state. this slows things down unneed, and is one of the
main cause of dropping frames when member arrive.
 2018-09-07 12:00:19 +02:00
Jeff Huang
b9a8d765bb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1251 of 1251 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-09-07 01:14:21 +00:00
Weblate
4744799561 Merge remote-tracking branch 'origin/develop' into develop 2018-09-06 15:23:41 +00:00
David Baker
c8ab8bf5f8
Merge pull request #2150 from matrix-org/dbkr/disable_ilag_if_unsupported 
Do full registration if HS doesn't support ILAG
 2018-09-06 16:23:32 +01:00
Weblate
924d98b5f5 Merge remote-tracking branch 'origin/develop' into develop 2018-09-06 15:23:11 +00:00
Milena Brum
fce40aead1 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-06 15:23:10 +00:00
Bruno Windels
6f706641a3
Merge pull request #2152 from matrix-org/revert-2149-revert-2145-bwindels/fixllroompermission 
Re-apply "Don't rely on room members to query power levels"
 2018-09-06 17:23:02 +02:00
random
755c13fcd8 Translated using Weblate (Italian) 
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-09-06 15:15:24 +00:00
David Baker
32da44615e Use some/every instead of doing it manually 2018-09-06 15:50:41 +01:00
Bruno Windels
26df485607 Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission 2018-09-06 15:35:41 +02:00
Weblate
e43dfa39bd Merge remote-tracking branch 'origin/develop' into develop 2018-09-06 12:53:50 +00:00
Milena Brum
33a24b9fb4 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-06 12:53:50 +00:00
Bruno Windels
8bd93a7c4f
Merge pull request #2151 from matrix-org/dopr.sh 
s/DidMount/WillMount/ in MessageComposerInput
 2018-09-06 14:53:44 +02:00
Osoitz
ee9ebf26d1 Translated using Weblate (Basque) 
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-09-06 12:20:34 +00:00
David Baker
4c8d2de563
Revert "Revert "Don't rely on room members to query power levels"" 2018-09-06 11:48:23 +01:00
David Baker
9e64a22884 s/DidMount/WillMount/ in MessageComposerInput 
This fixes the tests that broke with https://github.com/matrix-org/matrix-js-sdk/pull/717

This is because of https://github.com/vector-im/riot-web/blob/master/test/app-tests/joining.js#L63
which prevents the DOM nodes from actually ending up in the DOM, even though the react components
get rendered. This means that WillMount and WillUnmount are called, but not DidMount.

Using WillMount is more symmertrical anyway since the resulting teardown code must be in
WillUnmount (since there is no DidUnmount).
 2018-09-06 11:44:13 +01:00
David Baker
eced58701d Lint 2018-09-05 20:34:03 +01:00
Weblate
0979baa24d Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 17:09:54 +00:00
Milena Brum
c132b5b9fc Translated using Weblate (Spanish) 
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-05 17:09:54 +00:00
David Baker
9f5ea73dc2
Merge pull request #2149 from matrix-org/revert-2145-bwindels/fixllroompermission 
Revert "Don't rely on room members to query power levels"
 2018-09-05 18:09:48 +01:00
David Baker
27fa21e403 Replace view_set_mxid with require_registration 
To put all the other flows through the to-ilag-or-not-to-ilag flow
 2018-09-05 18:08:49 +01:00
David Baker
34d27954cf
Revert "Don't rely on room members to query power levels" 2018-09-05 18:03:48 +01:00
David Baker
a042f4d0af Do full registration if HS doesn't support ILAG 
ILAG only works on HSes that allow registering without an email
address, so whenever we redirect to the ILAG flow, check what
registration flows the server supports, and if it doesn't offer one
that's ILAG-compatible, prompt the user to go through the full
registration process instead.

This doesn't change all the entry points into ILAG, I'll do that
in a separate commit.
 2018-09-05 17:07:39 +01:00
Bruno Windels
8500a7131f avoid unneeded lookups in memberDict 
have members be an array of RoomMember instead of userId, so
we can avoid multiple lookups when sorting, rendering, ...
 2018-09-05 15:25:08 +02:00
Weblate
58ddfc77be Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 11:08:00 +00:00
Bruno Windels
50de22fb51
Merge pull request #2145 from matrix-org/bwindels/fixllroompermission 
Don't rely on room members to query power levels
 2018-09-05 13:07:55 +02:00
Weblate
3d3decfc31 Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 10:31:25 +00:00
David Baker
4517eaba6f
Merge pull request #2148 from matrix-org/dbkr/dont_say_email_optional_if_it_isnt 
Correctly mark email as optional
 2018-09-05 11:31:19 +01:00
Weblate
4de7c466d0 Merge remote-tracking branch 'origin/develop' into develop 2018-09-05 07:15:32 +00:00
Milena Brum
562cc32860 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1249 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-09-05 07:15:32 +00:00
David Baker
e5b761b754
Merge pull request #2059 from matrix-org/t3chguy/join_community_fire_ilag_flow 
guests trying to join communities should fire the ILAG flow.
 2018-09-05 08:15:24 +01:00
Matthew Hodgson
dc66c43fa1 downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57 2018-09-04 20:33:04 +01:00