PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
11447 commits 1 branch 0 tags 338 MiB
Commit graph

11447 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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 Brum
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 Windels
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 Windels
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
csybr
37703843e0 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 97.6% (1220 of 1249 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2018-09-04 14:10:51 +00:00
Bruno Windels
2530ecbf39
Merge pull request #2147 from matrix-org/bwindels/fix-gdpr-infinispini 
Fix: infinite spinner on trying to create welcomeUserId room without consent
 2018-09-04 16:10:45 +02:00
Bruno Windels
44a53cfc0d use lodash for unique function instead of rolling our own 2018-09-04 16:03:15 +02:00
Bruno Windels
e171296d51 patch self-chats lazily in favor of awaiting sync state 2018-09-04 16:00:40 +02:00
Bruno Windels
be66f98381 use room method for checking power levels 
as it is always are of the syncing user's membership
in case of lazy loading members
 2018-09-04 15:35:44 +02:00
Bruno Windels
5c395e4db7 wait for room creation, to go to home page in case of failure 2018-09-04 14:26:36 +02:00
Bruno Windels
abd9d3a11e fix lint 2018-09-04 13:55:29 +02:00
Bruno Windels
6c7cb380e0 add warning in console when patching rooms, so it appears in rage shakes 2018-09-04 13:12:26 +02:00
Bruno Windels
441036ff93 remove duplicates from room lists 2018-09-04 13:12:26 +02:00
Bruno Windels
245dfbf957 only put NON-guessed rooms in self-chats 2018-09-04 13:12:26 +02:00
Bruno Windels
c12abab52d wait until rooms are available 
as accountData get processed before rooms, during initial sync
or loading sync from cache, accountData gets emitted
before any room is available, hence our patching wasn't doing
anything. Just as well, because it would have failed (see next commits)
 2018-09-04 13:12:26 +02:00
Weblate
0b11402b6b Merge remote-tracking branch 'origin/develop' into develop 2018-09-03 13:27:02 +00:00