OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
36,550 Commits
219 Branches
563 Tags
450 MiB
Commit Graph

36550 Commits (c259e25f529df698352deacf268e6d7cb0b95432)

Author SHA1 Message Date
Michael Telatynski ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Robin Townsend f8a922eaa1 Apply code review suggestions 
including filling in gaps in emoji shortcode coverage.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 15:09:15 -04:00
Weblate 5ff5b9f45e Merge branch 'origin/develop' into Weblate. 2021-07-19 16:56:29 +00:00
Michael Telatynski b6feaf74bc
Merge pull request #6407 from robintown/uppercase-avatar-placeholders 2021-07-19 17:56:25 +01:00
Robin Townsend b36c748940 Fix avatar placeholders not getting capitalized 
Regressed by 096d0a7d12.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-19 12:48:44 -04:00
Weblate 310c7807a1 Merge branch 'origin/develop' into Weblate. 2021-07-19 16:24:11 +00:00
Travis Ralston 4856559661
Merge pull request #6406 from matrix-org/travis/notifications-ui-order 
Revert order of notification setting radios
 2021-07-19 10:24:06 -06:00
Travis Ralston 6862d97961 APPEASE THY JSON 2021-07-19 10:18:15 -06:00
Travis Ralston b31043b5eb Revert order of notification setting radios 
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
 2021-07-19 10:15:42 -06:00
Šimon Brandner 1b74286cf0
/me has managed to steel something by accident 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:11:23 +02:00
Šimon Brandner 3250b35151
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:10:31 +02:00
Travis Ralston 097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
Šimon Brandner 5d5b9f6022
Better labeling of images and stickers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:04:33 +02:00
Šimon Brandner 28f5827884
Add FileUtils 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-19 18:02:33 +02:00
Michael Telatynski f2a88599a4 delint 2021-07-19 16:51:43 +01:00
Michael Telatynski de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
Weblate 5ba54ea3da Merge branch 'origin/develop' into Weblate. 2021-07-19 15:16:43 +00:00
RiotRobot 676d2aa187 Resetting package fields for development 2021-07-19 16:16:18 +01:00
RiotRobot 13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot e7ad33db0f v3.26.0 2021-07-19 16:00:26 +01:00
RiotRobot 4d11d5d5ea Prepare changelog for v3.26.0 2021-07-19 16:00:25 +01:00
Weblate 3f75e9f224 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:58:45 +00:00
Michael Telatynski a3e5d76064
Merge pull request #6397 from matrix-org/t3chguy/fix/18040 
Respect compound emojis in default avatar initial generation
 2021-07-19 15:58:40 +01:00
RiotRobot 3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +01:00
Dariusz Niemczyk 5acc7fe8d4
Make `errorText` properly optional instead of null 2021-07-19 16:49:39 +02:00
Weblate 0c6d3563e1 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:34:24 +00:00
David Baker 96ddfefc03
Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org 
Update eslint-plugin-matrix-org
 2021-07-19 15:34:21 +01:00
Dariusz Niemczyk 9e9992078b
Update src/@types/global.d.ts 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-19 16:34:07 +02:00
Dariusz Niemczyk 97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-19 16:28:30 +02:00
Dariusz Niemczyk c2394b9161
Fix styling comments 2021-07-19 16:27:39 +02:00
David Baker 99edfc24e5 Update eslint-plugin-matrix-org 2021-07-19 15:26:40 +01:00
Weblate ea1e8bfdd4 Merge branch 'origin/develop' into Weblate. 2021-07-19 14:17:17 +00:00
XoseM 4d72e05dc6 Translated using Weblate (Galician) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2021-07-19 14:17:16 +00:00
James Salter 1ea70e5b6e
Merge pull request #6402 from matrix-org/copy-room-link 
Rename Copy Link to Copy Room Link
 2021-07-19 15:14:19 +01:00
James Salter f9fbf6f210 Rename Copy Link to Copy Room Link 
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
 2021-07-19 15:05:04 +01:00
Dariusz Niemczyk 9de5ebd4de
Fix grecaptcha throwing useless error sometimes 2021-07-19 15:41:44 +02:00
Weblate b0cc7afe85 Merge branch 'origin/develop' into Weblate. 2021-07-19 11:53:47 +00:00
jelv ddaa35cb8b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-19 11:53:47 +00:00
Thibault Martin c9a26665ef Translated using Weblate (French) 
Currently translated at 99.8% (3036 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-07-19 11:53:45 +00:00
Michael Telatynski 48817499e4
Merge pull request #6399 from matrix-org/t3chguy/fix/18032 
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
 2021-07-19 12:53:34 +01:00
Michael Telatynski c1ed023e17 Update Twemoji fonts for Unicode Emoji 13.1 2021-07-19 10:45:26 +01:00
Weblate 8893e3ab2e Merge branch 'origin/develop' into Weblate. 2021-07-19 09:09:22 +00:00
Priit Jõerüüt a754a08d3b Translated using Weblate (Estonian) 
Currently translated at 99.6% (3031 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-07-19 09:09:22 +00:00
Jeff Huang 4a93c7cffc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3041 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-07-19 09:09:17 +00:00
jelv 4b5ccd87fe Translated using Weblate (Dutch) 
Currently translated at 99.9% (3038 of 3041 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
 2021-07-19 09:09:13 +00:00
David Baker 863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox 
Fix bug where 'other homeserver' would unfocus
 2021-07-19 10:09:03 +01:00
Michael Telatynski e54a7f0997 Don't throw exception from setStickyRoom as it split-brains the RoomListStore 2021-07-19 09:36:25 +01:00
Travis Ralston 70e525d672 Fix component export 2021-07-18 17:06:30 -06:00
Robin Townsend c0123f5dad Merge branch 'develop' into watch-show-timestamps 2021-07-18 11:47:44 -04:00
Weblate 09267addf1 Merge branch 'origin/develop' into Weblate. 2021-07-18 12:38:20 +00:00