PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
23174 commits 1 branch 0 tags 338 MiB
Commit graph

23174 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tulir Asokan
25af26323c Make image reply rendering even more compact 2020-04-10 15:45:59 +03:00
Tulir Asokan
9b023fb37d Add missing semicolon 2020-04-10 14:52:24 +03:00
Tulir Asokan
e64ff0f099 Change score color to match sender name 2020-04-10 14:39:16 +03:00
Tulir Asokan
03299a28a4 Fix import/export things 2020-04-10 14:23:34 +03:00
Tulir Asokan
26a4a23a33 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-04-10 13:56:01 +03:00
Travis Ralston
8f49ed664f
Merge pull request #4383 from matrix-org/travis/plural-delete 
Use singular text on 'delete sessions' button for SSO
 2020-04-09 16:39:59 -06:00
Travis Ralston
879b4e15e5 Use singular text on 'delete sessions' button for SSO 
Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357

Not a release blocker at this time.
 2020-04-09 16:18:12 -06:00
Travis Ralston
4d461c6d87
Merge pull request #4377 from matrix-org/travis/sticker-data 
Pass widget data through from sticker picker
 2020-04-09 14:48:33 -06:00
Travis Ralston
ef8c5033ee
Merge pull request #4376 from matrix-org/travis/jitsi-end 
Obliterate widgets when they are minimized
 2020-04-09 14:40:40 -06:00
Travis Ralston
3dc03ba089 Pass widget data through from sticker picker 
This allows for sticker pickers to have custom template variables.

Fixes https://github.com/vector-im/riot-web/issues/6716
 2020-04-09 14:40:23 -06:00
Travis Ralston
db3c7a8f1c Obliterate widgets when they are minimized 
Fixes https://github.com/vector-im/riot-web/issues/12810

We do this to all widgets as we can't guarantee what sorts of other widgets might need similar treatment.
 2020-04-09 14:31:46 -06:00
Michael Telatynski
74291e8c2d
Merge pull request #4370 from matrix-org/t3chguy/clear_event_line 
Fix image thumbnail width when read receipts are hidden
 2020-04-09 20:57:12 +01:00
Michael Telatynski
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee 
Add toggle for e2ee when creating private room
 2020-04-09 17:22:58 +01:00
David Baker
5dfcfb2147
Merge pull request #4372 from matrix-org/dbkr/search_fail_logging 
Fix logging for failed searches
 2020-04-09 16:27:08 +01:00
David Baker
53b753789a Fix logging for failed searches 
error is an object so appending it to a string is not helpful
 2020-04-09 16:04:14 +01:00
Bruno Windels
c1dcb690b3
Merge pull request #4369 from matrix-org/bwindels/fixresetkeys 
Ensure UI is updated when cross-signing gets disabled
 2020-04-09 13:34:40 +00:00
David Baker
928d4acd31
Merge pull request #4371 from matrix-org/dbkr/retry_master_key_fetch 
Retry the request for the master key from SSSS on login
 2020-04-09 14:20:36 +01:00
David Baker
b6ef30af8f Retry the request for the master key from SSSS on login 
If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
 2020-04-09 13:40:46 +01:00
Michael Telatynski
60808ef6d2 apply clear:both to fix automatic margins for continuation events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 13:36:53 +01:00
Bruno Windels
282577cefb recalculate toasts when cross-signing gets en/disabled 2020-04-09 13:43:51 +02:00
Bruno Windels
291fae6493 update room trust when cross-signing gets en/disabled 2020-04-09 13:43:30 +02:00
J. Ryan Stinnett
d4ba8103b6
Merge pull request #4365 from matrix-org/jryans/upgrade-2020-04-08 
Upgrade deps
 2020-04-09 10:19:16 +01:00
Michael Telatynski
120e2201ad
Merge pull request #4367 from matrix-org/t3chguy/app_load2 
App load tweaks, i18n and localStorage
 2020-04-09 10:16:19 +01:00
Michael Telatynski
cef9dbe254 Analytics.js gets executed during times where localStorage is not ensured to exist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 21:42:58 +01:00
Michael Telatynski
68608c2bcb Fix gen-i18n.js script for .ts files 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 21:42:12 +01:00
Travis Ralston
e30e245bc7
Merge pull request #4366 from matrix-org/travis/encode-widgets 
Fix encoding of widget arguments
 2020-04-08 13:12:03 -06:00
Travis Ralston
b5aaae1c27 Fix encoding of widget arguments 
Fixes https://github.com/vector-im/riot-web/issues/12985

This is done by using a more modern API and de-encoding dollar signs.
 2020-04-08 12:58:52 -06:00
J. Ryan Stinnett
c87d6c22df yarn upgrade 2020-04-08 14:49:52 +01:00
Michael Telatynski
ffecf03b2a Update margins to improve grouping 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 14:48:50 +01:00
Michael Telatynski
4041c030a5 Apply changes from Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 13:47:15 +01:00
Damir Jelić
a26a3f5862 Merge branch 'poljar/eventindex-log-improvement' into develop 2020-04-08 14:23:54 +02:00
J. Ryan Stinnett
5d65da12c2
Merge pull request #4364 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-04-08 13:15:01 +01:00
Weblate
b0d2c3fd98 Merge branch 'origin/develop' into Weblate. 2020-04-08 11:20:01 +00:00
Besnik Bleta
3a05d74ae8 Translated using Weblate (Albanian) 
Currently translated at 99.6% (2268 of 2276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-04-08 11:20:01 +00:00
J. Ryan Stinnett
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso 
Support deactivating your account with SSO
 2020-04-08 12:19:53 +01:00
Weblate
a0ecfdd786 Merge branch 'origin/develop' into Weblate. 2020-04-08 10:32:16 +00:00
J. Ryan Stinnett
a5f6a07ed6
Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format 
Add debug status for cached backup key format
 2020-04-08 11:32:11 +01:00
Michael Telatynski
ada860f163 Add toggle for e2ee when creating private room in x-signing world 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 10:50:22 +01:00
Weblate
0310e5ec93 Merge branch 'origin/develop' into Weblate. 2020-04-08 09:45:42 +00:00
Michael Telatynski
4d7f3ba109
Merge pull request #4361 from matrix-org/t3chguy/fix_composer_placeholder1 
Fix composer placeholder not updating
 2020-04-08 10:45:35 +01:00
Michael Telatynski
4447370764 Fix composer placeholder not updating 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 10:19:52 +01:00
Damir Jelić
c6fcaf86ff EventIndex: Log if we had all events in a checkpoint but are continuing. 2020-04-08 11:15:13 +02:00
Weblate
23e1e6f27a Merge branch 'origin/develop' into Weblate. 2020-04-08 09:00:45 +00:00
Michael Telatynski
f61c888f0c
Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security 
Fix sas verification buttons to match figma
 2020-04-08 10:00:39 +01:00
Weblate
f2ddb96c1b Merge branch 'origin/develop' into Weblate. 2020-04-08 08:47:08 +00:00
MamasLT
7553747433 Translated using Weblate (Lithuanian) 
Currently translated at 46.3% (1052 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-04-08 08:47:08 +00:00
Kévin C
b9d28f09c8 Translated using Weblate (French) 
Currently translated at 100.0% (2273 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-08 08:47:03 +00:00
Jeff Huang
23ccd6de1c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2273 of 2273 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-08 08:47:03 +00:00
Zoe
17f3b92726
Merge pull request #4345 from matrix-org/foldleft/12982-notifications 
Don't show fallback text for verification requests
 2020-04-08 09:46:56 +01:00