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

9210 commits

Author SHA1 Message Date
Travis Ralston
855ee068c3 Appease the linter 2021-02-26 13:50:03 -07:00
Travis Ralston
4e27b00cf3 Move call buttons to the room header 
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
 2021-02-26 13:46:39 -07:00
Travis Ralston
fbe5d17785 sanity 2021-02-24 18:27:59 -07:00
Travis Ralston
e2fb9b3ae8 Clean up widgets when leaving the room 2021-02-24 18:10:35 -07:00
Travis Ralston
dee7c7b556
Merge pull request #5567 from SimonBrandner/fix-read-receipts 
Fix read receipts?
 2021-02-24 11:21:42 -07: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
Šimon Brandner
2f2c5c9081
Merge branch 'develop' into fix-read-receipts 2021-02-23 18:43:58 +01: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
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
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
3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00: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
50252483c6 Remove stale unused components 2021-02-18 18:05:41 +00:00
Michael Telatynski
0e7a731d61 Make use of new room canInvite helper 2021-02-18 15:19:16 +00:00
Michael Telatynski
e1acf11e67 Create Room Name & Topic HOCs to simplify code elsewhere 2021-02-18 15:16:59 +00:00
Michael Telatynski
354925c2c8 Improve TS definitions 2021-02-18 15:16:07 +00:00
David Baker
68933c1a3d
Merge pull request #5639 from matrix-org/dbkr/virtual_rooms_v2 
VoIP virtual rooms, mk II
 2021-02-18 13:18:34 +00:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes 
Improve URL preview formatting and image upload thumbnail size
 2021-02-17 11:37:37 +00:00
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
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
Š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
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
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