Commit Graph

23465 Commits (8f0d81e7708a1d210b37f1b70824d7cfd19c3806)

Author SHA1 Message Date
Michael Telatynski 9d0ed6e800 fix copy-pasta error
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:19:43 +00:00
Michael Telatynski de0895b881 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:06:21 +00:00
Michael Telatynski 6664535a26 change welcome page placeholders
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:32 +00:00
Michael Telatynski f4d3cc8ee6 revert stale changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:05:14 +00:00
Michael Telatynski db6f88c66a Welcome page, support $ssoUrl and $casUrl placeholders
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 14:02:32 +00:00
Zoe 1f0d7923d7 with output type 2020-03-27 13:51:30 +00:00
Zoe 5b7e7f49d1 lint 2020-03-27 13:50:03 +00:00
Zoe 5d7adef0a2 Factor out shield display rules into one file 2020-03-27 13:45:35 +00:00
Zoe 0f2e2ea069 Update shield display rules 2020-03-27 13:44:54 +00:00
Michael Telatynski 548e918437 only auto-sso when disable_custom_urls is true
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 12:01:10 +00:00
Zoe a02731f632 Merge branch 'develop' into foldleft/reset-refactor 2020-03-27 10:50:05 +00:00
Weblate 5c2c8ac3b0 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:21:58 +00:00
Michael Telatynski cf4f595f79
Merge pull request #4289 from matrix-org/t3chguy/userInfo_avatar
blank out UserInfo avatar when changing between members
2020-03-27 10:21:53 +00:00
Weblate b8ebf21713 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:20:07 +00:00
Bruno Windels 2278a724aa
Merge pull request #4283 from matrix-org/bwindels/cancelverifypanel
Add cancel button to verification panel
2020-03-27 10:20:02 +00:00
Weblate 813d214773 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:19:37 +00:00
Bruno Windels 528c820a2b
Merge pull request #4284 from matrix-org/bwindels/showverifreqinsteadofmember
Show ongoing verification request straight away when navigating to member
2020-03-27 10:19:31 +00:00
Weblate 9a86a648b6 Merge branch 'origin/develop' into Weblate. 2020-03-27 10:17:00 +00:00
Kévin C 15f61dca35 Translated using Weblate (French)
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-03-27 10:17:00 +00:00
Bruno Windels a2737899c1
Merge pull request #4276 from matrix-org/bwindels/transparentscrollbars
Fix: allow scrolling while window is not focused & remove scrollbar hack
2020-03-27 10:16:53 +00:00
Michael Telatynski 98f9f1e956 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:43 +00:00
Michael Telatynski a974f0fe46 blank out UserInfo avatar when changing between members
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 09:59:18 +00:00
Weblate 657addd13e Merge branch 'origin/develop' into Weblate. 2020-03-27 09:31:21 +00:00
Szimszon b538bfa7da Translated using Weblate (Hungarian)
Currently translated at 100.0% (2240 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-03-27 09:31:21 +00:00
Stanislav Lukeš 2ec6210ebd Translated using Weblate (Czech)
Currently translated at 96.7% (2167 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-03-27 09:31:16 +00:00
Jeff Huang 538816a626 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2240 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-03-27 09:31:13 +00:00
Besnik Bleta bfee6d8319 Translated using Weblate (Albanian)
Currently translated at 99.7% (2233 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-03-27 09:31:12 +00:00
David Baker 1f12d16b70
Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached
Show whether backup key is cached
2020-03-27 09:31:03 +00:00
Michael Telatynski 7fbfd73e11 Show modal on "instant SSO"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 01:17:42 +00:00
Michael Telatynski b489a7c0d5 Allow reacting to stickers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-27 00:50:41 +00:00
David Baker ccb3283fd3 Show whether backup key is cached
in cross signing debug panel
2020-03-26 18:50:31 +00:00
Weblate c77fdcf088 Merge branch 'origin/develop' into Weblate. 2020-03-26 17:12:38 +00:00
Kenneth Larsson 1110735df9 Translated using Weblate (Swedish)
Currently translated at 68.3% (1529 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-03-26 17:12:37 +00:00
Osoitz b21cf5edc6 Translated using Weblate (Basque)
Currently translated at 100.0% (2240 of 2240 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-03-26 17:12:31 +00:00
Bruno Windels 2bf4513b44
Merge pull request #4285 from matrix-org/bwindels/renameunverifiedsessiontoast
Rename unverified session toast
2020-03-26 17:12:25 +00:00
Bruno Windels 491dad3669
Merge pull request #4286 from matrix-org/bwindels/picklastactivedmforverifreq
Fix: pick last active DM for verification request
2020-03-26 17:05:17 +00:00
Bruno Windels e3e40ace81 Fix: pick last active DM for verification request 2020-03-26 17:45:59 +01:00
Bruno Windels ce77593cf9 rename toast title 2020-03-26 17:37:44 +01:00
Bruno Windels abf12a3ddf Show EncryptionPanel straight away when there is an ongoing verification request for a user 2020-03-26 17:31:31 +01:00
Bruno Windels a6fbb98252 only show close button when not in a dialog, which already has one 2020-03-26 17:02:32 +01:00
Bruno Windels 4f3842d75e pick color similar to chevron for cancel X button 2020-03-26 16:58:17 +01:00
Bruno Windels 34b0c1b1e7 fix lint & other cleanup 2020-03-26 16:54:31 +01:00
Bruno Windels 9b54d15fcd add cancel button to verification panel 2020-03-26 16:53:46 +01:00
Zoe 04849f7f0d incorporated design feedback 2020-03-26 13:47:32 +00:00
Zoe 9c392ce8bb Merge branch 'develop' into foldleft/better-errors 2020-03-26 13:38:50 +00:00
RiotRobot 2fe0edd3eb v2.3.0-rc.1 2020-03-26 13:21:11 +00:00
RiotRobot 91f706260b Prepare changelog for v2.3.0-rc.1 2020-03-26 13:21:10 +00:00
Bruno Windels 053a5a5ff4
Merge pull request #4269 from ThobyV/thobyv/hide-formatBar-on-highlight-backspacing-message
Fix formatBar not hidden after highlight and backspacing some text
2020-03-26 13:19:06 +00:00
thobyv-kismat 1713006958 recommit bwindels commited changes to refactor check logic after rebase mistake 2020-03-26 14:03:38 +01:00
RiotRobot a1c83a4f0e Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:02:54 +00:00