Commit graph

2487 commits

Author SHA1 Message Date
Michael Telatynski
236fcecf9c i18n 2021-05-12 17:13:23 +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
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
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
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
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
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