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

33244 Commits (00d093b4ffb83e4d100b706757e0e44a8f1fb376)

Author SHA1 Message Date
Michael Telatynski 00d093b4ff yarn lock 2021-05-19 08:56:14 +01:00
Michael Telatynski bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
 2021-05-18 13:48:40 +01:00
Michael Telatynski 367ad1583d
Merge pull request #6053 from matrix-org/t3chguy/fix/17338 
Add space invaders chat effect
 2021-05-18 12:14:40 +01:00
Michael Telatynski 177adb9684 fix copy-pasta 2021-05-18 11:58:15 +01:00
Michael Telatynski 16b60d1524
Merge pull request #6051 from matrix-org/t3chguy/fix/17313 
Create SpaceProvider and hide Spaces from the RoomProvider autocompleter
 2021-05-18 11:55:20 +01:00
J. Ryan Stinnett b6d9c4e6ad
Merge pull request #6049 from aaronraimist/redacted-unread 
Don't mark a room as unread when redacted event is present
 2021-05-18 11:00:42 +01:00
Michael Telatynski b5a612cd0f Add space invaders chat effect 2021-05-18 10:29:10 +01:00
Michael Telatynski afd9843722 Fix broken string interpolation in chat effects warning 2021-05-18 10:28:37 +01:00
Michael Telatynski 1166e76928 Extract and deduplicate chat effect interfaces 2021-05-18 10:28:15 +01:00
Michael Telatynski f87f0704b9 i18n 2021-05-18 09:42:35 +01:00
Michael Telatynski 19a94d55bd Create SpaceProvider and hide Spaces from the RoomProvider autocompleter 2021-05-18 09:39:01 +01:00
Aaron Raimist 3a2c1af70c
Don't mark a room as unread when redacted event is present 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-05-18 00:01:11 -05:00
Travis Ralston 4929e3f3ed
Merge pull request #6023 from matrix-org/travis/msc2873 
Add support for MSC2873: Client information for Widgets
 2021-05-17 16:36:00 -06:00
Travis Ralston 7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06:00
Travis Ralston 6ccb0d487a Merge branch 'develop' into travis/msc2873 2021-05-17 16:27:20 -06:00
Travis Ralston 3308368ac6
Merge pull request #5960 from matrix-org/travis/msc2876 
Support UI for MSC2762: Widgets reading events from rooms
 2021-05-17 16:26:53 -06:00
Michael Telatynski 9182bff86e
Merge pull request #6047 from robintown/fix-notification-panel 
Fix crash on opening notification panel
 2021-05-17 17:46:50 +01:00
Robin Townsend d3f1754dfd Fix crash on opening notification panel 
The check for pending edits needed a null guard, since the notification
panel uses MessagePanel but is not associated with a specific room.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-17 12:24:41 -04:00
Germain f67ba57da5
Merge pull request #6046 from matrix-org/gsouquet/sync-perf 2021-05-17 15:16:50 +01:00
Germain Souquet 7e846b8532 remove unused import 2021-05-17 15:05:20 +01:00
Germain Souquet c67f31144f remove custom LoggedInView::shouldComponentUpdate logic 2021-05-17 14:45:41 +01:00
RiotRobot 12a9ce1a94 Reset matrix-js-sdk back to develop branch 2021-05-17 13:50:34 +01:00
RiotRobot 9d46fa7b99 Resetting package fields for development 2021-05-17 13:50:24 +01:00
RiotRobot f5a6864ca9 Merge branch 'master' into develop 2021-05-17 13:50:23 +01:00
RiotRobot 3673292c34 v3.21.0 2021-05-17 13:49:00 +01:00
RiotRobot 6b884a50dc Prepare changelog for v3.21.0 2021-05-17 13:48:59 +01:00
RiotRobot 6c066ee401 Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:33:45 +01:00
Michael Telatynski 6d06326bce
Merge pull request #6045 from matrix-org/t3chguy/fix/17318 
Fix edge cases with the new add reactions prompt button
 2021-05-17 11:44:55 +01:00
Michael Telatynski 6e5847ea6b Fix right clicking on add reactions prompt button behaviour 2021-05-17 10:01:56 +01:00
Michael Telatynski a22a1918e1 Fix add reactions prompt button showing up even if all reactions have been removed 2021-05-17 10:01:43 +01:00
Michael Telatynski f0a0d7f998 Fix add reactions prompt button jumping timeline if font set lower than default 2021-05-17 10:01:24 +01:00
Michael Telatynski b06514273f
Merge pull request #6043 from SimonBrandner/fix/add-ids 
Add ids to homeserver and passphrase fields
 2021-05-15 15:22:27 +01:00
Šimon Brandner bdf7837044
Add mx to homeserverInput 2021-05-15 16:13:26 +02:00
Šimon Brandner ce4439e118
Add mx to passPhraseInput 2021-05-15 16:13:02 +02:00
Šimon Brandner 37348375a2
Add id for passpharase 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-15 15:07:35 +02:00
Šimon Brandner fef081c736
Add id for homeserver field 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-15 15:07:15 +02:00
Michael Telatynski 1b8402f39c
Merge pull request #6042 from matrix-org/t3chguy/fix/17304 
Update space order field validity requirements to match msc update
 2021-05-14 23:19:52 +01:00
Michael Telatynski a48d786547 Update space order field validity requirements to match msc update 2021-05-14 22:59:03 +01:00
Travis Ralston 89933d779c Merge branch 'develop' into travis/msc2873 2021-05-14 14:22:53 -06:00
Travis Ralston 56097e55c4 We're ELEMENT 2021-05-14 14:22:31 -06:00
Travis Ralston 5093657c71 Remove "read" level language for new API scope 2021-05-14 14:17:10 -06:00
Travis Ralston 98b2e120a7 Merge branch 'develop' into travis/msc2876 2021-05-14 14:09:57 -06:00
Travis Ralston 01491f4cba
Merge pull request #6024 from matrix-org/travis/roomlist-corruption 
Try putting room list handling behind a lock
 2021-05-14 11:06:19 -06:00
Travis Ralston 336904cef8
Apply suggestions from code review 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-05-14 11:05:49 -06:00
Travis Ralston 55eddae096
Merge pull request #6035 from matrix-org/travis/voicemessages/playback-time 
Improve progress bar progression for smaller voice messages
 2021-05-14 10:17:35 -06:00
Michael Telatynski 49b24408bb
Merge pull request #6039 from matrix-org/t3chguy/public-space-no-invite 
Fix share space edge case where space is public but not invitable
 2021-05-14 16:46:50 +01:00
Travis Ralston 6df079a5bd
Merge pull request #6033 from matrix-org/travis/rel-imageview 
Add missing 'rel' to image view download button
 2021-05-14 08:12:11 -06:00
Travis Ralston 8066e5402c
Merge pull request #6034 from matrix-org/travis/voicemessages/waveform-noise 
Improve visible waveform for voice messages
 2021-05-14 08:12:01 -06:00
Michael Telatynski 882000dfcb
Merge pull request #6040 from matrix-org/t3chguy/fix/17296 
Fix roving tab index intercepting home/end in space create menu
 2021-05-14 15:07:34 +01:00
Michael Telatynski c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00