OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
30,906 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

30906 Commits (6d9da1bad219e23183055f131410c042666ecb71)

Author SHA1 Message Date
J. Ryan Stinnett 6d9da1bad2
Merge pull request #5625 from SimonBrandner/fix-notif-jumpy-ui 
Fix jumpy notifications settings UI
 2021-02-08 15:10:27 +00:00
J. Ryan Stinnett 6d01de3bfb
Merge pull request #5559 from SimonBrandner/improve-codeblock 
Improve displaying of code blocks
 2021-02-08 14:44:48 +00:00
Šimon Brandner 3b6790fbf1
Merge branch 'develop' into fix-notif-jumpy-ui 2021-02-08 15:42:06 +01:00
Šimon Brandner c4a3906871
Fix positioning of spinner in a smarter way 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:38:43 +01:00
Šimon Brandner 84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner 257b8819b3
Change icon size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:30 +01:00
Šimon Brandner 9a97b40ce9
Remove old icons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:17 +01:00
Šimon Brandner cdb0d1c12e
Move and use icons from widget dir 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:10 +01:00
David Baker cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
J. Ryan Stinnett 91f2e4b5db
Merge pull request #5498 from menturion/develop 
Call "MatrixClientPeg.get()" only once in method "findOverrideMuteRule"
 2021-02-08 13:41:16 +00:00
J. Ryan Stinnett 811ae9ba82
Merge pull request #5616 from dangwynne/develop 
Close current modal when session is logged out
 2021-02-08 12:56:00 +00:00
J. Ryan Stinnett 5abced7049
Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing 
Switch room explorer list to CSS grid
 2021-02-08 11:18:01 +00:00
Šimon Brandner 4a282759c3
Fixed jumpy UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-06 16:38:07 +01:00
Michael Weimann f0f6e4678e
switch room explorer list to css grid 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-02-06 14:40:16 +01:00
Michael Telatynski 5ac9a85ac8
Merge pull request #5622 from matrix-org/t3chguy/socials2 
Improve SSO login start screen and 3pid invite handling somewhat
 2021-02-05 18:09:41 +00:00
Michael Telatynski 1d1a3e72ca Improve SSO login start screen and 3pid invite handling somewhat 2021-02-05 17:18:13 +00:00
J. Ryan Stinnett 295cf12cf8
Merge pull request #5621 from SimonBrandner/fix-jump-on-reaction 
Don't jump to bottom on reaction
 2021-02-05 14:28:25 +00:00
J. Ryan Stinnett 32310abc14
Merge pull request #5620 from matrix-org/jryans/room-topic-only 
Fix several profile settings oddities
 2021-02-05 14:25:04 +00:00
Šimon Brandner 69e81119e9
Don't jump to bottom on reaction 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 15:15:20 +01:00
J. Ryan Stinnett 81bd919a18 Port avatar restore to user profile settings 2021-02-05 14:11:57 +00:00
J. Ryan Stinnett bccfdde4ac Normalise cancel behaviour for room avatar 
This normalises the behaviour of the "Cancel" button for the room profile so
that it _always_ restores the existing value for all of room name, topic, and
avatar, instead of performing a mix of restore and remove.

Fixes https://github.com/vector-im/element-web/issues/16375
 2021-02-05 13:58:28 +00:00
J. Ryan Stinnett bffce8689a Allow saving room topic or name only 
This changes the room profile settings to support saving _only_ the room topic or
name in case you have limited access to set one but not the other.

Fixes https://github.com/vector-im/element-web/issues/16375
 2021-02-05 13:34:06 +00:00
dangwynne 12f6272ab4 implement qa feedback for closing modals when logging out 2021-02-05 09:24:12 +00:00
Šimon Brandner ec73f2ec49
Change comment styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:30:54 +01:00
Šimon Brandner 77248725ed
Added onHeightChanged call 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 08:29:24 +01:00
Šimon Brandner ad5c8fe7e4
Revert "Rerender MessagePanel" 
This reverts commit c7e61ac71d.
 2021-02-05 08:27:07 +01:00
Šimon Brandner 9bd8fef6b3
Change comment styling 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-05 08:22:02 +01:00
J. Ryan Stinnett 15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers 
Add option to hide the stickers button in the composer
 2021-02-04 17:01:23 +00:00
Šimon Brandner 9db86a38f6
Update src/components/views/messages/TextualBody.js 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-04 17:58:21 +01:00
J. Ryan Stinnett 4a73f3c504
Merge pull request #5598 from SimonBrandner/fix-confusing-right-panel 
Fix confusing right panel button behaviour
 2021-02-04 16:30:41 +00:00
J. Ryan Stinnett a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump 
Fix jumping timestamp if hovering a message with e2e indicator bar
 2021-02-04 16:02:18 +00:00
Šimon Brandner fdc78396fa
Replaced defaultDis and removed duplicate import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-04 16:53:25 +01:00
J. Ryan Stinnett a730170a5d
Merge pull request #5614 from SimonBrandner/fix-icon-position 
Fix avatar and trash alignment
 2021-02-04 15:28:11 +00:00
RiotRobot e9740f5a69 Merge branch 'master' into develop 2021-02-04 12:05:45 +00:00
RiotRobot 0fe54deab1 v3.13.1 2021-02-04 12:04:27 +00:00
RiotRobot 2cab6f66f0 Prepare changelog for v3.13.1 2021-02-04 12:04:27 +00:00
Travis Ralston 20e6501366
Merge pull request #5618 from matrix-org/travis/rel-stickerpickerfix 
[Release] Fix z-index of stickerpicker
 2021-02-04 03:00:38 -07:00
Travis Ralston 5130347621
Merge pull request #5617 from matrix-org/travis/stickerpicker-zindex 
Fix z-index of stickerpicker
 2021-02-04 03:00:31 -07:00
Travis Ralston bf3c27a37d Fix z-index of stickerpicker 2021-02-04 02:54:25 -07:00
Travis Ralston 97584af947 Fix z-index of stickerpicker 2021-02-04 02:50:54 -07:00
dangwynne 88aa2a6f70 fix whitespace change. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-02-04 09:33:21 +00:00
dangwynne c1823e2e5a
Close current modal when session is logged out 2021-02-03 22:31:28 +00:00
Šimon Brandner b73227eaca
Merge branch 'develop' into fix-icon-position 2021-02-03 18:46:45 +01:00
Šimon Brandner b8ee23cdf4
Make consistent for all events 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-03 18:41:09 +01:00
J. Ryan Stinnett 7489011ab7
Merge pull request #5615 from matrix-org/jryans/pill-room-via 
Fix permalink via parsing for rooms
 2021-02-03 16:30:48 +00:00
J. Ryan Stinnett 474c029db5 Fix permalink via parsing for rooms 
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.

Fixes https://github.com/vector-im/element-web/issues/16345
 2021-02-03 15:18:19 +00:00
J. Ryan Stinnett fd7c50f683 Move route splitting inside route parsing 2021-02-03 14:05:22 +00:00
RiotRobot bd538823cf Reset matrix-js-sdk back to develop branch 2021-02-03 12:11:07 +00:00
RiotRobot 9840ac6f17 Resetting package fields for development 2021-02-03 12:10:42 +00:00
RiotRobot b770d8d214 Merge branch 'master' into develop 2021-02-03 12:10:13 +00:00