sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
11,465 Commits 4 Branches 19 Tags
5044d4f2d63d2eb46ea940948ea2de32533ebb15
Commit Graph
9594 Commits
Author SHA1 Message Date
Bruno Windels 5044d4f2d6 dont keep the spinner in the memberlist when fetching /members fails 2018-09-10 14:56:10 +02:00
Bruno Windels 467cdd2f1f Merge branch 'develop' into bwindels/optimizememberlist 2018-09-07 18:32:13 +02:00
Weblate 1592e7a22f Merge remote-tracking branch 'origin/develop' into develop 2018-09-07 12:57:35 +00:00
David BakerandGitHub 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 HuangandWeblate 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 LarssonandWeblate 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 BrumandWeblate 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
SzimszonandWeblate 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 CandWeblate 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
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
Jeff HuangandWeblate 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 BakerandGitHub 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 BrumandWeblate 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
randomandWeblate 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 BrumandWeblate 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
OsoitzandWeblate 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 BakerandGitHub 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 BrumandWeblate 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 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 BakerandGitHub 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 WindelsandGitHub 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 BakerandGitHub 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 BrumandWeblate 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 BakerandGitHub 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
David Baker 775d995052 Lint 2018-09-04 18:51:24 +01:00
David Baker a07799879c Fix tests 2018-09-04 18:50:18 +01:00
Milena BrumandWeblate 2001fc2cd0 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-04 17:39:18 +00:00
David Baker dc14a42148 Correctly mark email as optional 
Look at the flows to see if there is one we can complete without
an email address. Mark the email address as optional iff there is.
 2018-09-04 18:26:09 +01:00
Weblate 971c08f8fd Merge remote-tracking branch 'origin/develop' into develop 2018-09-04 16:17:58 +00:00
Bruno WindelsandGitHub a6d241c29f Merge pull request #2146 from matrix-org/bwindels/fixavatars-parttrois 
Fix DM avatars, part 3
 2018-09-04 18:17:52 +02:00
Bruno Windels 3b29b7aab6 fix getDMRoomsForUserId not calling _getUserToRooms first (thanks e2e tests) 2018-09-04 17:36:50 +02:00
Weblate 0c80cc143d Merge remote-tracking branch 'origin/develop' into develop 2018-09-04 14:40:37 +00:00
Bruno WindelsandGitHub bc97a3efb5 Merge pull request #2143 from matrix-org/bwindels/fixreconnectspinner 
Fix: show spinner again while recovering from connection error
 2018-09-04 16:40:30 +02:00
Weblate 61bb682c7a Merge remote-tracking branch 'origin/develop' into develop 2018-09-04 14:10:51 +00:00