sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
32,743 Commits 4 Branches 19 Tags
11ee3c752f9f4be44cc98c751b2bd3a0a7a3caef
Commit Graph
2437 Commits
Author SHA1 Message Date
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 RalstonandGitHub 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
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
Michael TelatynskiandGitHub 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 StinnettandGitHub 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
Travis Ralston 82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06: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 TelatynskiandGitHub 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 TelatynskiandGitHub 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 RalstonandGitHub 01fc88f88a Merge pull request #5871 from matrix-org/travis/voice/countdown 
Limit voice recording length
 2021-04-19 10:30:38 -06:00
Michael TelatynskiandGitHub 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
Travis RalstonandGitHub 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 RalstonandGitHub 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 StinnettandGitHub 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
J. Ryan StinnettandGitHub 5d027ffcf4 Merge pull request #5694 from robintown/show-invite-reasons 
Show invite reasons
 2021-04-06 10:48:54 +01:00
Travis RalstonandGitHub 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
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 BakerandGitHub 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 StinnettandGitHub 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 StinnettandGitHub 661202839c Merge pull request #5696 from robintown/spoiler-command 
Add /spoiler command
 2021-03-30 11:58:33 +01:00