OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,614 Commits
210 Branches
549 Tags
658 MiB
Commit Graph

23614 Commits (a5830c229ec62448cb014d3552955552be0f3ec6)

Author SHA1 Message Date
Michael Telatynski a5830c229e more tidying 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:30:40 +01:00
Michael Telatynski c7870090f8 clean ups 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:29:38 +01:00
Michael Telatynski 83a4558d49 remove RedactedGrouper for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:27:46 +01:00
Michael Telatynski a399b1018a fix flashing `by ""` 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:16:08 +01:00
Michael Telatynski 9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
Michael Telatynski 433b166190
Merge pull request #4501 from matrix-org/t3chguy/fix_floats 
only clear on continuations where the clear isn't done by SenderProfile
 2020-04-27 18:36:48 +01:00
Michael Telatynski c537b81bea
Merge pull request #4495 from matrix-org/t3chguy/local_alias_remove 
cap width of editable item list item to leave space for its X button
 2020-04-27 18:36:39 +01:00
Michael Telatynski da7a2f2f62 only clear on continuations where the clear isn't done by SenderProfile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 17:50:50 +01:00
David Baker b608c6925c
Merge pull request #4498 from matrix-org/dbkr/link_from_settings_to_userprofile 
Add a link from settings / devices to your user profile
 2020-04-27 16:28:04 +01:00
David Baker 5d4aa03c8e Lint 2020-04-27 14:43:17 +01:00
David Baker 4e38b63b82 Update i18n 2020-04-27 14:38:22 +01:00
David Baker 03d89361cd Update to (almost) match design 2020-04-27 14:35:32 +01:00
David Baker ca0cede1aa Add a link from settings / devices to your user profile 
Temporarily until you can verify devices in settings

Fixes https://github.com/vector-im/riot-web/issues/13401
 2020-04-27 14:25:47 +01:00
David Baker b3f19086f2
Merge pull request #4496 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-04-27 13:14:09 +01:00
Michael Albert b0fa823c12 Translated using Weblate (German) 
Currently translated at 77.9% (1787 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-27 09:14:10 +00:00
Priit Jõerüüt 2babe9cde2 Translated using Weblate (Estonian) 
Currently translated at 6.4% (146 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-27 09:14:09 +00:00
Stanislav Lukeš 6de03f425d Translated using Weblate (Czech) 
Currently translated at 93.8% (2152 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-04-27 09:13:59 +00:00
Osoitz e02d061545 Translated using Weblate (Basque) 
Currently translated at 100.0% (2294 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-04-27 09:13:58 +00:00
Txopi ba7b39dcc7 Translated using Weblate (Basque) 
Currently translated at 100.0% (2294 of 2294 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-04-27 09:13:55 +00:00
Michael Telatynski 4fc8fc9d6c cap width of editable item list item to leave space for its X remove button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-26 12:52:17 +01:00
Weblate a5a9d96673 Merge branch 'origin/develop' into Weblate. 2020-04-24 17:56:45 +00:00
David Baker 121ac14273
Merge pull request #4485 from matrix-org/dbkr/setup_encryption_dialog_icon 
Make icon change in SetupEncryptionDialog
 2020-04-24 18:56:40 +01:00
Weblate 1e33570689 Merge branch 'origin/develop' into Weblate. 2020-04-24 16:45:09 +00:00
Travis Ralston 3b7cd3106e
Merge pull request #4487 from matrix-org/travis/labs-remove-padlocks 
Remove invite only padlocks feature flag
 2020-04-24 10:45:03 -06:00
David Baker 6460f6303c Move store subscribe to didmount 2020-04-24 17:36:02 +01:00
Weblate d18ba9bed0 Merge branch 'origin/develop' into Weblate. 2020-04-24 16:33:42 +00:00
David Baker 1c00709029
Merge pull request #4486 from matrix-org/dbkr/correct_toast 
Fix incorrect toast if security setup skipped
 2020-04-24 17:33:36 +01:00
Travis Ralston 117322b3b5 Remove invite only padlocks feature flag 
Fixes https://github.com/vector-im/riot-web/issues/13366

Only known issue on this is https://github.com/vector-im/riot-web/issues/12148

This has been pre-approved by Product.
 2020-04-24 10:05:28 -06:00
David Baker a1e174d8b8 Fix incorrect toast if security setup skipped 
DevieListener didn't wait for the user's device list to be downloaded
so it would think the user didn't have cross-signing set up.

Also clear the rest of the state on stop().

Fixes https://github.com/vector-im/riot-web/issues/13372
 2020-04-24 15:58:28 +01:00
David Baker bbce37b92f Make icon change in SetupEncryptionDialog 
Fixes https://github.com/vector-im/riot-web/issues/13368
 2020-04-24 15:39:54 +01:00
Michael Telatynski d3b0e008c1 first draft of Redaction ELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:39:23 +01:00
Michael Telatynski e16f511527 Redesign redactions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:07:39 +01:00
Weblate 8c0bb43637 Merge branch 'origin/develop' into Weblate. 2020-04-24 12:23:45 +00:00
Michael Albert 8c414014e6 Translated using Weblate (German) 
Currently translated at 77.2% (1771 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-24 12:23:45 +00:00
Michael Telatynski 30a409a74e
Merge pull request #4482 from matrix-org/revert-4344-t3chguy/emojibase 
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
 2020-04-24 13:23:38 +01:00
Michael Telatynski 972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 2020-04-24 12:25:19 +01:00
Weblate 070535d082 Merge branch 'origin/develop' into Weblate. 2020-04-24 05:43:41 +00:00
Imre Kristoffer Eilertsen a15db97b77 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 49.2% (1130 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-04-24 05:43:40 +00:00
Travis Ralston d8eb761106
Merge pull request #4481 from matrix-org/travis/fix-widget-params-again 
Fix widget URL templating (again)
 2020-04-23 23:43:35 -06:00
Travis Ralston 50783c2432 Appease the linter 2020-04-23 23:25:53 -06:00
Travis Ralston 28865e27bc Don't overwrite the 'domain' data key for all widgets 
Some widgets, which aren't Jitsi widgets, might need this to be something else.
 2020-04-23 15:24:27 -06:00
Travis Ralston efaf4fbbda Decode dollar signs in safe widget URLs before rendering/templating 
Fixes https://github.com/vector-im/riot-web/issues/13344
 2020-04-23 15:24:27 -06:00
Weblate c9ac8cd88f Merge branch 'origin/develop' into Weblate. 2020-04-23 17:24:51 +00:00
J. Ryan Stinnett 3b362f2845
Merge pull request #4479 from matrix-org/jryans/login-recovery-link 
Fix recovery link on login verification flow
 2020-04-23 18:24:45 +01:00
J. Ryan Stinnett 5af3d83cc7 Fix recovery link on login verification flow 
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
 2020-04-23 18:14:30 +01:00
Weblate 3eeb6ca2c5 Merge branch 'origin/develop' into Weblate. 2020-04-23 14:57:25 +00:00
Szimszon f768b23b38 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2295 of 2295 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-04-23 14:57:25 +00:00
Bruno Windels 0c1414aca9
Merge pull request #4476 from rkfg/pill-fix 
Make avatars in pills occupy the entire space using cropping
 2020-04-23 14:57:19 +00:00
Weblate f2ca8f1d2c Merge branch 'origin/develop' into Weblate. 2020-04-23 14:18:16 +00:00
Travis Ralston 35dd892dce
Merge pull request #4458 from matrix-org/travis/fix-sticker-picker-add 
Use WidgetType more often to avoid breaking new sticker pickers
 2020-04-23 08:18:12 -06:00