OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
32,401 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

32401 Commits (ecd9b8d6deb03bd1b9ed2e6863e2bdc5b82f0b4b)

Author SHA1 Message Date
Germain Souquet 9081f80008 Move user to welcome_page if continuing with previous session 2021-04-12 17:01:27 +01:00
RiotRobot f743007334 Reset matrix-js-sdk back to develop branch 2021-04-12 14:57:30 +01:00
RiotRobot 219de0e554 Resetting package fields for development 2021-04-12 14:56:58 +01:00
RiotRobot a008c3d4e6 Merge branch 'master' into develop 2021-04-12 14:56:05 +01:00
RiotRobot 736507b812 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2021-04-12 14:51:22 +01:00
RiotRobot 51ea02cbab v3.18.0 2021-04-12 14:50:05 +01:00
RiotRobot a3db08ccc0 Prepare changelog for v3.18.0 2021-04-12 14:50:04 +01:00
Michael Telatynski 3faf7280fe
Merge pull request #5845 from matrix-org/t3chguy/fix/16844 
Don't hide notification badge on the home space button as it has no menu
 2021-04-12 14:49:35 +01:00
Michael Telatynski 187eef4f2d
Merge pull request #5843 from matrix-org/t3chguy/fix/16896 
User Info hide disambiguation as we always show MXID anyway
 2021-04-12 14:49:19 +01:00
RiotRobot f844961dc4 Upgrade matrix-js-sdk to 9.11.0 2021-04-12 14:45:16 +01:00
Michael Telatynski 4aef7a879a
Merge pull request #5846 from matrix-org/t3chguy/fix/16822 
Improve kick state to not show if the target was not joined to begin with
 2021-04-12 14:45:13 +01:00
Michael Telatynski d9adf0ddd8
Merge pull request #5844 from matrix-org/t3chguy/fix/16877 
Fix space store wrongly switching to a non-space filter
 2021-04-12 14:44:46 +01:00
RiotRobot 8af81ea90f Revert "Change to inset" 
Safari doesn't support `inset`.

This reverts commit b3706b682e.
 2021-04-12 14:37:11 +01:00
J. Ryan Stinnett 0db9d71071
Merge pull request #5848 from matrix-org/jryans/reason-message-tweaks-release 
[Release] Tweak appearance of invite reason
 2021-04-12 14:23:01 +01:00
J. Ryan Stinnett 19d7ccac07 Rename toggle to view 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett b3706b682e Change to inset 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 32049f849c Remove blur effect 2021-04-12 13:56:09 +01:00
J. Ryan Stinnett 650421eefb 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 13:56:09 +01:00
J. Ryan Stinnett 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 8a1180bd50 Rename toggle to view 2021-04-12 13:19:13 +01:00
J. Ryan Stinnett 0e5e48584f Change to inset 2021-04-12 13:18:03 +01:00
J. Ryan Stinnett 7f796640f6 Remove blur effect 2021-04-12 13:11:27 +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
Michael Telatynski c1d88be260 Improve kick state to not show if the target was not joined to begin with 2021-04-12 12:13:28 +01:00
Michael Telatynski a00af446b3 Don't hide notification badge on the home space button as it has no context menu 2021-04-12 11:55:47 +01:00
Michael Telatynski bf33775a14 Fix space store wrongly switching to a non-space filter 2021-04-12 11:45:22 +01:00
Michael Telatynski 591c8ffd83 User Info hide disambiguation as we always show MXID anyway 2021-04-12 11:10:51 +01:00
Germain 853b218d8a
Merge pull request #5840 from matrix-org/gsouquet-update-inter-font 
Update Inter font to v3.18
 2021-04-12 09:58:22 +01:00
Germain Souquet 020cdc99a2 Update Inter font to v3.18 2021-04-09 17:41:54 +01:00
J. Ryan Stinnett 14f1e9f9a1
Merge pull request #5839 from matrix-org/jryans/enable-history-sharing 
Enable sharing historical keys on invite
 2021-04-09 17:28:57 +01:00
J. Ryan Stinnett fc0ee15924 Update strings 2021-04-09 17:14:35 +01:00
J. Ryan Stinnett bef5c6593e Remove key sharing feature flag 2021-04-09 17:05:55 +01:00
Travis Ralston 8aa4b1a760
Merge pull request #5834 from matrix-org/travis/sponsored/security-disable-ui 
Add ability to hide post-login encryption setup with customisation point
 2021-04-09 08:04:06 -06:00
J. Ryan Stinnett 7b0ab4a059 Enable sharing historical keys on invite 
After discussion with Product, we're ready to enable this key sharing work from
https://github.com/matrix-org/matrix-react-sdk/pull/5763 (based on
https://github.com/matrix-org/matrix-doc/pull/3061).
 2021-04-09 12:51:23 +01:00
J. Ryan Stinnett ae2082b97b
Merge pull request #5515 from rda0/maths-parsing-latex 
Use LaTeX and TeX delimiters by default
 2021-04-09 11:07:19 +01:00
J. Ryan Stinnett cf06948da8
Merge pull request #5837 from SimonBrandner/clone-correct-fork-netlify 
Clone author's deps fork for Netlify previews
 2021-04-09 10:31:27 +01:00
Šimon Brandner 86dd81cda0
Fix rotation animation when rotating 360 deg 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:16:52 +02:00
Šimon Brandner 829bef45a2
Close dialog on redact 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:13:42 +02:00
Šimon Brandner b723092ed2
Add null check 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:05:49 +02:00
Travis Ralston cc7982cfca
Merge pull request #5827 from SimonBrandner/show-drop-only-file 
Show drop file UI only if dragging a file
 2021-04-09 00:05:44 -06:00
Šimon Brandner 7f496c7bf5
Add comment: same on all themes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:04:07 +02:00
Šimon Brandner 90f9d20f45
Add comment about refs to functional components 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:03:10 +02:00
Šimon Brandner 4a40f67e75
Make private 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:02:38 +02:00
Šimon Brandner cb02c39d7f
Add name to copyright 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 08:01:14 +02:00
Šimon Brandner dacffdd62e
Add some comments 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-09 07:57:25 +02:00
Travis Ralston 3c25979520
Merge pull request #5824 from robintown/ignore-punctuation 
Ignore punctuation when filtering rooms
 2021-04-08 20:10:08 -06: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 28d12016b7 Convert to using EventType enum 2021-04-08 19:18:30 -06:00
Travis Ralston f2e2f1699b Add some catches 2021-04-08 18:09:41 -06:00
Travis Ralston 01c5f84f60 Merge branch 'develop' into travis/reset-passphrase 2021-04-08 18:07:46 -06:00