2521 commits

Author	SHA1	Message	Date
Šimon Brandner	641c902408	i18n ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-04 08:24:20 +02:00
Šimon Brandner	1d3bf91e83	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-04 08:19:29 +02:00
Michael Telatynski	93010d34fd	Merge branch 'develop' into t3chguy/fix/6606	2021-06-03 19:33:09 +01:00
Michael Telatynski	4f50727010	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 ... Conflicts: src/components/structures/RoomView.tsx src/components/views/right_panel/UserInfo.tsx	2021-06-03 08:42:05 +01:00
David Baker	58652152c1	Strings are now in a different place...	2021-06-02 17:52:26 +01:00
David Baker	c4a26893a0	Handle user_busy in voip calls ... Newly added to MSC2746	2021-05-27 18:57:22 +01:00
Michael Telatynski	0758c09d9e	i18n	2021-05-26 14:06:12 +01:00
Michael Telatynski	27ad90760d	Iterate pinned messages	2021-05-26 13:51:17 +01:00
Michael Telatynski	fd74a946e0	add header	2021-05-25 17:24:43 +01:00
Germain Souquet	f478cd98f7	fix i18n for UserMenu spinner	2021-05-24 15:12:17 +01:00
Germain Souquet	36d95ff737	Display spinner in user menu when joining a room	2021-05-24 15:02:26 +01:00
Michael Telatynski	a6adfde8e2	Merge pull request #6070 from matrix-org/t3chguy/fix/17360 ... Improve explore rooms when no results are found	2021-05-23 21:17:35 +01:00
Michael Telatynski	35b9388fc2	Iterate PR	2021-05-21 13:37:21 +01:00
Robin Townsend	332412782e	Remove logo spinner ... Removed since design wants to avoid associating slowness with the brand. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-20 17:31:10 -04:00
Michael Telatynski	aa7ccc1420	Show prompt to create new room from room directory results	2021-05-19 20:07:54 +01:00
Šimon Brandner	17fad0e9b2	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-05-19 08:46:33 +02:00
Michael Telatynski	367ad1583d	Merge pull request #6053 from matrix-org/t3chguy/fix/17338 ... Add space invaders chat effect	2021-05-18 12:14:40 +01:00
Michael Telatynski	b5a612cd0f	Add space invaders chat effect	2021-05-18 10:29:10 +01:00
Michael Telatynski	f87f0704b9	i18n	2021-05-18 09:42:35 +01:00
Travis Ralston	5093657c71	Remove "read" level language for new API scope	2021-05-14 14:17:10 -06:00
Travis Ralston	98b2e120a7	Merge branch 'develop' into travis/msc2876	2021-05-14 14:09:57 -06:00
Michael Telatynski	4f55ac1fa6	Merge pull request #6025 from matrix-org/t3chguy/fix/16674 ... Improve Spaces "Just Me" wizard	2021-05-14 10:58:55 +01:00
Michael Telatynski	034bd9cb02	Merge pull request #6029 from matrix-org/t3chguy/fix/17275 ... Show alternative button during space creation wizard if no rooms	2021-05-14 10:48:39 +01:00
Michael Telatynski	e1df62472d	remove unused imports and run i18n	2021-05-14 10:48:24 +01:00
Jaiwanth	26dd6d5510	Swap rotate left and right buttons ... Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>	2021-05-14 08:26:29 +05:30
Travis Ralston	e38d27f64e	Merge pull request #5915 from aaronraimist/initialisation ... Typo: initilisation -> initialisation	2021-05-13 20:15:08 -06:00
Michael Telatynski	5feb9e85d7	Merge branch 'develop' into t3chguy/fix/16622	2021-05-13 16:12:42 +01:00
Michael Telatynski	2f28de8472	Show alternative button during space creation wizard if user opted to create 0 rooms	2021-05-13 13:22:50 +01:00
Michael Telatynski	b5fa4d88bf	Add extra add reactions button to encourage more diverse reactions to content	2021-05-13 10:56:51 +01:00
Michael Telatynski	236fcecf9c	i18n	2021-05-12 17:13:23 +01:00
Michael Telatynski	607ca17971	Iterate beta feedback dialog	2021-05-12 16:11:38 +01:00
Michael Telatynski	ea9be0dd4c	Merge pull request #6012 from matrix-org/t3chguy/fix/17238 ... Add feedback mechanism for beta features, namely Spaces	2021-05-11 17:46:21 +01:00
Michael Telatynski	7396ce76e5	Tweak the feedbacks a tad	2021-05-11 17:30:33 +01:00
Travis Ralston	92e30f0607	Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev	2021-05-11 10:13:21 -06:00
Michael Telatynski	7de626824e	Sprinkle some more feedback prompts in the spaces beta	2021-05-11 17:01:31 +01:00
Michael Telatynski	bf4c8f048f	Add feedback mechanism for beta features	2021-05-11 15:58:19 +01:00
Michael Telatynski	6ece4ef2ab	i18n	2021-05-11 14:08:09 +01:00
Michael Telatynski	2e19c7fd24	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx	2021-05-11 13:40:28 +01:00
Michael Telatynski	f0342b0ea7	Merge pull request #6009 from matrix-org/t3chguy/fix/15359 ... Improve permissions error when adding new server to room directory	2021-05-11 12:36:40 +01:00
Michael Telatynski	b0f23aa65b	Improve permissions error when adding new server to room directory	2021-05-11 12:20:18 +01:00
Michael Telatynski	5eed9f6cba	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227	2021-05-11 09:14:01 +01:00
Travis Ralston	12657f0fbc	Merge branch 'develop' into edit-slashcommands	2021-05-10 20:09:33 -06:00
Michael Telatynski	70d7a59ea2	Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 ... Switch the Home Space out for an All rooms space	2021-05-10 16:26:05 +01:00
Michael Telatynski	3a75eb1226	Fix handling of enter/return in space creation menu	2021-05-10 14:39:10 +01:00
Šimon Brandner	135cdb2255	Add dialog with info about the screensharing change ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-10 12:37:40 +02:00
Travis Ralston	aac1f4330d	Remove "in development" flag from voice messages	2021-05-07 19:36:29 -06:00
Michael Telatynski	cb13200c2d	last minute copy tweak	2021-05-07 11:56:41 +01:00
Michael Telatynski	1fc591628a	i18n	2021-05-07 11:51:37 +01:00
Michael Telatynski	57be074811	i18n	2021-05-07 10:48:03 +01:00
Michael Telatynski	6137162786	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1 ... Conflicts: src/stores/room-list/RoomListStore.ts	2021-05-07 10:40:07 +01:00