OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
21,948 Commits
211 Branches
549 Tags
666 MiB
Commit Graph

21948 Commits (471b18d5996deb5055c020d74df83176acb495fd)

Author SHA1 Message Date
Weblate 54c41ed24a Merge branch 'origin/develop' into Weblate. 2020-02-21 16:24:59 +00:00
Travis Ralston 4de2fdc5c3
Merge pull request #4099 from matrix-org/travis/invite-fixes 
Fix several small bugs with the invite/DM dialog
 2020-02-21 09:24:53 -07:00
Weblate 30233c0af4 Merge branch 'origin/develop' into Weblate. 2020-02-21 16:19:37 +00:00
Bruno Windels 3ea38b4de4
Merge pull request #4103 from matrix-org/bwindels/fixeslint 
ignore e2e tests node_modules during linting
 2020-02-21 16:19:31 +00:00
Weblate 515fc1fbac Merge branch 'origin/develop' into Weblate. 2020-02-21 15:38:14 +00:00
Michael Telatynski 7add51e3e8
Merge pull request #4104 from matrix-org/t3chguy/null-guard-room-pills 
Apply null-guard to room pills for when we can't fetch the room
 2020-02-21 15:38:08 +00:00
Weblate a523535948 Merge branch 'origin/develop' into Weblate. 2020-02-21 15:37:49 +00:00
Michael Telatynski 476c622a61
Merge pull request #4105 from matrix-org/t3chguy/fix_theme 
Fix theme being overridden to light even after login is completed
 2020-02-21 15:37:44 +00:00
Weblate 0d0e533c74 Merge branch 'origin/develop' into Weblate. 2020-02-21 15:19:58 +00:00
Hubert Chathi 953af6f036
add device and cross-signing public keys to rageshake info (#4097) 2020-02-21 10:19:53 -05:00
Michael Telatynski 4ed4d91b48 move to a more reusable code path 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-21 14:54:56 +00:00
Michael Telatynski b77c2df2be Fix theme being overridden to light even after login is completed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-21 14:40:42 +00:00
Michael Telatynski e799691573 Apply null-guard to room pills for when we can't fetch the room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-21 14:14:24 +00:00
Weblate faa6e8bf6e Merge branch 'origin/develop' into Weblate. 2020-02-21 14:02:43 +00:00
Remi Reuvekamp c1f40fa4ab Translated using Weblate (Dutch) 
Currently translated at 88.3% (1877 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-21 14:02:43 +00:00
Osoitz 7dac6b9b65 Translated using Weblate (Basque) 
Currently translated at 97.9% (2082 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-21 14:02:40 +00:00
Miren d4972e91a3 Translated using Weblate (Basque) 
Currently translated at 97.9% (2082 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-02-21 14:02:36 +00:00
Zoe dcc8862d4c
Merge pull request #4100 from matrix-org/foldleft/12352-ssss-overwrite 
Fix bug where SSSS could be overwritten if user never cross-signs
 2020-02-21 14:02:29 +00:00
Bruno Windels cda281044d ignore node_modules in e2e tests 2020-02-21 14:18:28 +01:00
Bruno Windels 07d24038a3 fix lint 2020-02-21 14:11:30 +01:00
Bruno Windels fada013f9e this isn't doing anything because we don't have a room when the alias is not moderated 2020-02-21 14:06:57 +01:00
Bruno Windels 2b19648786 fix cp error and lint 2020-02-21 13:35:14 +01:00
Bruno Windels 3c3839f863 show a pill as a moderated alias (canonical or alt) if available 
otherwise, display as the label in the link
 2020-02-21 13:02:41 +01:00
Bruno Windels 4219d2fcf6 style a room pill even if we don't find the room 2020-02-21 13:02:41 +01:00
Bruno Windels f6313b51e6 also look in alt_aliases to match a pill to a room 2020-02-21 13:02:41 +01:00
Bruno Windels 16815a752b use alt_aliases instead of aliases to match a pill to a room 
when deserializing a pill
 2020-02-21 13:02:41 +01:00
Bruno Windels 8870da6c24 Add alt_aliases to room completion candidates 
but don't match on name otherwise you see multiple entries per room
when searching for a room name

Also pass the roomId to the composer autocomplete, so
it's easier to we don't need to loop through all the rooms and
it's also easier accept room with local aliases as well in the future
 2020-02-21 13:02:41 +01:00
Bruno Windels 558ae1128b use alt_aliases rather than aliases for the display alias 2020-02-21 13:02:35 +01:00
Michael Telatynski e6d8c4a576 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-21 11:18:45 +00:00
Zoe 7d319bab7f fix ssss overwrite 2020-02-21 10:18:47 +00:00
Travis Ralston bcb1d73c3c Appease the linter 2020-02-20 23:21:35 -07:00
Travis Ralston 8ba274a382 Allow creating a room with only yourself in it 
Fixes https://github.com/vector-im/riot-web/issues/12092
 2020-02-20 23:16:21 -07:00
Travis Ralston f491e4222a Convert the user's last filter into a selection if possible 
Fixes https://github.com/vector-im/riot-web/issues/12440
 2020-02-20 23:10:43 -07:00
Travis Ralston 62aaa0db9a Always insert suggestions for user IDs 
Fixes https://github.com/vector-im/riot-web/issues/12419
 2020-02-20 23:02:10 -07:00
Travis Ralston 00cc253594 Always suggest a pill for MXID-looking users 
Part of https://github.com/vector-im/riot-web/issues/12440
 2020-02-20 23:02:10 -07:00
Weblate 52f92c327a Merge branch 'origin/develop' into Weblate. 2020-02-20 17:07:59 +00:00
Bruno Windels 744826db48
Merge pull request #4096 from matrix-org/bwindels/canonicalpill 
Accept canonical alias for pills
 2020-02-20 17:07:54 +00:00
Weblate 7ca72adc88 Merge branch 'origin/develop' into Weblate. 2020-02-20 16:44:35 +00:00
MamasLT 2027f410e3 Translated using Weblate (Lithuanian) 
Currently translated at 43.1% (916 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-02-20 16:44:35 +00:00
J. A. Durieux 403895ebb9 Translated using Weblate (Dutch) 
Currently translated at 86.8% (1846 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-02-20 16:44:33 +00:00
Bruno Windels d324dfaceb
Merge pull request #4094 from matrix-org/bwindels/dontsaywecanscan 
Fix: don't advertise ability to scan a QR code for verification
 2020-02-20 16:44:27 +00:00
Bruno Windels fee9c7d21f accept canonical alias for pills 2020-02-20 17:43:33 +01:00
Weblate b3a4526157 Merge branch 'origin/develop' into Weblate. 2020-02-20 13:58:43 +00:00
MamasLT 4cc37d13c7 Translated using Weblate (Lithuanian) 
Currently translated at 42.1% (895 of 2126 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-02-20 13:58:43 +00:00
Damir Jelić 81e61d6f9d EventIndexPanel: Move the comments around for the getStats calls. 2020-02-20 14:46:10 +01:00
Damir Jelić a650c47d6b ManageEventIndexDialog: Add a space before the function parenthesis. 2020-02-20 14:46:10 +01:00
Damir Jelić 1897d67818 EventIndexPanel: Catch getStats failures. 
Getting the stats can fail when used with Seshat. Tantivy periodically
garbage collects its files. Smaller files are merged and the old ones
are removed.

If garbage collection occurs while we try to get the stats, which go
trough the files and figure out their sizes, we can end up trying to
figure out the file size of a removed file. The getStats call will fail
in this case but we can ignore the failure since we will likely get a
nice result next time we try.
 2020-02-20 14:46:10 +01:00
Damir Jelić 9e3b0fdf7c EventIndexPanel: Fix the removal of the updateCurrentRoom listeners. 
The event listeners that update the current room and try to get the
current stats from the event index don't seem to be unmounted because
this != this confusion.

Turning them into arrow methods of the react class fixes this.
 2020-02-20 14:46:10 +01:00
Weblate b2fb5703c5 Merge branch 'origin/develop' into Weblate. 2020-02-20 13:37:49 +00:00
J. Ryan Stinnett 2dd093de49
Merge pull request #4095 from matrix-org/jryans/rm-release-exec 
Remove exec so release script continues
 2020-02-20 13:37:44 +00:00