imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
32194 commits 222 branches 563 tags 470 MiB
Commit graph

13021 commits

Author SHA1 Message Date
J. Ryan Stinnett
53c4a1ada5
Merge pull request #5571 from SimonBrandner/improve-layout-handling 
Use a more generic layout setting - useIRCLayout → layout
 2021-02-17 11:02:26 +00:00
Clemens Zeidler
54c38844d2 Use key bindings in BasicMessageComposer 2021-02-17 22:00:48 +13:00
Travis Ralston
21b9ab9d85 Add an optional config option to make the welcome page the login page 
This is commonly requested by deployments with custom setups or those using SSO. Instead of having them all ship the same welcome.html with redirect code in it, we can offer a built-in redirect.

Note that this doesn't actually redirect and instead just replaces the view. This is to make the change less invasive as otherwise it involves changing the routing layers.
 2021-02-16 15:18:31 -07:00
David Baker
e787d11c73 Merge remote-tracking branch 'origin/develop' into dbkr/virtual_rooms_v2 2021-02-16 19:41:54 +00:00
Michael Telatynski
b386f0c73b
Merge pull request #5657 from matrix-org/t3chguy/usercontent 
Remove redundant lockOrigin parameter from usercontent
 2021-02-16 18:23:55 +00:00
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
Jaiwanth
ee54327733 Update src/components/views/rooms/RoomTile.tsx 2021-02-16 18:59:22 +05:30
Clemens Zeidler
c84ad9bedc Use key binding for cancelling a message reply 2021-02-16 19:12:18 +13:00
Clemens Zeidler
ac7963b509 Fix lint and style issues 2021-02-16 19:05:51 +13:00
Clemens Zeidler
12387b4978 Use the KeyBindingsManager in EditMessageComposer 2021-02-16 19:05:39 +13: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
Jaiwanth
04d2bf1d6a Check whether user has permission to invite 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 20:55:15 +05:30
Š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
Jaiwanth
f420c85985 Added invite option to room's context menu 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 19:21:26 +05:30
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
Clemens Zeidler
b4c5dec4e5 Use the KeyBindingsManager for the SendMessageComposer 2021-02-14 15:56:55 +13:00
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
Šimon Brandner
d8a9b84af9
Don't show tooltip if there is nothing to display 
We do this because resource is undefined for @room

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 14:28:39 +01:00
Šimon Brandner
a975de22ef
Fixed buggy tooltip 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 11:27:14 +01:00
Šimon Brandner
f2137fe93f
Merge branch 'develop' into show-room-name 2021-02-12 08:21:40 +01:00
Šimon Brandner
33979b3354
Added a tooltip 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 08:18:27 +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