OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
11,409 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

11409 Commits (6f706641a38b1774ef5cdf1829ebb24d7529ecd6)

Author SHA1 Message Date
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
Bruno Windels 26df485607 Merge branch 'develop' into revert-2149-revert-2145-bwindels/fixllroompermission 2018-09-06 15:35:41 +02: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
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 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 34d27954cf
Revert "Don't rely on room members to query power levels" 2018-09-05 18:03:48 +01: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
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
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
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
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
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
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
David Baker 727082b659 Merge branch 'master' into develop 2018-09-03 14:26:50 +01:00
David Baker 4b45c17f59 v0.13.3 2018-09-03 14:26:00 +01:00
David Baker c87406c1b2 Prepare changelog for v0.13.3 2018-09-03 14:26:00 +01:00
David Baker 3e227bb40f released matrix-js-sdk 2018-09-03 14:14:24 +01:00
Bruno Windels 1eabb6012a
Merge pull request #2139 from matrix-org/bwindels/memberlist-spinner 
Show spinner in member list while loading members
 2018-09-03 15:05:27 +02:00
Bruno Windels cae419e304 avoid rerendering when LL is disabled 2018-09-03 11:13:56 +02:00
David Baker e83dca4150 v0.13.3-rc.2 2018-08-31 13:48:28 +01:00
David Baker 07baaca572 Prepare changelog for v0.13.3-rc.2 2018-08-31 13:48:27 +01:00
David Baker 77316dddf2 js-sdk rc.2 2018-08-31 13:43:55 +01:00
David Baker d9fb88246a
Merge pull request #2140 from matrix-org/dbkr/discardsession 
Slash command to discard megolm session
 2018-08-30 18:25:56 +01:00
Bruno Windels debcc20604 also show spinner on new CATCHUP state 2018-08-30 15:39:48 +02:00
David Baker 5688f98d22 v0.13.3-rc.1 2018-08-30 14:28:58 +01:00
David Baker 53c6b7e4cb Prepare changelog for v0.13.3-rc.1 2018-08-30 14:28:58 +01:00
David Baker 47fcc0d264 js-sdk rc.1 2018-08-30 14:21:11 +01:00
David Baker 75a2668e42
Merge pull request #2141 from matrix-org/bwindels/fixdmavatar 
Fix DM avatar
 2018-08-30 11:45:54 +01:00
David Baker 6d158d35eb
Merge pull request #2142 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-08-30 11:45:31 +01:00
Bruno Windels fb0a0d5d9e allow self-chats 2018-08-30 12:36:53 +02:00
Peter Vágner 40e5d379f0 Translated using Weblate (Slovak) 
Currently translated at 99.4% (1240 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-08-30 10:32:59 +00:00
csybr e45008ec22 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 97.8% (1220 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2018-08-30 10:32:59 +00:00
Krombel fad6816d5e Translated using Weblate (German) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-08-30 10:32:59 +00:00
Kévin C 332c190c63 Translated using Weblate (French) 
Currently translated at 100.0% (1247 of 1247 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-30 10:32:59 +00:00
Bruno Windels d8f15e1159 make sure we still have the room 2018-08-30 12:06:34 +02:00
Bruno Windels 85b6f157c1 only patch m.direct data on server once per session to avoid request storm 2018-08-30 12:01:13 +02:00
Bruno Windels 379ddfff29 dont reassign userToRooms as we're just patching it up, also better check if we really have self DMs 2018-08-30 11:50:57 +02:00