OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
35,273 Commits
200 Branches
547 Tags
421 MiB
Commit Graph

35273 Commits (0e3cc6b8f45856f467485b8404815099c3b7866f)

Author SHA1 Message Date
Šimon Brandner 16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 21:43:33 +02:00
Robin Townsend eefadf6a46 Fix tests 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-16 15:30:26 -04:00
Michael Telatynski aaa9040634
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1 2021-07-16 19:58:38 +01:00
Michael Telatynski 45e0515b39
Merge pull request #4399 from matrix-org/t3chguy/querystring 2021-07-16 19:57:24 +01:00
Robin Townsend 8efb30eb07 Merge branch 'develop' into emojibase-updates 2021-07-16 14:38:10 -04:00
Robin Townsend 25e6a0e570 Match colors of room and user avatars in DMs 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-16 14:19:36 -04:00
Šimon Brandner 41d5865dd7
Cleanup _ReplyTile.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 19:26:04 +02:00
Michael Telatynski 74bd7cad3f remove unrelated change 2021-07-16 13:40:53 +01:00
Michael Telatynski 3b13eb7b44 Prefer URL constructor over `url` dependency 2021-07-16 13:18:12 +01:00
Michael Telatynski 9d45a3760f Fix types of the various query params dicts, arrays can be included e.g via 2021-07-16 13:11:43 +01:00
Michael Telatynski 5dbd79c729 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring 
 Conflicts:
	package.json
	src/@types/global.d.ts
	src/components/views/elements/AppTile.js
	src/utils/HostingLink.js
	yarn.lock
 2021-07-16 12:47:33 +01:00
James Salter b55f69a74c
Merge pull request #6374 from matrix-org/copy-room 
Add "Copy Link" to room context menu
 2021-07-16 11:14:00 +01:00
Michael Telatynski 5f2fab02e7
Merge pull request #6385 from matrix-org/t3chguy/fix/18008 2021-07-16 11:06:57 +01:00
James Salter 767d97065d Run i18n 2021-07-16 09:36:59 +01:00
James Salter 9cb3c71afe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room 2021-07-16 09:34:30 +01:00
James Salter 685b59235d Make error message consistent with menu title 2021-07-16 09:24:46 +01:00
Michael Telatynski 05028f1997 remove unused import 2021-07-16 09:22:25 +01:00
James Salter 329f1c9d6a
Update src/components/views/rooms/RoomTile.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-16 09:22:17 +01:00
Michael Telatynski 191591e807 Make the critical sections of the RLS synchronous to avoid needing to mutex everything 2021-07-16 09:15:56 +01:00
James Salter ff80bbc4a5 Move copy link to be before settings 2021-07-16 09:10:20 +01:00
James Salter a1c658f187 Set Menu icon to link 2021-07-16 09:07:52 +01:00
James Salter 7464900f95 Change menu label to Copy Link 2021-07-16 09:05:01 +01:00
Michael Telatynski 32cc48ff7a Fix issue with room duplication caused by filtering and selecting room using keyboard 
Wrap sticky room updates in lock to prevent setStickyRoom running in middle of setKnownRooms
 2021-07-16 08:49:19 +01:00
Michael Telatynski 6809817c77
Merge pull request #6387 from SimonBrandner/fix/irc-replies/18010 
Fix IRC layout replies
 2021-07-16 07:11:53 +01:00
Šimon Brandner a3792b75e2
Fix IRC layout replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-16 07:53:20 +02:00
Travis Ralston 2690bb56f9 Remove code we don't seem to need 2021-07-15 13:39:54 -06:00
Michael Telatynski 831c482371 Stub out MatrixClient::isUserIgnored for tests 2021-07-15 18:17:07 +01:00
Michael Telatynski 1437188282 Also move effects handling from `event` to `Room.timeline` to wake up less 2021-07-15 18:02:02 +01:00
Michael Telatynski 923d68a0fa Fix EventIndex handling events twice 
It awaits the decryption in onRoomTimeline as well as subscribing to EVent.decrypted
 2021-07-15 17:46:46 +01:00
Michael Telatynski b0053f36d3 Fix instances of event.sender being read for just the userId - this field may not be set in time 2021-07-15 17:43:24 +01:00
Michael Telatynski 376533e709
Merge pull request #3553 from maunium/compact-reply-rendering 2021-07-15 15:52:10 +01:00
Germain Souquet 54bfe8ec1e Migrate Welcome to TypeScript 2021-07-15 15:49:18 +02:00
Germain Souquet 3b5266071e Migrate LanguageSelector to TypeScript 2021-07-15 15:44:44 +02:00
Germain Souquet 8ef9c3dfeb Migrate CountryDropdown to TypeScript 2021-07-15 15:42:11 +02:00
Šimon Brandner 5d0afdb706
Don't show line number in replies 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:38:07 +02:00
Germain Souquet c6dd9bc526 Migrate CompleteSecurityBody to TypeScript 2021-07-15 15:32:24 +02:00
Germain Souquet 1f9b423bac Migrate CaptchaForm to TypeScript 2021-07-15 15:30:58 +02:00
Germain Souquet e495cbce37 Migrate AuthPage to TypeScript 2021-07-15 15:22:34 +02:00
Germain Souquet 13c5adbb6c Migrate AuthHeaderLogo to TypeScript 2021-07-15 15:22:02 +02:00
Germain Souquet 5783a38207 Migrate AuthHeader to TypeScript 2021-07-15 15:21:33 +02:00
Germain Souquet 59316e4820 Migrate AuthFooter to TypeScript 2021-07-15 15:20:43 +02:00
Germain Souquet 7dbff52aa4 Migrate AuthBody to TypeScript 2021-07-15 15:19:48 +02:00
Šimon Brandner 88da0f4dcf
Give audio and video replies an icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:17:41 +02:00
Šimon Brandner 68640a4dbd
Fix icon postion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:16:05 +02:00
Šimon Brandner 375e279825
Add speaker icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 15:15:48 +02:00
David Baker f1bb223803
Merge pull request #6380 from matrix-org/dbkr/new_changelogs 
Update PR template for new changelog generation
 2021-07-15 14:12:28 +01:00
Germain Souquet c8bd375130 Migrate DisableEventIndexDialog to TypeScript 2021-07-15 15:11:45 +02:00
Šimon Brandner 7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 14:54:06 +02:00
Michael Telatynski ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console 2021-07-15 13:50:13 +01:00
Michael Telatynski 20e0356eb1 why do my IDE be dumb 2021-07-15 12:25:26 +01:00