mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-26 11:15:53 +03:00
Code Issues Projects Releases Packages Wiki Activity
31379 commits 206 branches 553 tags 408 MiB
Commit graph

31379 commits

This branch
This branch
All branches
Author SHA1 Message Date
J. Ryan Stinnett
4e87fdcdfe Fix object diffing when objects have different keys 
The object diff optimisation in 32cca0534c is not
correct for the case where `b` has some keys that are not in `a`.

By ensuring their key arrays are same length, we can preserve optimisation and
be correct as well.

Fixes https://github.com/vector-im/element-web/issues/16514
 2021-02-24 13:45:25 +00:00
J. Ryan Stinnett
c57b49a354
Merge pull request #5673 from SimonBrandner/dont-show-copy-button 
Add <code> if it's missing
 2021-02-24 13:33:39 +00:00
Šimon Brandner
986950697b
Rmove unnecessary code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 14:10:09 +01:00
Šimon Brandner
024871f59d
Merge branch 'dont-show-copy-button' of https://github.com/SimonBrandner/matrix-react-sdk into dont-show-copy-button 2021-02-24 13:41:16 +01:00
Šimon Brandner
363b753306
Avoid innerHTML 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-24 13:40:37 +01:00
Šimon Brandner
61cd026d7a
Improve comment 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-24 13:07:25 +01:00
J. Ryan Stinnett
9a56a2efa5
Merge pull request #5629 from PunitLodha/punit/add_email_bug_fix 
Add email only if the verification is complete
 2021-02-24 11:28:57 +00:00
David Baker
bcc567cd86
Merge pull request #5676 from SimonBrandner/fix-portrait 
Fix portrait videocalls
 2021-02-24 09:26:57 +00:00
Šimon Brandner
3f0e8e4afc
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 19:16:52 +01:00
Šimon Brandner
64945d4ccf
Add a comment and use rems 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 19:14:36 +01:00
Šimon Brandner
2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01:00
J. Ryan Stinnett
667c94b387
Merge pull request #5643 from SimonBrandner/move-icons 
Tweak code block icon positions
 2021-02-23 14:53:28 +00:00
Will Hunt
84bcdf66f2 Fix TS check 2021-02-23 13:00:05 +00:00
J. Ryan Stinnett
5793f55090
Merge pull request #5677 from matrix-org/jryans/revert-url-image-layout 
Revert "Improve URL preview formatting and image upload thumbnail size"
 2021-02-23 12:52:43 +00:00
Will Hunt
aa86c1d751 Ensure that a dismissed usage alert toast stays dismissed 2021-02-23 12:51:47 +00:00
Will Hunt
0daed98627 Do not process an older usage event if we've already processed a newer one 2021-02-23 12:51:17 +00:00
J. Ryan Stinnett
3db6a45010 Revert "Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes" 
This reverts commit 5c1b38a48c, reversing
changes made to ec4a39a694.
 2021-02-23 12:03:08 +00:00
Šimon Brandner
ce1be7a4cd
Use length instead of the first element 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:49:26 +01:00
Šimon Brandner
c9baff1e10
Move the _addCodeElement() call down a bit 
We can skip this if the first if statement is true

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:46:03 +01:00
Šimon Brandner
c965119410
Add _addCodeElement method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-23 07:40:53 +01:00
Šimon Brandner
effb9666f2
Fix portrait videocalls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 20:10:30 +01:00
J. Ryan Stinnett
72ff919512
Merge pull request #5644 from weeman1337/fix-contextmenu-padding 
Fix context menu leaving visible area
 2021-02-22 17:42:09 +00:00
David Baker
18bd49f3c2
Merge pull request #5675 from matrix-org/dbkr/jitsi_conference_captialised 
Jitsi conferences names, take 3
 2021-02-22 17:33:45 +00:00
J. Ryan Stinnett
e30a0d6420
Merge pull request #5670 from gsouquet/fix/is-on-dark-theme 
Update isUserOnDarkTheme to take use_system_theme in account
 2021-02-22 17:29:49 +00:00
David Baker
428af8b9e2 Jitsi conferences names, take 3 
Shorter, capatalised, just 'Jitsi' prefix rather than 'JitsiConference'
 2021-02-22 16:48:12 +00:00
Šimon Brandner
6149567c62
Add <code> if it's missing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 13:43:57 +01:00
Šimon Brandner
87a2454556
Revert "Don't show copy button if there is no <code>" 
This reverts commit c76cc33ebf.
 2021-02-22 13:41:20 +01:00
Šimon Brandner
c76cc33ebf
Don't show copy button if there is no <code> 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-22 13:23:39 +01:00
libexus
d62ac4c80a Translated using Weblate (German) 
Currently translated at 99.3% (2747 of 2764 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-02-21 22:54:08 +00:00
Germain
bce88efa4f update isUserOnDarkTheme to return correct theme when use_system_theme is true 
Signed-off-by: Germain <germain@grabyo.com>
 2021-02-21 16:49:30 +00:00
@a2sc:matrix.org
1086d82499 Translated using Weblate (German) 
Currently translated at 99.8% (2760 of 2764 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-02-19 18:04:45 +00:00
libexus
540a8114ab Translated using Weblate (German) 
Currently translated at 99.8% (2760 of 2764 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-02-19 18:04:43 +00:00
Michael Telatynski
79daf615e4 First special treatment of space-rooms 2021-02-19 14:20:57 +00:00
Michael Telatynski
6b3f05a3cd Switch RoomListStore to only including the filtered subset 
Without this it'd include notification counts from Community B when Community A is selected and such.
 2021-02-19 14:10:36 +00:00
Michael Telatynski
148764aa8a Create Labs flag for Spaces 2021-02-19 13:50:49 +00:00
Michael Telatynski
a823572394 delint 2021-02-19 13:38:43 +00:00
Michael Telatynski
f45510ed25 Fix test assuming too much about the underlying calls 2021-02-19 13:08:30 +00:00
Michael Telatynski
413b37d3dc Create and use Incompatible Settings Controller 2021-02-19 13:06:45 +00:00
Michael Telatynski
63d95706e9 Create setHasDiff helper and use it 
The usage here is identical to how it'll work in Spaces
 2021-02-19 12:58:23 +00:00
Michael Telatynski
02ae1e954b clean up objectHasDiff and short circuit it quicker 2021-02-19 11:40:34 +00:00
Michael Telatynski
a794bfdd3e
Merge pull request #5665 from matrix-org/t3chguy/spaces1 
Discard some dead code
 2021-02-19 09:50:04 +00:00
Michael Telatynski
49f511bbab delint 2021-02-19 00:26:52 +00:00
Michael Telatynski
32cca0534c improve algo by skipping an O(n) operation 2021-02-19 00:19:35 +00:00
Michael Telatynski
d4df9e731d i18n 2021-02-19 00:10:47 +00:00
Michael Telatynski
3c52446205 Remove redundant PhasedRollOut 2021-02-19 00:01:07 +00:00
Michael Telatynski
3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00:00
Travis Ralston
de7e2ed37e
Merge pull request #5664 from matrix-org/travis/settings/v3-explorer 
Add developer tool to explore and edit settings
 2021-02-18 15:38:05 -07:00
Travis Ralston
10b0051c02 Appease the linter 2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Michael Telatynski
8fc244452c Prevent error being thrown so that we can throw our own better one 2021-02-18 18:06:26 +00:00