nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
31,352 Commits 258 Branches 582 Tags
46fd549ace0e3c05e449da9d7cabc4bbf9735ce5
Commit Graph

12630 Commits

Author SHA1 Message Date
Michael Telatynski
6cb3381df5 Remove redundant lockOrigin parameter from usercontent 
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
 2021-02-16 18:03:12 +00:00
J. Ryan Stinnett
234f1bf2c4 Test domains in config directly 2021-02-15 17:38:11 +00:00
J. Ryan Stinnett
d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Šimon Brandner
5072fb0608 Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner
65ef4f2f22 Removed the commented out code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-15 16:05:14 +01:00
Michael Weimann
f343aaa05a fix context menu padding calculation 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-02-14 18:37:06 +01:00
PunitLodha
0902936d39 Add phone number only if verification is complete 2021-02-14 18:21:39 +05:30
PunitLodha
74a6c1e8d8 Dont clear email if verification cancelled by user 2021-02-14 18:21:12 +05:30
David Baker
196507a730 VoIP virtual rooms, mk II 
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
 2021-02-12 20:55:54 +00:00
Šimon Brandner
130e4f7bfd Added some styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 17:06:02 +01:00
Šimon Brandner
97f5b6920c Check if the method is defined before calling it 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 16:48:46 +01:00
Šimon Brandner
2b4859a858 Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
Šimon Brandner
b269517149 Removed wrapper 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:52:42 +01:00
Šimon Brandner
ba2c68819f Removed showSendButton setting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:45:06 +01:00
Šimon Brandner
35c0cb99d0 Use isComposerEmpty for send button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:45:03 +01:00
Šimon Brandner
50b0a78132 Renamed composerEmpty to isComposerEmpty 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:44:22 +01:00
Šimon Brandner
42a48ee27d Added composerEmpty property 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:44:22 +01:00
Šimon Brandner
98757bb6cf Extract send button into a function 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:44:16 +01:00
Šimon Brandner
17f09d3b7a Added onIsEmptyChanged prop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 15:16:07 +01:00
Michael Telatynski
da6f1e559b Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog 
Added loading and disabled the button while searching for server
 2021-02-11 12:22:27 +00:00
Jaiwanth
20dc8dbb32 Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:39:12 +05:30
Jaiwanth
61c6033de7 Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:38:58 +05:30
Jaiwanth
6c252a87a1 Update src/components/views/dialogs/TextInputDialog.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-02-11 17:38:46 +05:30
Jaiwanth
3fc6d73158 Added loading and disabled the button while searching for server 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-11 17:28:02 +05:30
J. Ryan Stinnett
fa5df314a1 Merge pull request #5450 from matrix-org/jaywink/hosting-provider-iframe 
Add host signup modal with iframe
 2021-02-10 13:53:15 +00:00
Šimon Brandner
6b0b46b917 Fix duplication caused by highlighting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 14:20:19 +01:00
Šimon Brandner
895be6e7a6 Added second comment back 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 14:02:45 +01:00
Šimon Brandner
5cf126dea3 Added comment back 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 13:41:24 +01:00
Šimon Brandner
b97d8979c7 Remove nested for loop 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-10 13:18:23 +01:00
Jason Robinson
23140a84ff Remove host signup config strings, make translatable instead 
Also replace the icon in the UserMenu and change the text, requested from design.
 2021-02-10 13:38:32 +02:00
Jason Robinson
dc549a9e4b Address some more pr feedback 2021-02-09 22:41:40 +02:00
Šimon Brandner
4a7bc74e99 Fix duplication of codeblock elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 19:46:30 +01:00
Jason Robinson
2197c1e519 Address some of the PR feedback 2021-02-09 20:13:58 +02:00
Jason Robinson
a4a478cf72 Remove host signup link from UserMenu.tsx 
It duplicates the new host signup modal dialog.
 2021-02-09 20:01:45 +02:00
Michael Telatynski
59069f95e9 Merge pull request #5631 from SimonBrandner/avoid-delay-on-screen-share 
Avoid delayed displaying of sources in source picker
 2021-02-09 12:26:29 +00:00
Šimon Brandner
27b2b5b65d Make componentDidMount async 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 13:19:12 +01:00
Šimon Brandner
98e602f544 Avoid delayed displaying of sources 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 13:07:23 +01:00
Jason Robinson
c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson
ad5b40b5ba Allow popups from host signup dialog 2021-02-09 12:29:23 +02:00
Jason Robinson
e31b89b952 Restructure host signup terms dialog documents config and dialog 2021-02-09 12:23:27 +02:00
Jason Robinson
2aa4fce1c5 Remove unused types 2021-02-09 11:42:58 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
PunitLodha
392b47e200 Add email only if the verification is complete 2021-02-09 11:39:36 +05:30
William Kray
99be8ccd88 move close-preview button to top 2021-02-08 09:26:10 -08:00
William Kray
b459395d6d increase size of url preview thumbnail 2021-02-08 09:26:10 -08:00
William Kray
cd1a99186b change image rendering size max height 2021-02-08 09:26:10 -08:00
Marco Zehe
890bb5b9eb Give breadcrumbs toolbar an accessibility label. 
Fixes vector-im/element-web#16406.

Signed-off-by: Marco Zehe <marco@marcozehe.de>
 2021-02-08 16:58:18 +01:00
Šimon Brandner
84eba59afa Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
David Baker
cf5ec7720c Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
J. Ryan Stinnett
811ae9ba82 Merge pull request #5616 from dangwynne/develop 
Close current modal when session is logged out
 2021-02-08 12:56:00 +00:00