Commit Graph

27716 Commits (cc71531493df1e5e095b7f173909cbb4606a4f16)

Author SHA1 Message Date
nurjinn jafar cc71531493 reverted German language translations 2020-08-25 13:36:04 +02:00
nurjinn jafar 1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676
 Conflicts:
	src/SlashCommands.tsx
	src/i18n/strings/de_DE.json
2020-08-25 11:52:48 +02:00
nurjinn jafar 43f266bfe3 remove unused import
fix if condition
 trying (pass the dispatcher to sendHtmlMessage)
2020-08-25 11:11:20 +02:00
nurjinn jafar d41ffb1b4b pass ev to handleConfetti in order to check content before dispatch 2020-08-25 11:09:57 +02:00
nurjinn jafar eef654e0e3 fix indentation and remove console.log 2020-08-25 11:09:10 +02:00
nurjinn jafar f1c7139711 remove not needed comma 2020-08-24 14:25:06 +02:00
nurjinn jafar 5b7ccb5a78 fix indentation spaces and readability line spaces 2020-08-24 14:04:20 +02:00
nurjinn jafar b79cf1e7ad updated translated string 2020-08-24 13:59:11 +02:00
nurjinn jafar 2a8b1e0ccd remove space before function parentheses and maximum allowed line 2020-08-24 11:55:23 +02:00
nurjinn jafar 03b2a529ef remove unused var 2020-08-24 11:29:46 +02:00
nurjinn jafar 77de63bf4b confetti file added 2020-08-24 10:44:49 +02:00
nurjinn jafar a7567b2e31 confetti animationsd handeled on roomViewTimeline 2020-08-24 10:44:32 +02:00
nurjinn jafar 34cee20140 added confetti on command /confetti 2020-08-24 10:43:41 +02:00
nurjinn jafar 69227dd456 translations added 2020-08-24 10:26:20 +02:00
Travis Ralston d1c7d749aa
Merge pull request #5134 from matrix-org/travis/cleanup2
Remove some unused components
2020-08-21 07:45:32 -06:00
Michael Telatynski 765f474458
Merge pull request #5137 from miterion/develop
Allow avatar image view for 1:1 rooms
2020-08-21 11:02:48 +01:00
Heiko Carrasco 9193c81008
Fix image avatar view for 1:1 rooms
Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
2020-08-21 11:44:47 +02:00
David Baker 095824adbc
Merge pull request #5136 from matrix-org/dbkr/send_settings_in_rageshake
Send mx_local_settings in rageshake
2020-08-21 10:43:49 +01:00
David Baker 6a03c0a3c0 Send mx_local_settings in rageshake
Perhaps ideally we should get a complete dump of the settings in
effect out of the settings manager, but all I want for now is the
webrtc audio inputs and outputs, so let's send the ones stored locally.
2020-08-21 10:32:51 +01:00
Travis Ralston fd06272062 Update i18n 2020-08-20 20:50:28 -06:00
Travis Ralston c815a370e7 Remove some unused components
We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.

The room tile context menu and top left menu are artifacts of the old room list.

The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it.
2020-08-20 20:47:02 -06:00
Travis Ralston 5c71e33362
Merge pull request #5132 from matrix-org/travis/leave-room
Run all room leaving behaviour through a single function
2020-08-20 07:17:13 -06:00
David Baker 0690c02e0c
Merge pull request #5131 from matrix-org/dbkr/clarify_media_device_id
Add clarifying comment in media device selection
2020-08-20 09:26:27 +01:00
Travis Ralston 42988d373b Remove debugging 2020-08-19 19:42:58 -06:00
Travis Ralston 8fffce8a30 Appease the linter 2020-08-19 19:42:36 -06:00
Travis Ralston 309c32700b Remove unused success state 2020-08-19 19:23:27 -06:00
Travis Ralston e0b8343088 Run all room leaving behaviour through a single function
Fixes https://github.com/vector-im/element-web/issues/14999
Fixes https://github.com/vector-im/element-web/issues/10380

We were failing to handle errors when `/part`ing a room, though the leave room button was fine. This runs both the button and command through the same function for handling, including the 'view next room' behaviour.
2020-08-19 19:21:40 -06:00
David Baker d1bca2838f Add clarifying comment in media device selection
Hopefully explain the confusing mismatch.
2020-08-19 19:07:12 +01:00
Travis Ralston c9d98a1d19
Merge pull request #5124 from matrix-org/travis/settings-v3
Settings v3: Feature flag changes
2020-08-19 12:00:48 -06:00
Travis Ralston 0fef86cc74 Fix find & replace error 2020-08-19 11:52:02 -06:00
Michael Telatynski d700a5a78c
Merge pull request #5129 from matrix-org/t3chguy/fix/14989
Clear url previews if they all get edited out of the event
2020-08-19 11:40:57 +01:00
Michael Telatynski c84296a28d
Merge pull request #5128 from matrix-org/t3chguy/fix/14978
Consider tab completions as modifications for editing purposes to unlock sending
2020-08-19 11:40:37 +01:00
Michael Telatynski b95956a3a4 Clear url previews if they all get edited out of the event 2020-08-19 10:38:26 +01:00
Michael Telatynski 0bda80c57d Consider tab completions as modifications for editing purposes to unlock sending 2020-08-19 10:32:24 +01:00
Travis Ralston 534f0cc89e Revert "Merge pull request #5125 from matrix-org/travis/spec-i18n"
This reverts commit d3dba0ba3a.
2020-08-18 13:09:33 -06:00
Travis Ralston 0a4d4e4df3 Revert "update js-sdk reference in lockfile"
This reverts commit cac4e6c920.
2020-08-18 12:53:43 -06:00
Travis Ralston cac4e6c920 update js-sdk reference in lockfile 2020-08-18 12:50:25 -06:00
Travis Ralston d3dba0ba3a
Merge pull request #5125 from matrix-org/travis/spec-i18n
Use matrix-doc for SAS emoji translations
2020-08-18 11:41:42 -06:00
Travis Ralston 323ebdfac8 Remove unused return type 2020-08-18 10:51:30 -06:00
Michael Telatynski 1fce3fd2ae
Merge pull request #3849 from matrix-org/travis/download-logs
Add a rageshake function to download the logs locally
2020-08-18 17:50:01 +01:00
Michael Telatynski d55cb4266a Update copy 2020-08-18 17:38:10 +01:00
Michael Telatynski 8cff59f123 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-18 17:36:04 +01:00
Michael Telatynski 24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466
Room List filtering visual tweaks
2020-08-18 17:22:05 +01:00
nurjinn jafar ecd4d6e19e test commit for confetti changes 2020-08-18 17:57:51 +02:00
Bruno Windels 5c6a36f89a
Merge pull request #5072 from matrix-org/bwindels/make-reply-not-overlay
Make reply preview not an overlay so you can see new messages
2020-08-18 11:48:41 +00:00
Michael Telatynski 697ba12b3a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14466 2020-08-18 12:48:32 +01:00
Michael Telatynski d1971cb163
Merge pull request #5113 from matrix-org/t3chguy/room-list/14959
Allow room tile context menu when minimized using right click
2020-08-18 12:45:55 +01:00
Michael Telatynski aef8784b78
Merge pull request #5121 from matrix-org/t3chguy/null-guard-group-inviter
Add null guard to group inviter for corrupted groups
2020-08-18 12:45:06 +01:00
Michael Telatynski 3781b04f9c
Merge branch 'develop' into t3chguy/room-list/14466 2020-08-18 12:44:52 +01:00
Michael Telatynski b6dd856649
Merge pull request #5118 from matrix-org/t3chguy/room-list/14617.2
Room List styling tweaks
2020-08-18 12:44:09 +01:00