Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
38,745 Commits 206 Branches 552 Tags 518 MiB
2b7ea16c2d
Commit Graph

38745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
2b7ea16c2d Upgrade highlight.js 
Major version bump for highlight.js. Update usage of deprecated function & some cleanups.
 2021-10-18 19:32:20 +01:00
Dariusz Niemczyk
a2bc090607
Fix threads with bubbles rendering (#6971) 
Fixes https://github.com/vector-im/element-web/issues/18958
 2021-10-18 15:41:05 +01:00
Ekaterina Gerasimova
695e110794 Improve capitalisation in string 
Remove random mid-sentence capitalisation in Security Phrase dialog. The
dialog will change at some point but for now lets make it more human
readable.

Fixes #19429
 2021-10-18 15:28:07 +01:00
Andy Balaam
4f3d761984
Merge pull request #6968 from andybalaam/cryptographypanel-table 
Convert CryptographyPanel to a table
 2021-10-18 13:26:16 +01:00
Dariusz Niemczyk
1d6c9fa8da
Add threads ViewInRoom context button (#18955) (#6947) 2021-10-18 12:09:01 +00:00
Dariusz Niemczyk
2c66403b3c Replace console.info with logger.info 
Related https://github.com/vector-im/element-web/issues/18425
 2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
5290afcc4c Replace console.warn with logger.warn 
Related https://github.com/vector-im/element-web/issues/18425
 2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
5e73a212f4 Replace console.error with logger.error 
Related https://github.com/vector-im/element-web/issues/18425
 2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
9c594a8a96 Replace console.logs to logger.log 
Related https://github.com/vector-im/element-web/issues/18425
 2021-10-18 14:08:23 +02:00
Dariusz Niemczyk
12632318ef Add missing parenthesis for await calls 2021-10-18 14:08:23 +02:00
Andy Balaam
61a5b495b7 Remove duplicate CSS selector 2021-10-18 12:23:09 +01:00
Andy Balaam
13d6456200 Convert CryptographyPanel to a table 2021-10-18 09:36:16 +01:00
Andy Balaam
f05e35bd94
Merge pull request #6958 from andybalaam/separate-cryptography-setting-component 
Break 'Cryptography' settings into a separate component
 2021-10-18 09:34:55 +01:00
Andy Balaam
78890ab3aa Run i18n generation 2021-10-18 09:20:58 +01:00
Michael Telatynski
4d63e1239b
Merge pull request #6962 from CicadaCinema/patch-3 2021-10-18 09:17:40 +01:00
Germain
d93c220aae
Merge pull request #6898 from oliver-pham/issue-19180 2021-10-18 08:47:28 +01:00
Germain
fd2a7fe0f4
Merge pull request #6961 from RafaelGoncalves8/move-error-message 2021-10-18 08:43:17 +01:00
CicadaCinema
a9c9e5b778 appease the linter 2021-10-16 14:58:10 +01:00
CicadaCinema
7b893366f2 Add spacing to Room settings - Notifications subsection 2021-10-16 14:52:29 +01:00
Rafael Goncalves
2fb802eb9e Move error message closer to password field 
Signed-off-by: Rafael Goncalves <rafaelgoncalves@riseup.net>
 2021-10-15 16:01:35 -03:00
Andy Balaam
0941b38b5d Name CryptographyPanel CSS classes consistent with style 2021-10-15 16:09:36 +01:00
David Baker
4fb0d021ae
Merge pull request #6897 from SimonBrandner/task/colors-4 
Color de-duplication #4
 2021-10-15 16:07:07 +01:00
Andy Balaam
a547ee4654 Break 'Cryptography' settings into a separate component 2021-10-15 16:02:44 +01:00
Germain
495f824f0f
Merge pull request #6957 from matrix-org/gsouquet/fix-appearance-settings 2021-10-15 15:45:05 +01:00
Germain Souquet
ac23afe9f1 Allow EventTile to be rendered with mock events 2021-10-15 15:36:06 +01:00
Faye Duxovni
1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons 
Update the button styling on the emoji comparison dialog during cross-signing
 2021-10-15 10:34:25 -04:00
Šimon Brandner
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4 2021-10-15 16:23:40 +02:00
Germain
cee0d6894f
Merge pull request #6951 from matrix-org/gsouquet/fix-thread-root-hidden 2021-10-15 15:00:17 +01:00
Germain Souquet
93fc24c875 Adding renderThreadInfo comment to explain data accessor 2021-10-15 14:47:02 +01:00
Germain Souquet
904147b194 Merge branch 'develop' into gsouquet/fix-thread-root-hidden 2021-10-15 14:45:11 +01:00
Šimon Brandner
ade53a5bd7
Do more re-ordering to keep things working 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:44:41 +02:00
Germain
3ec05c9cbd
Merge pull request #6952 from matrix-org/gsouquet/display-new-thread 2021-10-15 14:41:58 +01:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953) 
Closes https://github.com/vector-im/element-web/issues/18958
 2021-10-15 14:29:17 +01:00
Šimon Brandner
bc93954577
Remove repeated comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:24:19 +02:00
Šimon Brandner
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:23:32 +02:00
Andy Balaam
9c753765d5
Merge pull request #6955 from andybalaam/table-for-devicespanel 
Switch DevicesPanel to use table (for screen readers)
 2021-10-15 14:16:45 +01:00
Andy Balaam
690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Germain
f0ff3a26cc
Merge pull request #6954 from aaronraimist/download-tooltip 2021-10-15 11:57:39 +01:00
Andy Balaam
7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Aaron Raimist
8cdb1c667d Fix tooltip when downloading unencrypted file 2021-10-15 05:23:59 -05:00
Germain Souquet
6baa6c8f65 Listen to new thread to render info on timeline 2021-10-15 11:08:33 +01:00
Germain
af55ac7b8c
Merge pull request #6950 from matrix-org/gsouquet/threads-replies-compat 
Add 'm.thread' relation to replies when replying to a threaded event
 2021-10-15 10:27:40 +01:00
Germain Souquet
17c4cc91af Reconcile threads root with its children before displaying it 2021-10-15 10:26:04 +01:00
Germain Souquet
3dcf0d0b7e Fix incorrect logic to hide thread relations 2021-10-15 10:25:42 +01:00
Germain
2ad11b3af7
Merge pull request #6949 from matrix-org/gsouquet/threads-relations 2021-10-15 08:58:57 +01:00
Germain Souquet
99ad603d91 Merge branch 'develop' into gsouquet/threads-relations 2021-10-15 08:43:51 +01:00
Germain Souquet
5fccbd4ef7 Remove auto-import 2021-10-14 17:40:00 +01:00
Germain Souquet
378536ee2a Add 'm.thread' relation for replies to a threaded event 2021-10-14 17:22:06 +01:00
Germain Souquet
d315641056 Make threads use 'm.thread' relation 2021-10-14 17:04:27 +01:00
Dariusz Niemczyk
2dd6dddc67
Fix incorrect liveTimeline reference (#6948) 
Fixes https://github.com/vector-im/element-web/issues/19400
 2021-10-14 15:37:56 +00:00