mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 18:11:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
37767 commits 219 branches 562 tags 474 MiB
Commit graph

2875 commits

Author SHA1 Message Date
Michael Telatynski
b91ece1bcf
Merge pull request #6828 from matrix-org/t3chguy/fix/a11y-label 2021-09-17 12:27:28 +01:00
Michael Telatynski
8c08293654 Fix reactions aria-label not being a string and thus being read as [Object object] 2021-09-17 11:36:22 +01:00
Michael Telatynski
28bc8010a7 Say Joining space instead of Joining room where we know its a space 2021-09-16 11:20:01 +01:00
Michael Telatynski
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858 2021-09-16 10:48:20 +01:00
Michael Telatynski
bbc8e4da23
Merge pull request #6594 from matrix-org/t3chguy/fix/18088 2021-09-16 10:16:33 +01:00
Michael Telatynski
b052d0730d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858 2021-09-16 10:15:43 +01:00
Michael Telatynski
e17318a364 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-16 10:05:20 +01:00
Šimon Brandner
a571460871
Use a universal copy 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-15 15:30:23 +02:00
Šimon Brandner
8094a34384
Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-15 15:28:05 +02:00
Michael Telatynski
b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room 2021-09-14 16:14:25 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891 2021-09-14 14:07:43 +01:00
Michael Telatynski
ca0d8116ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908 2021-09-10 18:02:48 +01:00
Michael Telatynski
41676b4a9b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891 2021-09-10 11:09:52 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798 2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-10 09:53:04 +01:00
Michael Telatynski
558b292c25 Adapt and re-use the RolesRoomSettingsTab for Spaces 2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e Show unsent message warning on Space panel button 2021-09-10 09:17:31 +01:00
Germain Souquet
b5bed32973 Fix i18n 2021-09-09 13:40:07 +01:00
Germain Souquet
07ebd85f7e Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533 2021-09-09 13:30:35 +01:00
Michael Telatynski
630835961b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-09-09 11:01:11 +01:00
Michael Telatynski
d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528 
Improve tooltips on space quick actions and explore button
 2021-09-08 22:59:52 +01:00
Michael Telatynski
086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018 
Make space members and user info behave more expectedly
 2021-09-08 22:59:44 +01:00
Michael Telatynski
600375cafe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-09-08 15:38:13 +01:00
Michael Telatynski
911ca07da4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-08 15:28:58 +01:00
Michael Telatynski
d4bac4752d Make space members and user info behave more expectedly 2021-09-08 13:34:26 +01:00
Michael Telatynski
8bd1f384b9 Improve tooltips on space quick actions and explore button 2021-09-08 10:16:20 +01:00
Germain Souquet
bbf66a0011 Make label clickable on narrow mode context menu 2021-09-07 17:10:09 +01:00
Germain Souquet
646ef197fe Fix PR UI defects 2021-09-07 16:02:26 +01:00
Travis Ralston
329292eb9b
Revert "Revert "Create narrow mode for Composer"" 2021-09-06 22:11:35 -06:00
Travis Ralston
945181fe39
Revert "Create narrow mode for Composer" 2021-09-06 22:08:50 -06:00
Germain
59de3c96a2
Merge pull request #6682 from matrix-org/gsouquet/compact-composer-18533 2021-09-07 05:07:00 +01:00
Michael Telatynski
68836b9c68 hide no-op m.room.encryption events and better word param changes 2021-09-06 14:59:30 +01:00
Michael Telatynski
a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
 2021-09-06 11:41:09 +01:00
Michael Telatynski
6801ec76a7
Merge pull request #6738 from matrix-org/t3chguy/fix/18780 2021-09-06 11:40:55 +01:00
Michael Telatynski
fc84682c81 i18n 2021-09-06 11:35:02 +01:00
Germain Souquet
085d8b46a7 fix i18n 2021-09-06 08:31:54 +01:00
Travis Ralston
60e2d61d25
Merge pull request #6489 from psrpinto/better-pinned-messages 
When pinning or unpinning messages, link to the specific message
 2021-09-03 13:27:49 -06:00
David Baker
de01dcfd26
Merge pull request #6700 from SimonBrandner/feature/call-timer/18566 
Show call length during a call
 2021-09-03 17:17:36 +01:00
Michael Telatynski
419eb63e51 Add missing pluralisation i18n strings for Spaces 2021-09-03 13:20:35 +01:00
Germain Souquet
997f43cb82 Implement new narrow mode UI 2021-09-03 12:03:19 +01:00
David Baker
25fb243d0b
Merge pull request #6731 from matrix-org/dbkr/prevent_multiple_calls 
Fix bug where one party's media would sometimes not be shown
 2021-09-03 12:01:54 +01:00
Germain Souquet
6d80976eae Merge branch 'develop' into gsouquet/compact-composer-18533 2021-09-03 09:20:38 +01:00
David Baker
1a0365f528 i18n 2021-09-02 19:00:30 +01:00
Dariusz Niemczyk
99a0bd935b
Merge pull request #6726 from SimonBrandner/feature/autoplay-split 
Split autoplay GIFs and videos into different settings
 2021-09-02 18:40:42 +02:00
Germain Souquet
e416952c90 Merge branch 'develop' into gsouquet/compact-composer-18533 2021-09-02 08:31:29 +01:00
Travis Ralston
b86a0dcc15 Merge branch 'develop' into travis/cross-room 2021-09-01 11:29:20 -06:00
Šimon Brandner
7fcb8ed488
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-01 17:28:16 +02:00
Michael Telatynski
979bc71609 Deduplicate join rule management between rooms and spaces 2021-09-01 15:52:56 +01:00
Germain
7621a9a0f3
Merge pull request #6658 from matrix-org/gsouquet/threaded-messaging-2349 2021-09-01 08:47:10 +01:00
Michael Telatynski
0cd00ae64f Remove non-functional DuckDuckGo Autocomplete Provider 2021-08-31 16:05:16 +01:00