PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
16724 commits 1 branch 0 tags 338 MiB
Commit graph

13592 commits

Author SHA1 Message Date
Travis Ralston
3fcbd46939
Merge pull request #3220 from matrix-org/travis/kick-reason 
Don't show a reason if there's no reason for a kick/ban
 2019-07-15 09:30:19 -06:00
Bruno Windels
7e25e1b2fc remove unneeded else 2019-07-15 14:02:41 +02:00
Bruno Windels
034883dc7e improve comments 2019-07-15 14:01:28 +02:00
Bruno Windels
8ac54661be take adjacent no-tile events in combination with ignored events into account when determining the last displayed event 2019-07-15 12:53:39 +02:00
Travis Ralston
31339aa11f Don't show a reason if there's no reason for a kick/ban 
Fixes https://github.com/vector-im/riot-web/issues/9677
 2019-07-14 23:31:38 -06:00
Bruno Windels
5c7e9812a1 also check content and content.users before proceeding 2019-07-12 18:50:13 +02:00
Travis Ralston
78ba22d12e
Merge pull request #3206 from matrix-org/travis/tombstone-autojoin 
Autojoin rooms when clicking the tombstone
 2019-07-12 08:14:42 -06:00
Travis Ralston
ff0c4c0571
Merge pull request #3211 from matrix-org/travis/send-proper-uia 
Send the correct UIA alongside the wrong UIA for backwards comaptibility
 2019-07-12 08:14:01 -06:00
Travis Ralston
5f98e4ea61
Merge pull request #3213 from matrix-org/travis/remove-is-flag 
Remove unused identityEnabled property from ValidatedServerConfig
 2019-07-12 08:11:55 -06:00
David Baker
28c3578b02
Merge pull request #3205 from matrix-org/travis/soft-logout-copy 
Remove misleading text about admins logging people out from soft logout
 2019-07-12 12:32:24 +01:00
Kévin C
7773722202 Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 09:51:25 +00:00
Weblate
7afb0e9019 Merge branch 'origin/develop' into Weblate. 2019-07-12 08:42:39 +00:00
J. Ryan Stinnett
b27c1a45e4 Adjust spelling on debug log screen 2019-07-12 09:42:02 +01:00
Weblate
36946dbb4d Merge branch 'origin/develop' into Weblate. 2019-07-12 08:25:11 +00:00
Kévin C
1ab99c89fe Translated using Weblate (French) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-12 08:25:11 +00:00
Bruno Windels
7fc19e61a9
Merge pull request #3210 from matrix-org/bwindels/prevent-autocomplete-on-paste 
Prevent autocomplete on paste, and verserev-ing text before and after :
 2019-07-12 08:25:06 +00:00
Bruno Windels
ee9dd8ce81 adjust jsdoc 2019-07-12 10:06:38 +02:00
Weblate
0a108b3de4 Merge branch 'origin/develop' into Weblate. 2019-07-11 22:03:33 +00:00
Szimszon
30002b48f9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1688 of 1688 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-11 22:03:33 +00:00
Travis Ralston
285b126530 Appease the linter 2019-07-11 15:14:05 -06:00
Travis Ralston
7a3aa9be2e Remove unused identityEnabled property from ValidatedServerConfig 
See https://github.com/vector-im/riot-web/issues/10229
 2019-07-11 15:11:09 -06:00
Travis Ralston
ba5238d86a Finally fix tests 2019-07-11 15:01:56 -06:00
Travis Ralston
733401652b Close settings after deactivating 
Fixes https://github.com/vector-im/riot-web/issues/9566
 2019-07-11 14:54:49 -06:00
Travis Ralston
5958cf0693 Merge branch 'develop' into travis/soft-logout-copy 2019-07-11 14:47:13 -06:00
Travis Ralston
862fb16120 Send the correct UIA alongside the wrong UIA for backwards comaptibility 
Fixes https://github.com/vector-im/riot-web/issues/10312
 2019-07-11 14:28:10 -06:00
Weblate
3c1935e9a7 Merge branch 'origin/develop' into Weblate. 2019-07-11 19:01:42 +00:00
Travis Ralston
c89a864a82 update copy 2019-07-11 12:54:26 -06:00
Bruno Windels
dedf978948 prevent inserting parts at index -1 for empty documents 2019-07-11 18:46:56 +02:00
Bruno Windels
06fb892df9 prevent autocomplete when doing bulk insertion (paste, drop text) 2019-07-11 18:46:56 +02:00
Bruno Windels
507b89fc61 manually attach input event handler, as React doesn't pass inputType 2019-07-11 18:46:56 +02:00
Travis Ralston
000d545ffd Remove misleading text about admins logging people out from soft logout 2019-07-11 09:18:33 -06:00
Travis Ralston
5f9a123a80 Require an issue URL (or notes) on rageshakes 
Fixes https://github.com/vector-im/riot-web/issues/8155
 2019-07-11 09:14:31 -06:00
Travis Ralston
ed2f88fd79 Autojoin rooms when clicking the tombstone 
Fixes https://github.com/vector-im/riot-web/issues/10299
 2019-07-11 08:39:41 -06:00
Osoitz
7c9c94eb27 Translated using Weblate (Basque) 
Currently translated at 99.5% (1679 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-07-11 14:20:13 +00:00
Weblate
49853a18f9 Merge branch 'origin/develop' into Weblate. 2019-07-11 10:33:57 +00:00
Michael Telatynski
56b1775209
Merge pull request #3198 from matrix-org/t3chguy/kick 
Show anything other than ban/invite -> leave as a kick
 2019-07-11 11:33:53 +01:00
Szimszon
b3b776e028 Translated using Weblate (Hungarian) 
Currently translated at 99.0% (1670 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-07-11 10:04:51 +00:00
Weblate
c470ad8465 Merge branch 'origin/develop' into Weblate. 2019-07-11 08:38:22 +00:00
J. Ryan Stinnett
9b3848d083
Merge pull request #3200 from matrix-org/jryans/stylelint-all-files 
Run stylelint on all SCSS files
 2019-07-11 09:38:18 +01:00
Weblate
fc6793fdf8 Merge branch 'origin/develop' into Weblate. 2019-07-11 08:10:07 +00:00
Kévin C
54b5e85dfa Translated using Weblate (French) 
Currently translated at 100.0% (1687 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-11 08:10:07 +00:00
Bruno Windels
dd12824a52
Merge pull request #3195 from matrix-org/bwindels/include-orig-in-history 
Show original event in edit history
 2019-07-11 08:10:01 +00:00
Weblate
84e4d59a52 Merge branch 'origin/develop' into Weblate. 2019-07-10 18:10:13 +00:00
Travis Ralston
2a54fe321f Use the state variable for the password when deactivating 
The Field is controlled, so we should be using the state. Otherwise the value is undefined, which means we don't supply the required auth.

Fixes https://github.com/vector-im/riot-web/issues/10302
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3071
 2019-07-10 11:26:09 -06:00
J. Ryan Stinnett
38d6953bf6 Manually fix remaining stylelint issues 2019-07-10 16:56:40 +01:00
Weblate
1dd2f4db3d Merge branch 'origin/develop' into Weblate. 2019-07-10 14:15:08 +00:00
Travis Ralston
ce11eff1b8 Simplify parameter check 2019-07-10 08:01:32 -06:00
Kévin C
7ea8b6d560 Translated using Weblate (French) 
Currently translated at 100.0% (1686 of 1686 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-10 13:52:21 +00:00
Nathan Follens
33a01a4f0b Translated using Weblate (Dutch) 
Currently translated at 100.0% (1686 of 1686 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-07-10 13:52:21 +00:00
Jeff Huang
bad1a48112 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1686 of 1686 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-10 13:52:20 +00:00