Michael Telatynski
|
dbb011b8f1
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-07 10:53:17 +01:00 |
|
Michael Telatynski
|
29e3881fb3
|
Iterate design and fix post-merge conflict
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-07 10:36:45 +01:00 |
|
Michael Telatynski
|
c784039cf6
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets
Conflicts:
src/components/views/right_panel/WidgetCard.tsx
src/stores/WidgetStore.ts
|
2020-10-07 10:04:45 +01:00 |
|
Michael Telatynski
|
430bceb91d
|
Merge pull request #5281 from matrix-org/t3chguy/fix/9836
Fix editing and redactions not updating the Reply Thread
|
2020-10-07 00:14:56 +01:00 |
|
Michael Telatynski
|
35c7ccfcbd
|
Merge pull request #5282 from matrix-org/t3chguy/fix/15380
Hide Jump to Read Receipt button for users who have not yet sent an RR
|
2020-10-06 22:58:56 +01:00 |
|
Michael Telatynski
|
1bd0d9e02b
|
Iterate
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-06 22:53:34 +01:00 |
|
Michael Telatynski
|
2e45374cf8
|
Update src/components/views/right_panel/UserInfo.tsx
Co-authored-by: Travis Ralston <travpc@gmail.com>
|
2020-10-06 22:49:50 +01:00 |
|
Travis Ralston
|
3fdefa354e
|
Merge pull request #5279 from Sorunome/soru/fix-img-rendering
fix img tags not always being rendered correctly
|
2020-10-06 14:36:14 -06:00 |
|
David Baker
|
3d7358d03a
|
Merge pull request #5293 from matrix-org/dbkr/fix_rightpanel_crash
Hopefully fix righhtpanel crash
|
2020-10-06 20:37:17 +01:00 |
|
David Baker
|
0c6be6cf5e
|
Update copyright
As per https://github.com/matrix-org/synapse/issues/7565#issuecomment-639171606
|
2020-10-06 19:32:21 +01:00 |
|
David Baker
|
9dc0837619
|
Hopefully fix righhtpanel crash
The right panel wearns many hats, and only one of those hats comes
with a room prop, so make sure it's there.
|
2020-10-06 18:11:28 +01:00 |
|
Michael Telatynski
|
6f5f66e255
|
Merge pull request #5283 from matrix-org/t3chguy/fix/w1
Fix naive pinning limit and app tile widgetMessaging NPE
|
2020-10-06 14:57:46 +01:00 |
|
Michael Telatynski
|
5f615bd4c9
|
Merge pull request #5272 from matrix-org/t3chguy/fix/15255
Show server errors from saving profile settings
|
2020-10-06 12:35:56 +01:00 |
|
Michael Telatynski
|
55a18b8c2d
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255
Conflicts:
src/components/views/settings/ProfileSettings.js
|
2020-10-06 10:51:30 +01:00 |
|
Michael Telatynski
|
17a04f2915
|
Fix naive pinning limit and app tile widgetMessaging NPE
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-06 10:48:55 +01:00 |
|
Michael Telatynski
|
39c49125ce
|
Merge pull request #5273 from matrix-org/t3chguy/fix/15323
Update copy for `redact` permission
|
2020-10-06 10:24:26 +01:00 |
|
Michael Telatynski
|
ab9b5b0d7b
|
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width
Remove width limit on widgets
|
2020-10-06 10:23:19 +01:00 |
|
Michael Telatynski
|
0bb26831ae
|
Hide Jump to Read Receipt button for users who have not yet sent an RR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-06 08:28:06 +01:00 |
|
Michael Telatynski
|
48da4c2abd
|
Merge pull request #5280 from michel-zimmer/call-container-avatar-initial-center
Fix call container avatar initial centering
|
2020-10-06 08:25:26 +01:00 |
|
Michael Telatynski
|
fbcea7d2cc
|
Fix editing and redactions not updating the Reply Thread
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-06 08:23:48 +01:00 |
|
Michel Zimmer
|
80091f7db2
|
Fix call container avatar initial centering
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
|
2020-10-06 08:59:03 +02:00 |
|
Michael Telatynski
|
1e34365caa
|
Merge pull request #5268 from matrix-org/t3chguy/fix/15349
Fix right panel for peeking rooms
|
2020-10-06 00:32:05 +01:00 |
|
Hubert Chathi
|
f5f0686586
|
Merge pull request #5239 from uhoreg/dehydration
Add support for dehydrated devices
|
2020-10-05 17:40:49 -04:00 |
|
Michael Telatynski
|
fdb8cb78f9
|
Merge pull request #5277 from matrix-org/t3chguy/fix/9551
Use Own Profile Store for the Profile Settings
|
2020-10-05 14:46:12 +01:00 |
|
Michael Telatynski
|
cf37f0abf2
|
Fix the AvatarSetting avatar getting crushed by the flexbox
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-05 12:54:01 +01:00 |
|
Michael Telatynski
|
4f52afdb3c
|
Merge pull request #5270 from matrix-org/t3chguy/rs/3620
null-guard defaultAvatarUrlForString
|
2020-10-05 12:31:01 +01:00 |
|
Sorunome
|
34c15b5221
|
fix img tags not always being rendered correctly
|
2020-10-05 09:50:19 +02:00 |
|
Hubert Chathi
|
49cc62ca43
|
Oh right. Run i18n again.
|
2020-10-02 17:48:13 -04:00 |
|
Hubert Chathi
|
c1765c857e
|
apply changes from review
|
2020-10-02 17:43:49 -04:00 |
|
Michael Telatynski
|
01031e33cb
|
Merge pull request #5257 from matrix-org/t3chguy/fix/14112
Choose first result on enter in the emoji picker
|
2020-10-02 22:15:47 +01:00 |
|
Michael Telatynski
|
489c5b9b0a
|
Merge pull request #5276 from michel-zimmer/room-directory-clipped-uris
Fix room directory clipping links in the room's topic
|
2020-10-02 18:29:19 +01:00 |
|
Michael Telatynski
|
a6246a7e9f
|
Merge pull request #5278 from matrix-org/t3chguy/fix/15362
Decorate failed e2ee downgrade attempts better
|
2020-10-02 18:19:05 +01:00 |
|
Michael Telatynski
|
6caf53bd1e
|
Merge pull request #5262 from matrix-org/t3chguy/fix/15286
MELS use latest avatar rather than the first avatar
|
2020-10-02 18:18:36 +01:00 |
|
Michael Telatynski
|
f01ea32397
|
Merge pull request #5261 from matrix-org/t3chguy/fix/15279
Fix Encryption Panel close button clashing with Base Card
|
2020-10-02 18:18:20 +01:00 |
|
Michel Zimmer
|
58bbbf31b9
|
Fix room directory clipping links in the room's topic
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
|
2020-10-02 18:00:58 +02:00 |
|
Michael Telatynski
|
cc43de6ebf
|
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-02 16:46:27 +01:00 |
|
Michael Telatynski
|
7d11c3092d
|
Decorate failed e2ee downgrade attempts better
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-02 16:38:02 +01:00 |
|
Michael Telatynski
|
d3cbb51ecb
|
Use Own Profile Store for the Profile Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-10-02 15:39:34 +01:00 |
|
Travis Ralston
|
fd441f7bba
|
Merge pull request #5275 from matrix-org/travis/e2e/skip-if-not-possible
Wrap canEncryptToAllUsers in a try/catch to handle server errors
|
2020-10-02 07:30:23 -06:00 |
|
Hubert Chathi
|
bd9cebe35d
|
oh right, I need to run the i18n script too
|
2020-10-01 21:52:28 -04:00 |
|
Hubert Chathi
|
dd57e94c68
|
Merge remote-tracking branch 'upstream/develop' into dehydration
|
2020-10-01 21:42:28 -04:00 |
|
Hubert Chathi
|
0db81e4093
|
add a feature flag for dehydration
|
2020-10-01 21:41:03 -04:00 |
|
Hubert Chathi
|
503f32948c
|
try to unlock secret storage with dehydration key
|
2020-10-01 21:40:49 -04:00 |
|
Travis Ralston
|
60d5e732d9
|
Wrap canEncryptToAllUsers in a try/catch to handle server errors
Fixes https://github.com/vector-im/element-web/issues/12266
|
2020-10-01 18:58:13 -06:00 |
|
Travis Ralston
|
c6834fd428
|
Merge pull request #5274 from matrix-org/travis/fix-community-join
Fix conditional on communities prototype room creation dialog
|
2020-10-01 14:02:06 -06:00 |
|
Travis Ralston
|
153e63b6aa
|
Fix conditional on communities prototype room creation dialog
|
2020-10-01 13:44:16 -06:00 |
|
Michael Telatynski
|
e52e33f5a1
|
Merge pull request #5271 from matrix-org/t3chguy/fix/14851
Fix ensureDmExists for encryption detection
|
2020-10-01 17:59:27 +01:00 |
|
Travis Ralston
|
cca9b91aca
|
Merge pull request #5171 from matrix-org/travis/widget-api
Switch to using the Widget API SDK for widget messaging
|
2020-10-01 10:16:01 -06:00 |
|
Travis Ralston
|
d640490595
|
Fix iframe reference
|
2020-10-01 10:03:52 -06:00 |
|
Travis Ralston
|
0570deffa2
|
Fix iterableUnion types
|
2020-10-01 10:01:13 -06:00 |