PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
33930 commits 1 branch 0 tags 338 MiB
Commit graph

2549 commits

Author SHA1 Message Date
Michael Telatynski
7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Germain Souquet
6606a1142d Update unencrypted room warning copy 2021-06-10 11:29:10 +01:00
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet
c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Michael Telatynski
2b99afc741 i18n 2021-06-08 17:05:56 +01:00
Michael Telatynski
f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski
34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
David Baker
399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error 
Better handling for widgets that fail to load
 2021-06-08 16:28:44 +01:00
David Baker
90a58380fd Make it translateable 
And also the other one that I copied from
 2021-06-08 16:15:20 +01:00
Robin Townsend
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski
f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
Robin Townsend
21ff1f521f Fix i18n strings 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 23:14:26 -04:00
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Michael Telatynski
93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01: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
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Michael Telatynski
d319768b2e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-05-28 13:06:48 +01:00
Nique Woodhouse
ea26393709 Styling amends to accommodate the invite dialog footer 2021-05-28 13:00:18 +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
f75fb3b349 Add footer and privacy note to the start dm dialog 2021-05-27 15:51:25 +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
Robin Townsend
5c7da97ff6 Give forward dialog send buttons an accessible label 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:55:08 -04:00
Robin Townsend
88e0e9b9fb Merge branch 'develop' into improved-forwarding-ui 2021-05-24 08:23:07 -04: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
Robin Townsend
cd460a2555 Adjust forward dialog copy 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:59:13 -04:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:41:29 -04:00
Michael Telatynski
35b9388fc2 Iterate PR 2021-05-21 13:37:21 +01:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04: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
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04: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
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04: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