Commit Graph

32418 Commits

Author SHA1 Message Date
Michael Telatynski
130565945d Merge branch 't3chguy/fix/16976' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16976 2021-04-22 09:08:59 +01:00
Michael Telatynski
23c61752cd Add comment 2021-04-22 09:08:25 +01:00
Michael Telatynski
ca07b1ed04
Update res/css/views/elements/_FacePile.scss
Co-authored-by: Germain <germain@souquet.com>
2021-04-22 09:06:53 +01:00
Michael Telatynski
90cd5d0472 Remove old redundant hover effect 2021-04-22 08:18:28 +01:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Germain
68fb9a78c4
Merge pull request #5874 from matrix-org/gsouquet-room-events 2021-04-21 09:09:01 +01:00
Michael Telatynski
eba0fbf902
Merge pull request #5891 from SimonBrandner/fix/context-switching
Avoid being stuck in a space
2021-04-20 15:28:47 +01:00
Šimon Brandner
9b81f5b4a0
Add a comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 16:11:34 +02:00
Šimon Brandner
3adb2635ba
Revert "Remove unnecessary check"
This reverts commit 08c0f0a67e.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 15:40:32 +02:00
Michael Telatynski
b2e9f6731b
Merge pull request #5795 from SimonBrandner/spaces/context-switching
[Spaces] Context switching
2021-04-20 12:38:54 +01: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
Šimon Brandner
4344ff9097
Update src/stores/SpaceStore.tsx
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-04-20 13:31:50 +02:00
Šimon Brandner
d4ca087c2e
Make getLastViewedRoomsStorageKey() make sense
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 13:24:23 +02:00
Šimon Brandner
1934c4a32f
Add getLastViewedRoomsStorageKey()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:39:11 +02:00
Šimon Brandner
f9292c364c
Check if we are joined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:25:56 +02:00
Šimon Brandner
08c0f0a67e
Remove unnecessary check
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 12:22:25 +02:00
Šimon Brandner
a3d0ccf306
Merge branch 'develop' into spaces/context-switching 2021-04-20 12:06:59 +02:00
Germain
9d2833c74b
Merge pull request #5884 from matrix-org/gsouquet-jitsi-logout 2021-04-20 09:16:10 +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
Michael Telatynski
542890f5e8
Merge pull request #5885 from SimonBrandner/dumb-change
A tiny change to make the Add existing rooms dialog a little nicer
2021-04-20 08:53:33 +01:00
Germain Souquet
a3617fa3cd Remove unnecessary logout action 2021-04-20 08:51:14 +01:00
Michael Telatynski
6ff976f429
Merge pull request #5889 from SimonBrandner/remove-margin-weird
Remove weird margin from the file panel
2021-04-20 08:12:43 +01:00
Šimon Brandner
548cd38a5c
Remove weird margin from the file panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-20 08:22:43 +02:00
Šimon Brandner
910a3e5f31
A little nicer spacing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 20:59:54 +02:00
Šimon Brandner
b52d6e3d97
A tiny change to make the dialog a little nicer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 20:52:40 +02:00
Michael Telatynski
6127669c53
Merge pull request #5882 from matrix-org/t3chguy/fix/17002
Trigger lazy loading when filtering using spaces
2021-04-19 19:25:15 +01:00
Germain Souquet
de5ca92e4e add e2e session.delay explainer 2021-04-19 18:01:19 +01:00
Germain Souquet
33eebb84a6 Ensure PersistedElement are unmounted on application logout 2021-04-19 17:57:20 +01:00
Michael Telatynski
379df7f24d
Merge pull request #5883 from matrix-org/t3chguy/fix/16704
Fix typo in method call in add existing to space dialog
2021-04-19 17:53:10 +01:00
J. Ryan Stinnett
2d1615e433
Merge pull request #5872 from SimonBrandner/new-image-view-fixes
New Image View fixes/improvements
2021-04-19 17:37:42 +01:00
Michael Telatynski
4082a03769 Fix typo in method call in add existing to space dialog 2021-04-19 17:32:45 +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
12bdbd50f1
Merge pull request #5853 from matrix-org/t3chguy/fix/16925
Fix unknown slash command error exploding
2021-04-19 17:15:59 +01:00
Travis Ralston
20586e52bc
Update src/utils/Singleflight.ts to support English
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-04-19 10:13:22 -06:00
Michael Telatynski
344e4b6c5b Trigger lazy loading when filtering using spaces
so that the filtered DMs are correct
2021-04-19 16:15:24 +01:00
Germain Souquet
db646d5987 Fix end to end tests for DM creation 2021-04-19 15:07:11 +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
71d5f03a25 delint 2021-04-19 11:36:40 +01:00
Michael Telatynski
64e0626693 i18n 2021-04-19 11:13:08 +01:00
Michael Telatynski
50dd9da913
Merge pull request #5852 from matrix-org/t3chguy/fix/15777
Switch to a spec conforming email validation Regexp
2021-04-19 11:11:43 +01:00
Michael Telatynski
e01caba068 Clean up add existing to space dialog and include DMs in it too 2021-04-19 08:54:06 +01:00
Germain
251cb41529
Merge pull request #5877 from matrix-org/gsouquet-messagecomposer-cleanup
Cleanup unused state in MessageComposer
2021-04-16 19:36:01 +01:00
Germain Souquet
3c85092f1a Cleanup unused state in MessageComposer 2021-04-16 17:36:14 +01:00
Travis Ralston
d23f66bb47 Update documentation 2021-04-16 10:11:04 -06:00
Travis Ralston
f955f33071 Merge branch 'develop' into travis/voice/countdown 2021-04-16 10:00:11 -06:00
Travis Ralston
a821ece128
Merge pull request #5869 from matrix-org/travis/voice/pulse-2
Pulse animation for voice messages recording state
2021-04-16 09:41:33 -06:00
David Baker
249a0faa76
Merge pull request #5875 from matrix-org/dbkr/dont_include_invisible_rooms_in_notif_summary
Don't include invisible rooms in notify summary
2021-04-16 15:41:32 +01:00
David Baker
d39b7175f7 Don't include invisible rooms in notify summary
This could cause rogue title bar natifications if you had invisible rooms
2021-04-16 15:31:01 +01:00
Travis Ralston
7878e1cd57
Merge pull request #5870 from matrix-org/travis/voice/disable-composer
Properly disable composer access when recording a voice message
2021-04-16 07:36:53 -06:00