nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
27,679 Commits 258 Branches 582 Tags
b293ef067442c157b39760fb7506b6fcf3c770b7
Commit Graph

21965 Commits

Author SHA1 Message Date
J. Ryan Stinnett
b293ef0674 Check for .well-known E2EE settings under new key 
This adds an extra check for `.well-known` E2EE settings under the key
`im.vector.e2ee`. The older key `im.vector.riot.e2ee` is kept for historical
compatibility.

Part of https://github.com/vector-im/element-web/issues/14954
 2020-08-19 16:23:26 +01: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
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
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
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
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
Bruno Windels
5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
Bruno Windels
fa1e27076d remove dupe method 2020-08-18 12:34:43 +02:00
Travis Ralston
d9e7253561 Use matrix-doc for SAS emoji translations 
This is done through the js-sdk's new SASEmojiV1 class.
 2020-08-17 15:37:36 -06:00
Michael Telatynski
2caee2eadd TypeScript: enable es2019 lib for newer definitions 2020-08-17 18:20:57 +01:00
Michael Telatynski
e20b375433 Add filter results count and explore prompt 2020-08-17 18:20:00 +01:00
Michael Telatynski
a4d11cc190 Change highlighting around the room list filter 2020-08-17 16:59:29 +01:00
Michael Telatynski
70f0701de5 null guard group inviter for corrupted groups 2020-08-17 10:59:43 +01:00
Michael Telatynski
21cdf5073c Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617 2020-08-14 18:58:26 +01:00
Michael Telatynski
be1d390a93 Merge pull request #5106 from matrix-org/t3chguy/room-list/14608 
Switch out the globe icon and colour it depending on theme
 2020-08-14 18:10:29 +01:00
Michael Telatynski
655cc95570 fix typo 2020-08-14 13:37:28 +01:00
Michael Telatynski
591847b274 Watch for Event.status instead as we can do some things in SENT 2020-08-14 13:37:11 +01:00
Michael Telatynski
de9816574f Make event subscriptions conditional when needed 2020-08-14 13:30:27 +01:00
Michael Telatynski
f982c7b334 Message Action Bar, subscribe to localEventIdReplaced events 2020-08-14 13:22:52 +01:00
Michael Telatynski
8f0e4dae9d Allow room tile context menu when minimized using right click 2020-08-14 12:01:16 +01:00
Michael Telatynski
b577667447 Merge pull request #5110 from matrix-org/t3chguy/room-list/14298 
Put message previews for Emoji behind Labs
 2020-08-14 11:33:37 +01:00
Michael Telatynski
228d1af6dc i18n 2020-08-14 11:01:03 +01:00
Michael Telatynski
4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski
e7bd656a19 i18n 2020-08-13 16:41:25 +01:00
Michael Telatynski
50b9da7597 Put message previews for Emoji behind Labs 2020-08-13 16:40:18 +01:00
Michael Telatynski
3f2c1500e5 Fix /op slash command 2020-08-13 16:29:25 +01:00
Michael Telatynski
b8a260bb84 Change add room action for rooms to context menu 2020-08-13 16:18:26 +01:00
Michael Telatynski
8aa50ecb59 Iterate rageshake download styling 2020-08-13 13:08:07 +01:00
strix aluco
a4d30c1549 Translated using Weblate (Ukrainian) 
Currently translated at 50.0% (1166 of 2331 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/uk/
 2020-08-13 09:38:00 +00:00
Michael Telatynski
df980dbf92 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 2020-08-12 22:48:03 +01:00
Weblate
9586be039f Merge branch 'origin/develop' into Weblate. 2020-08-12 15:02:07 +00:00
Michael Telatynski
b990a0dd3a Merge pull request #5102 from matrix-org/t3chguy/14938 
Try to close notification on all platforms which support it, not just electron
 2020-08-12 16:02:02 +01:00
Weblate
f3704efed1 Merge branch 'origin/develop' into Weblate. 2020-08-12 15:01:47 +00:00
Michael Telatynski
cacb0af5a2 Merge pull request #5101 from matrix-org/t3chguy/fix/14934 
Fix exception when stripping replies from an event with a non-string body
 2020-08-12 16:01:41 +01:00
Weblate
c8a34d2640 Merge branch 'origin/develop' into Weblate. 2020-08-12 14:21:13 +00:00
Jorik Schellekens
0060acbb33 Merge pull request #5056 from matrix-org/joriks/style-fighting 
Quick win session 24/07/2020
 2020-08-12 15:21:06 +01:00
Weblate
ff9875351f Merge branch 'origin/develop' into Weblate. 2020-08-12 14:18:51 +00:00
J. Ryan Stinnett
0c76af19f0 Merge pull request #5100 from matrix-org/jryans/remove-rebranding-toast 
Remove rebranding toast
 2020-08-12 15:18:44 +01:00
J. Ryan Stinnett
1a68d2bb7c Update more types 2020-08-12 14:57:26 +01:00
J. Ryan Stinnett
83867b893f Update types 2020-08-12 14:53:31 +01:00
Weblate
823d6a168b Merge branch 'origin/develop' into Weblate. 2020-08-12 13:41:48 +00:00
strix aluco
839b533a97 Translated using Weblate (Ukrainian) 
Currently translated at 49.0% (1147 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/uk/
 2020-08-12 13:41:48 +00:00
vejetaryenvampir
f8526a7387 Translated using Weblate (Turkish) 
Currently translated at 73.4% (1719 of 2341 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/tr/
 2020-08-12 13:41:47 +00:00