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

11154 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
48fbf1406f
Merge pull request #2068 from matrix-org/t3chguy/slate_cont2 
fix 2nd typo in one PR :(
 2018-07-16 21:36:57 +01:00
Michael Telatynski
1c24f1fd5a
fix 2nd typo in one PR :( 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:34:25 +01:00
Weblate
5c9125ffde Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 20:32:09 +00:00
Matthew Hodgson
8c17ee7281
Merge pull request #2067 from matrix-org/t3chguy/slate_cont2 
check if has some completions, not if >=0
 2018-07-16 21:32:04 +01:00
Michael Telatynski
547e0ed52c
check if has some completions, not if >=0 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:30:04 +01:00
Weblate
6ae7c577cd Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 20:29:26 +00:00
Hugues De Keyzer
f655e2eb86 Translated using Weblate (French) 
Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-16 20:29:25 +00:00
Matthew Hodgson
a5b932bfdd
Merge pull request #2066 from matrix-org/t3chguy/slate_cont2 
Slate fixes
 2018-07-16 21:29:20 +01:00
Michael Telatynski
3000099991
add additional checks for hiding autocomplete to prevent text calculation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 21:27:52 +01:00
Michael Telatynski
bdbc2cbd38
disable spellCheck when the placeholder is shown because "unencrypted" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 18:32:50 +01:00
Michael Telatynski
c7859fed1a
add heuristic to compare documents to prevent autocomplete flicker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 18:27:06 +01:00
Weblate
ddf576ac59 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 16:26:42 +00:00
David Baker
149a935594
Merge pull request #2056 from matrix-org/dbkr/tiny_jitsi_follows_you_between_rooms 
Implement always-on-screen capability for widgets
 2018-07-16 17:26:37 +01:00
David Baker
a79caed0c9 Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms 2018-07-16 17:21:51 +01:00
Weblate
60bf368887 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 16:20:54 +00:00
Andrey
3daff00704 Translated using Weblate (Russian) 
Currently translated at 99.4% (1205 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-07-16 16:20:53 +00:00
Kévin C
a449b8420d Translated using Weblate (French) 
Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-16 16:20:53 +00:00
David Baker
379d65bd6c
Merge pull request #2064 from matrix-org/t3chguy/slate_cont2 
simplify MessageComposerStore and improve its performance
 2018-07-16 17:20:48 +01:00
David Baker
74ad795d4a Fix read receipts on top of Jitsi 
By removing z-index which, as far as I can see, does nothing.

Fixes https://github.com/vector-im/riot-web/issues/7021
 2018-07-16 17:10:58 +01:00
Michael Telatynski
f78e3be1eb
Merge branch 't3chguy/slate_cont2' of github.com:matrix-org/matrix-react-sdk into t3chguy/slate_cont2 2018-07-16 16:56:57 +01:00
Michael Telatynski
2f1779751b
make the MessageComposerStore stateless for better performance 
and inter-tab composition (by simplifying it. WIN-WIN)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 16:56:08 +01:00
David Baker
850a4d8ec5 Jitsi: Check integrations server before call 2018-07-16 16:54:25 +01:00
David Baker
e95a8e82bc Jitsi: Use integrations URL from config 2018-07-16 16:35:45 +01:00
David Baker
983dc3ad2e lint 2018-07-16 16:19:18 +01:00
David Baker
19f0617052 Jitsi: Error message on no permission 
Fixes https://github.com/vector-im/riot-web/issues/7007
 2018-07-16 15:41:03 +01:00
Kévin C
8fa2fa19aa Translated using Weblate (French) 
Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-16 13:43:18 +00:00
Weblate
f1cac4e268 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 13:16:33 +00:00
David Baker
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate 
Replace Draft with Slate
 2018-07-16 14:16:25 +01:00
Weblate
f76d9a7a97 Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 12:33:19 +00:00
Markel
33b6d0ab5f Translated using Weblate (Spanish) 
Currently translated at 61.2% (742 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-07-16 12:33:18 +00:00
Kyf Lee
a17483971a Translated using Weblate (Korean) 
Currently translated at 80.5% (976 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2018-07-16 12:33:18 +00:00
Hugues De Keyzer
88d688e56f Translated using Weblate (French) 
Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-16 12:33:18 +00:00
Hugues De Keyzer
c857bf400c Translated using Weblate (Esperanto) 
Currently translated at 91.1% (1105 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-07-16 12:33:17 +00:00
David Baker
415eef5aec
Merge pull request #2055 from matrix-org/bwindels/stop-peeking-fix 
Fix not stopping to peek when navigating away from peeked room
 2018-07-16 13:33:13 +01:00
David Baker
eb497d442b
Merge pull request #2049 from matrix-org/t3chguy/slate_cont2 
T3chguy/slate cont2
 2018-07-16 13:25:27 +01:00
David Baker
4c6419a3c5 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-16 13:24:13 +01:00
David Baker
0f32c3a018 PR feedback 2018-07-16 13:18:10 +01:00
Matthew Hodgson
d7ff7cd4ed stupid thinkotypo 2018-07-16 12:00:15 +01:00
David Baker
ff96537048 lint 2018-07-16 11:49:53 +01:00
Michael Telatynski
ffe0b35504
while logging out ignore Session.logged_out as it is intentional 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-15 22:33:00 +01:00
Michael Telatynski
59a14f2c0b
re-hydrate Values which have been serialized into LocalStorage 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-15 20:34:27 +01:00
Weblate
e42f8c0c77 Merge remote-tracking branch 'origin/develop' into develop 2018-07-13 13:47:50 +00:00
Slavi Pantaleev
b450d5be65 Translated using Weblate (Bulgarian) 
Currently translated at 99.9% (1211 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-07-13 13:47:49 +00:00
Matthew Hodgson
ac1f130f1e
Merge pull request #2057 from matrix-org/t3chguy/null-guard-stickerpicker 
add null-guard for stickerpickerWidget in StickerPicker
 2018-07-13 14:47:45 +01:00
Michael Telatynski
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker 2018-07-13 14:24:29 +01:00
Weblate
f76ddbc718 Merge remote-tracking branch 'origin/develop' into develop 2018-07-13 10:14:43 +00:00
Andrey
903bac3f45 Translated using Weblate (Russian) 
Currently translated at 99.7% (1209 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-07-13 10:14:42 +00:00
Aziz Ibrahimov
a463b6d8bb Translated using Weblate (Azerbaijani) 
Currently translated at 33.0% (401 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2018-07-13 10:14:41 +00:00
Bruno Windels
7bbb967ddd
Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen 
Implement always-on-screen capability for widgets
 2018-07-13 11:14:37 +01:00
Bamstam
ac8d9a4f20 Translated using Weblate (German) 
Currently translated at 100.0% (1212 of 1212 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-07-13 09:25:47 +00:00