Commit graph

32333 commits

Author SHA1 Message Date
Šimon Brandner
7277c285a9
Fix weird crash
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 20:10:38 +01:00
Šimon Brandner
43e1144ae7
Don't use TintableSVG
This seemed to have caused a little lag and it was unnecessary

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 19:36:55 +01:00
Šimon Brandner
1c48804d96
Remove unnecessary class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 19:28:08 +01:00
Šimon Brandner
6a7340e8be
Use new upload icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:46:48 +01:00
Šimon Brandner
26b70b6228
Remove label background
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:32:04 +01:00
Šimon Brandner
a3001f77e4
Remove rounded corners of the drop area
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:30:39 +01:00
Šimon Brandner
8551855a56
Add $droptarget-bg-color to the dark theme
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:30:14 +01:00
Šimon Brandner
aa4ec9fca1
Make $droptarget-bg-color more opaque
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:27:52 +01:00
Šimon Brandner
ad85764a8e
Fix timeline expansion
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 18:23:32 +01:00
Šimon Brandner
c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
Michael Telatynski
7030c636f0 Initial Space Store for keeping track of space hierarchies from sync 2021-02-25 16:36:35 +00:00
Michael Telatynski
0f0e6c335f
Merge pull request #5668 from matrix-org/t3chguy/spaces2
Initial Spaces feature flag
2021-02-25 15:38:30 +00:00
Michael Telatynski
59017fd9e4 Merge branch 't3chguy/spaces2' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces 2021-02-25 15:01:02 +00:00
Michael Telatynski
864a9974b1 Tweak spaces labs flag copy 2021-02-25 12:20:10 +00:00
Michael Telatynski
d028851b43
Merge pull request #5667 from matrix-org/t3chguy/spaces1
Clean up code edge cases and add helpers
2021-02-25 11:21:52 +00:00
Šimon Brandner
fc32ceade7
i18n 2021-02-25 11:57:39 +01:00
Michael Telatynski
0f0edbfb14 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces1
 Conflicts:
	src/utils/objects.ts
2021-02-25 10:50:56 +00:00
Šimon Brandner
1955fff08c
CSS cleanup
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:50:50 +01:00
Šimon Brandner
dc283241aa
Remove wrapper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:28:42 +01:00
Šimon Brandner
436a17bcc9
Remove imports
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:26:34 +01:00
Šimon Brandner
4c377ae037
Consistent evs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:23:14 +01:00
Šimon Brandner
80ce4da9b6
Remove onRedactClick
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:21:04 +01:00
Šimon Brandner
fa239e506d
ZOOM shouldn't be a part of the class
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:19:50 +01:00
Šimon Brandner
d0dea91e92
contextMenuDisplay -> contextMenuDisplayed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:16:40 +01:00
Šimon Brandner
4f3fe3d236
Add comments
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 11:09:52 +01:00
Šimon Brandner
984b4372db
Remove trash red icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:25:24 +01:00
Šimon Brandner
7fc3758056
Add newline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:23:59 +01:00
Šimon Brandner
a4130cb7f3
Revert trash icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 10:23:27 +01:00
Šimon Brandner
273753a42a
Fix hex formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:25:34 +01:00
Šimon Brandner
b18622efe4
Show full date
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:20:34 +01:00
Šimon Brandner
83de84972e
Close onPermalinkClicked
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:13:27 +01:00
Šimon Brandner
5a9e1a1482
Fix close icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 08:10:54 +01:00
Šimon Brandner
fe8e90f920
Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 07:51:38 +01:00
Šimon Brandner
d58c17ff3b
Show grabbing cursor
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-25 07:50:53 +01:00
Travis Ralston
a44c0ecbd6
Merge pull request #5684 from matrix-org/travis/jitsi-leave
Clean up widgets when leaving the room
2021-02-24 18:28:12 -07:00
Travis Ralston
fbe5d17785 sanity 2021-02-24 18:27:59 -07:00
Travis Ralston
e2fb9b3ae8 Clean up widgets when leaving the room 2021-02-24 18:10:35 -07:00
Hubert Chathi
5f74fac2e8 fall back to the old method if the default key isn't available 2021-02-24 17:55:27 -05:00
Šimon Brandner
25873c8759
Remove rounded border 2021-02-24 20:41:20 +01:00
Šimon Brandner
649b87ac11
Make permalink clickable
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:14:12 +01:00
Šimon Brandner
6008a6f9fa
Use showTwelveHourTimestamps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:07:41 +01:00
Šimon Brandner
983895289c
Update info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 20:04:25 +01:00
Šimon Brandner
7293181552
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:33:22 +01:00
Šimon Brandner
2021e4e345
Remove ugly workaround
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:33:17 +01:00
Šimon Brandner
81698a2714
Fix pointer-events
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:31:19 +01:00
Travis Ralston
dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts
Fix read receipts?
2021-02-24 11:21:42 -07:00
Travis Ralston
83078a67c2
Merge pull request #5678 from matrix-org/hs/fix-usage-alerts
Fix MAU usage alerts
2021-02-24 11:21:03 -07:00
Travis Ralston
c11c8c2faf
Update src/toasts/ServerLimitToast.tsx 2021-02-24 11:20:58 -07:00
Šimon Brandner
9312becee5
Add context menu
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:17:33 +01:00
Šimon Brandner
bd5efc7ceb
Pass permallinkCreator to ImageView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-24 19:11:08 +01:00