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

13033 commits

Author SHA1 Message Date
David Baker
747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
Michael Telatynski
499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
David Baker
3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
Simon Merrick
b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
Simon Merrick
5544ee6408 extract alias handling to separate function 2020-12-06 23:29:11 +13:00
Lukas
a856484139 Fix typos in some strings 
This commit fixes some typos that I've stumbled upon.
 2020-12-06 10:32:52 +01:00
David Baker
ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker
faf2922b1b Update video element when the call changes in a videoview 
Because that can happen now
 2020-12-04 19:41:48 +00:00
macekj
0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason 
add support for giving reason when redacting
 2020-12-04 15:13:40 +00:00
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker
0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker
1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
Michael Telatynski
b200211660
Merge pull request #5465 from matrix-org/t3chguy/socials 
Fix React complaining about unknown DOM props
 2020-12-03 15:20:16 +00:00
Michael Telatynski
1afece9a14 Fix React complaining about unknown DOM props 2020-12-03 12:20:48 +00:00
Michael Telatynski
e4b929c6f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882 2020-12-03 11:42:47 +00:00
Michael Telatynski
f432d4e394 delint 2020-12-03 11:31:14 +00:00
Michael Telatynski
3223b00028 Jump to home page when leaving a room 
so that you don't get thrown into a room you may be ignoring on purpose
 2020-12-03 11:15:55 +00:00
Michael Telatynski
0fd9b55b95 Fix SSO buttons for Social Logins 2020-12-03 11:08:16 +00:00
Šimon Brandner
19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:06:43 +01:00
Šimon Brandner
fa19adcfe0 Simplifie 2020-12-03 11:50:08 +01:00
macekj
27a853c586 use textSerialize function to get model text 2020-12-02 15:01:44 -05:00
Šimon Brandner
bab541a652 Hide spell-check settings if not using Electron 2020-12-02 20:14:58 +01:00
Michael Telatynski
3fda7e3f46 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-02 15:08:13 +00:00
Jason Robinson
31c7c05f2e Convert ConfirmCloseHostingSignupDialog to typescript 2020-12-02 11:12:45 +02:00
Travis Ralston
bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts 
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.

Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
 2020-12-01 13:05:48 -07:00
Šimon Brandner
db5bc0cb7a Fix formatting 2020-12-01 20:36:25 +01:00
Šimon Brandner
3c2bb6e4f6 Cleanup 2020-12-01 20:17:24 +01:00
nurjinn jafar
111515e794 fixed linter problem 2020-12-01 17:37:28 +01:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 
 Conflicts:
	src/i18n/strings/en_EN.json
 2020-12-01 16:33:29 +00:00
Šimon Brandner
e9203d7571 Removed unnecessary imports 2020-12-01 17:21:23 +01:00
nurjinn jafar
1bf7ff8994 null check added 
path to confetti fixed after refactoring
 2020-12-01 17:15:02 +01:00
Šimon Brandner
cf61d50df4 Added SpellCheckLanguagesDropdown 2020-12-01 16:59:21 +01:00
Šimon Brandner
b207a877eb Change label 2020-12-01 16:59:02 +01:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
Michael Telatynski
26e1cdb82c Update i18n 2020-12-01 12:04:41 +00:00
Jason Robinson
c03a50e34b
Semiclon 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:51:46 +02:00
Jason Robinson
8f7b012ec1
Interface syntax 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:50:58 +02:00
Jason Robinson
85ce95e066
Interface syntax 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:50:42 +02:00
Jason Robinson
f112f4fcef
Method scoping 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:49:47 +02:00
Jason Robinson
a67ad0750d
Code styling 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-01 13:49:04 +02:00
anonym
b1b0e93d5e
Update i18n for Appearance User Settings 
The variable has to be added to the i18n files as well (I don't know how to do that)
 2020-11-30 21:33:52 +01:00
David Baker
cb6c080828 Fix remote video being too tall and causing aux panel to scroll 2020-11-30 16:44:31 +00:00
Michael Telatynski
d4ed4a135c
Merge pull request #5442 from RinkiyaKeDad/avatar-fix 
Fixed Avatar for 3PID invites
 2020-11-30 09:49:05 +00:00
Šimon Brandner
5d9f5ba979 Fix indentation 2020-11-30 08:35:51 +01:00
Šimon Brandner
ead00dcded Set spell-check languages without reloading 2020-11-29 14:46:09 +01:00
Šimon Brandner
8f40cd39fd Added styling 2020-11-29 12:29:05 +01:00
Šimon Brandner
f0bbed0c44 Allow default value 2020-11-29 12:17:07 +01:00
Šimon Brandner
5e4f9907cf Added persistance 2020-11-28 19:39:09 +01:00