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

2742 commits

Author SHA1 Message Date
Michael Telatynski
e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-06-22 17:38:05 +01:00
Michael Telatynski
4a66794236 update copy 2021-06-22 17:26:19 +01:00
Michael Telatynski
3c9cd938d0 remove spurious full stop 2021-06-22 15:29:53 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051 2021-06-22 15:07:04 +01:00
Michael Telatynski
847e3dcbce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 
 Conflicts:
	src/dispatcher/actions.ts
 2021-06-22 14:11:37 +01:00
Michael Telatynski
1f0fdb95cd Improve accessibility of subspaces in the space panel 2021-06-22 11:59:04 +01:00
Germain Souquet
7825c30bf7 Improve event index initialisation failure message in search bar for supported platforms 2021-06-21 15:41:47 +01:00
Šimon Brandner
ce47662b55
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-21 11:26:39 +02:00
Šimon Brandner
686e7d18c3
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-20 08:14:12 +02:00
David Teller
77a4d345bd
Submitting abuse reports to moderators (#6213) 
This patch is part of MSC3215. It implements `feature_report_to_moderator`
    to let end-users send report to room moderators instead of homeserver
    administrators.

    This only works if the room has been setup for moderation, something that
    does not have a UX yet.

    Signed-off-by: David Teller <davidt@element.io>
 2021-06-18 18:09:02 +02:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:07:43 +02:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591 2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Michael Telatynski
100de336a1 i18n 2021-06-16 20:12:31 +01:00
Peter Vágner
b05e0263d2 Merge branch 'develop' into voip-a11y 2021-06-16 14:44:12 +02:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Michael Telatynski
89221bde0f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1 
 Conflicts:
	src/dispatcher/actions.ts
 2021-06-15 13:58:13 +01:00
Michael Telatynski
83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +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
Peter Vágner
a94d11235e Changed the buttons to TooltipButtons and added the tooltip for the hangup button 
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-06-12 14:17:10 +02:00
Peter Vágner
6458f717cc i18n 
Signed-off-by: Peter Vágner <pvdeejay@gmail.com>
 2021-06-12 13:53:44 +02:00
Šimon Brandner
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-06-12 13:32:49 +02:00
Šimon Brandner
0c55a6c5bf
Add presenting text 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-12 11:50:16 +02: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
Šimon Brandner
22567a16ef
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 20:10:55 +02:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 19:23:14 +02: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
Michael Telatynski
90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +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
Michael Telatynski
8c34a8461e Add way to specify address during public space creation 2021-06-07 08:57:39 +01:00
Michael Telatynski
b2b95257a8 Convert RoomAliasField to Typescript 2021-06-07 08:54:41 +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
Š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
Šimon Brandner
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Šimon Brandner
6eb33ac730
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:49:05 +02:00
Šimon Brandner
3b2d6d442f
Translate unknown call state 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-04 07:43:30 +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
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Šimon Brandner
c03f0fb13d
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 14:47:46 +02:00
Šimon Brandner
91288ab525
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-01 11:51:34 +02: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
Michael Telatynski
42ffc5c9e8 Add support to keyboard shortcuts dialog for [digits] 2021-05-24 18:08: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
Šimon Brandner
8b7a73b3ab
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-22 20:24:41 +02:00
Šimon Brandner
7e165384fd
Merge branch 'develop' into reorganize-preferences 2021-05-22 17:25:04 +02: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
Š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
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
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
Robin Townsend
c39d9649ba Merge branch 'develop' into improved-forwarding-ui 2021-05-10 13:38:02 -04: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
Robin Townsend
7fa81766db Remove old forwarding code 
This has been replaced by ForwardDialog.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:11:06 -04:00
Robin Townsend
b9b237fc9a Replace forwarding UI with dialog 
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:11:06 -04: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
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
 2021-05-06 13:06:50 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed 
Support for multiple streams (not MSC3077)
 2021-05-06 11:20:09 +01:00
Aaron Raimist
9aa711b7b7 Merge branch 'develop' into initialisation 2021-05-06 00:09:48 -05:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
J. Ryan Stinnett
5daad1de67
Merge pull request #5961 from SimonBrandner/fix/15460/allow-p2p-calls 
Add a note about sharing your IP in P2P calls
 2021-05-05 16:59:06 +01:00
Michael Telatynski
7cae566011
Merge pull request #5975 from matrix-org/t3chguy/fix/16891 
Add retry mechanism and progress bar to add existing to space dialog
 2021-05-05 16:32:31 +01:00
J. Ryan Stinnett
4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal 
Warn on access token reveal
 2021-05-05 16:32:12 +01:00
Michael Telatynski
07f5b6e8c4 Add retry mechanism and progress bar to add existing to space dialog 2021-05-05 11:45:12 +01:00
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01:00
Travis Ralston
54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston
704edfc05b
Merge pull request #5959 from matrix-org/travis/voicemessages/permissions 
Handle no/blocked microphones in voice messages
 2021-05-04 09:03:38 -06:00
J. Ryan Stinnett
28128ca45f
Merge pull request #5934 from aaronraimist/security-phrase-2 
Another change from recovery passphrase to Security Phrase
 2021-05-04 11:43:23 +01:00
Šimon Brandner
0fe6a389d4
Add a note about sharing your IP with P2P calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-04 12:36:22 +02:00
Travis Ralston
e04490284d Support UI for MSC2876: Widgets reading events from rooms 
MSC: https://github.com/matrix-org/matrix-doc/pull/2876
Fixes https://github.com/vector-im/element-web/issues/15747
Requires https://github.com/matrix-org/matrix-widget-api/pull/34
 2021-05-03 21:50:25 -06:00
Travis Ralston
87a57ec7e5 Handle no/blocked microphones in voice messages 
Fixes https://github.com/vector-im/element-web/issues/17139
 2021-05-03 16:41:39 -06:00
Travis Ralston
3f4ee9742a Simple rendering of voice messages in the timeline 
Fixes https://github.com/vector-im/element-web/issues/17138
 2021-05-03 11:41:14 -06:00
Aaron Raimist
03a098887a
Change confirmation string in CreateSecretStorageDialog.js to match 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-30 19:44:43 -05:00
Šimon Brandner
e52fd3791e
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-30 11:10:45 +02:00
Šimon Brandner
e2bee396bb
Merge branch 'develop' into reorganize-preferences 2021-04-30 10:55:29 +02:00
Robin Townsend
bd602e7089 Hide world readable history option in encrypted rooms 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-29 18:23:39 -04:00
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-04-28 22:49:36 +01:00
Travis Ralston
3890bec8ad
Merge pull request #5860 from samhh/always-render-ignored-users 
Render ignored users setting regardless of if there are any
 2021-04-28 09:51:57 -06:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-28 10:52:23 +02:00
Aaron Raimist
31ff05a862 Merge branch 'develop' into warn-on-access-token-reveal 2021-04-27 19:25:38 -05:00
Aaron Raimist
6754a0b483
Switch to <details> 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-27 19:12:22 -05:00
Aaron Raimist
79e03332e3
Another change from recovery passphrase to Security Phrase 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-27 16:51:53 -05:00
Travis Ralston
c1bb0bb0b8 Add a delete button 2021-04-27 15:02:15 -06:00
Travis Ralston
30e120284d Add simple play/pause controls 2021-04-27 15:02:15 -06:00
Travis Ralston
32e3ce3dea Handle basic state machine of recordings 2021-04-27 15:02:15 -06:00
Germain Souquet
fa534e4755 Add room intro warning when e2ee is not enabled 2021-04-27 14:47:56 +01:00
Michael Telatynski
13a5d06e29
Merge pull request #5926 from matrix-org/t3chguy/fix/17067 
Fix issues with space hierarchy in layout and with incompatible servers
 2021-04-27 11:21:15 +01:00
Michael Telatynski
43b43dc685 tidy up code 2021-04-26 16:11:07 +01:00
J. Ryan Stinnett
9401a6d6dc
Merge pull request #5916 from SimonBrandner/image-view-zoom 
Dynamic max and min zoom in the new ImageView
 2021-04-26 15:46:26 +01:00
Šimon Brandner
38566a3644
i18n 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-26 15:51:56 +02:00
Michael Telatynski
8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Aaron Raimist
f3c0fc96a3 Merge branch 'develop' into warn-on-access-token-reveal 2021-04-24 15:01:19 -05:00
Travis Ralston
82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06:00
Šimon Brandner
c54aa86532
Merge branch 'develop' into feed 2021-04-23 18:32:05 +02:00
Aaron Raimist
bf444ce22e
Typo: initilisation -> initialisation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-23 11:31:30 -05:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Travis Ralston
c5dd6b4dfb Update action bar to incorporate sending states 
This moves most of them out of the context menu.
 2021-04-21 16:24:17 -06:00
Travis Ralston
91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Michael Telatynski
c4ef1f9828
Merge pull request #5415 from aaronraimist/only-member-warning 
Warn when you attempt to leave room that you are the only member of
 2021-04-20 12:33:19 +01:00
Michael Telatynski
63ed9c271b
Merge pull request #5866 from ColonisationCaptain/develop 
Add missing space in seshat dialog and the corresponding string
 2021-04-20 09:02:53 +01:00
Travis Ralston
01fc88f88a
Merge pull request #5871 from matrix-org/travis/voice/countdown 
Limit voice recording length
 2021-04-19 10:30:38 -06:00
Michael Telatynski
12d96fe096
Merge pull request #5881 from matrix-org/t3chguy/fix/16704 
Clean up add existing to space dialog and include DMs in it too
 2021-04-19 17:29:09 +01:00
Michael Telatynski
c953b1b6bb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pr/only-member-warning 2021-04-19 12:01:32 +01:00
Michael Telatynski
64e0626693 i18n 2021-04-19 11:13:08 +01:00
Travis Ralston
f955f33071 Merge branch 'develop' into travis/voice/countdown 2021-04-16 10:00:11 -06:00
Travis Ralston
eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag 
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
 2021-04-15 00:47:09 -06:00
Travis Ralston
0677cf866c Cap recording length, and warn at 10s remaining 
See diff for details. Note that this introduces an "Uploading" state which is not currently used.

At the moment, if a user hits the maximum time then their recording will be broken. This is expected to be fixed in a future PR.
 2021-04-14 21:15:06 -06:00
Aaron Raimist
9c250171b4
Use new copy 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-14 18:27:41 -05:00
ColonisationCaptain
c521be2d16 add missing spaces 2021-04-14 14:28:41 +01:00
Jaiwanth
f32eee9475 Added slashcommands support to edit message composer 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-04-14 16:43:21 +05:30
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view 
Improve image view
 2021-04-13 19:01:27 -06:00
Sam A. Horvath-Hunt
14b8b0f8da
Render ignored users setting regardless of if there are any 
Signed-off-by: Sam A. Horvath-Hunt <hello@samhh.com>
 2021-04-13 21:45:09 +01:00
Travis Ralston
106de5f7ba Merge branch 'develop' into travis/reset-passphrase 2021-04-12 14:55:31 -06:00
Travis Ralston
ee9e1a72cb
Merge pull request #5838 from matrix-org/travis/add-acl-pl 
Give server ACLs a name in 'roles & permissions' tab
 2021-04-12 14:13:30 -06:00
J. Ryan Stinnett
098a8711a7
Merge pull request #5847 from matrix-org/jryans/reason-message-tweaks 
Tweak appearance of invite reason
 2021-04-12 13:36:20 +01:00
J. Ryan Stinnett
798a891d83 Tweak appearance of invite reason 
This adjusts the display of invite reasons to match design feedback.

Fixes https://github.com/vector-im/element-web/issues/16869
 2021-04-12 12:28:42 +01:00
J. Ryan Stinnett
fc0ee15924 Update strings 2021-04-09 17:14:35 +01:00
Travis Ralston
073c05543c Give server ACLs a name in 'roles & permissions' tab 
The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events".
 2021-04-08 19:20:08 -06:00
Travis Ralston
01c5f84f60 Merge branch 'develop' into travis/reset-passphrase 2021-04-08 18:07:46 -06:00
Šimon Brandner
adb0877591
Merge branch 'develop' into feed 2021-04-07 19:17:35 +02:00
J. Ryan Stinnett
5d027ffcf4
Merge pull request #5694 from robintown/show-invite-reasons 
Show invite reasons
 2021-04-06 10:48:54 +01:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation 
Require strong password in forgot password form
 2021-04-05 00:46:47 -06:00
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed 
Looking forward to merging again! :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-03 09:15:55 +02:00
Travis Ralston
2b47bac2af Update i18n 2021-04-02 19:36:28 -06:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-02 08:15:51 +02:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer 
Attended transfer
 2021-04-01 17:34:30 +01:00
Panagiotis
901d5a86d0 Merge branch 'develop' into forgot-password-validation 2021-04-01 12:39:25 +03:00
Germain Souquet
a4345811b0 Merge branch 'develop' into gsouquet-seshat-reset 2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01 Update seshat reset dialog copy 2021-04-01 09:03:50 +01:00
Aaron Raimist
0af52c931e
Merge branch 'develop' into only-member-warning 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-03-31 23:15:09 -05:00
Robin Townsend
2477258249 Merge branch 'develop' into show-invite-reasons 2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c Show invite reasons 
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-03-31 15:46:09 -04:00
J. Ryan Stinnett
58343c7699 Fix search error typo 
This fixes a typo in the recently added search error message.
 2021-03-31 11:55:21 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01:00
Travis Ralston
262475f96e Add a button to reset personal encryption state during login 2021-03-30 15:37:06 -06:00
J. Ryan Stinnett
b089f3d2f9
Merge pull request #5585 from ndarilek/label-base-avatar 
Label unlabeled avatar button in event panel
 2021-03-30 12:21:17 +01:00
J. Ryan Stinnett
661202839c
Merge pull request #5696 from robintown/spoiler-command 
Add /spoiler command
 2021-03-30 11:58:33 +01:00
Germain
096d4102b8
Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit 
Add user settings for warn before exit
 2021-03-29 12:11:55 +01:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Hubert Chathi
e23583db40
Merge pull request #5763 from uhoreg/room-history-key-sharing2 
Share keys for historical messages when inviting users to encrypted rooms
 2021-03-26 10:41:54 -04:00