Commit graph

32780 commits

Author SHA1 Message Date
Michael Telatynski
caa772348f Actually fix the layout bug without re-regressing the prior issue 2021-05-04 14:14:06 +01:00
Michael Telatynski
4489f8a6ea Fix hover behaviour of space invites 2021-05-04 14:01:26 +01:00
Michael Telatynski
d14ea1bd58 Fix layout issue with expanded space panel 2021-05-04 14:01:10 +01:00
Michael Telatynski
3cca153696
Merge pull request #5964 from matrix-org/t3chguy/fix/spacepanelalignment
Fix edge case with space panel alignment with subspaces on ff
2021-05-04 12:49:12 +01:00
Michael Telatynski
c5cbca7c57 Fix edge case with space panel alignment with subspaces on ff 2021-05-04 12:38:55 +01:00
Michael Telatynski
ed8b05b730
Merge pull request #5951 from SimonBrandner/fix/room-pill-history
Fix saving room pill part to history
2021-05-04 12:32:04 +01:00
J. Ryan Stinnett
96592aa75e
Merge pull request #5948 from jaiwanth-v/room-preview-spaces
Generate room preview even when minimized
2021-05-04 11:58:53 +01: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
Jaiwanth
29aec4abdb Use middlePanelResized instead of noisy 2021-05-04 15:39:46 +05:30
Michael Telatynski
e9f59ed093
Merge pull request #5943 from matrix-org/t3chguy/fix/17082
Sort rooms in the add existing to space dialog based on recency
2021-05-04 10:57:23 +01:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Jaiwanth
cf9edb1884 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into room-preview-spaces 2021-05-03 21:53:54 +05:30
Šimon Brandner
1fe2085309
Fix deserialize test
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 12:28:18 +02:00
Šimon Brandner
0c869364e9
Don't serialize resourceId in AtRoomPill
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 12:27:52 +02:00
Šimon Brandner
c1549dfac5
Make optional params optional
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 11:32:35 +02:00
Šimon Brandner
ee8d688de1
Fix saving room pill part to history
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 10:59:28 +02: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
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043
Inhibit sending RR when context switching to a room
2021-04-30 15:13:18 +01:00
Michael Telatynski
39ccecab03
Merge pull request #5950 from matrix-org/t3chguy/fix/17117
Prevent room list keyboard handling from landing focus on hidden nodes
2021-04-30 12:55:27 +01:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998
Make the text filter search all spaces instead of just the selected one
2021-04-30 12:53:38 +01:00
Michael Telatynski
43410835a3 Prevent room list keyboard handling from landing focus on hidden nodes 2021-04-30 11:53:56 +01:00
J. Ryan Stinnett
83035b6b6a
Merge pull request #5931 from SimonBrandner/fix-indent
Enable indent rule and fix indent
2021-04-30 11:51:22 +01:00
Šimon Brandner
2e62b18617
Revert some changes to avoid re-translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-30 12:30:14 +02:00
Germain
19cfd577f4
Merge pull request #5946 from jaiwanth-v/restrict-reactions 2021-04-30 09:14:55 +01:00
Jaiwanth
f766f985e4 Change cursor to not-allowed 2021-04-30 08:25:58 +05:30
Hubert Chathi
11ee3c752f
Merge pull request #5939 from rda0/disallow-inline-diplay-maths
Disallow inline display maths
2021-04-29 15:16:46 -04:00
Šimon Brandner
c6bd2c7d67
Fix some more formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:18:26 +02:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 20:08:14 +02:00
Šimon Brandner
232b87a3b4
Improve formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-29 19:57:02 +02:00
Jaiwanth
70204d6111 Prevent peeking members from reacting
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 22:41:57 +05:30
Jaiwanth
d2de115b2f Generate room preview even when minimized
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-29 21:37:44 +05:30
Michael Telatynski
73abe51fb9 actually use the new state 2021-04-29 16:46:21 +01:00
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
bed52319bc Sort rooms in the add existing to space dialog based on recency 2021-04-28 23:39:24 +01:00
Michael Telatynski
efb9b71900 Make the text filter search all spaces instead of just the selected one 2021-04-28 23:18:42 +01:00
Michael Telatynski
d203e8f129
Merge pull request #5923 from matrix-org/t3chguy/fix/16628
Space creation prompt user to add existing rooms for "Just Me" spaces
2021-04-28 23:03:00 +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
Sven Mäder
bbce1ac704 Disallow inline display maths 2021-04-28 19:39:38 +02:00
J. Ryan Stinnett
4554124771
Merge pull request #5937 from matrix-org/jryans/coverage
Add test coverage collection script
2021-04-28 17:34:05 +01:00
J. Ryan Stinnett
e0bcccd600 Ignore possible coverage output 2021-04-28 17:17:43 +01:00
Michael Telatynski
08e0f15006
Merge pull request #5936 from matrix-org/t3chguy/fix/17084
Fix joining room using via servers regression
2021-04-28 17:09:22 +01:00
Travis Ralston
c6c56e0c03
Merge pull request #5938 from matrix-org/revert-5917-Redact
Revert "Fixes the two Todays problem in Redaction"
2021-04-28 10:08:03 -06:00
Travis Ralston
b90c845fcb
Revert "Fixes the two Todays problem in Redaction" 2021-04-28 10:07:22 -06:00
Travis Ralston
ec4ac05684
Merge pull request #5903 from jaiwanth-v/handle-encoded-urls
Handle encoded matrix URLs
2021-04-28 09:56:07 -06:00
Travis Ralston
f0f875d1e2 Merge branch 'develop' into handle-encoded-urls 2021-04-28 09:53:16 -06: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
Travis Ralston
14f1388522
Merge pull request #5830 from SimonBrandner/fix-trailing-colon
Fix inserting trailing colon after mention/pill
2021-04-28 09:51:50 -06:00
Travis Ralston
e53b3b6634
Merge pull request #5917 from DantrazTrev/Redact
Fixes the two Todays problem in Redaction
2021-04-28 09:51:43 -06:00
Travis Ralston
baef98253e
Merge pull request #5920 from aaronraimist/page-up-down
Fix page up/down scrolling only half a page
2021-04-28 09:51:36 -06:00