mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 02:21:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
11019 commits 219 branches 562 tags 474 MiB
Commit graph

11019 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
583cde6397
Merge pull request #2061 from matrix-org/dbkr/jitsi_error_no_perm 
Jitsi: Error message on no permission
 2018-07-17 17:42:39 +01:00
Weblate
88e439e207 Merge remote-tracking branch 'origin/develop' into develop 2018-07-17 16:37:18 +00:00
Bruno Windels
349615c5c1
Merge pull request #2065 from matrix-org/dbkr/read_avatars_under_jitsi 
Fix read receipts on top of Jitsi
 2018-07-17 17:37:13 +01:00
Weblate
4be222c6aa Merge remote-tracking branch 'origin/develop' into develop 2018-07-17 16:15:11 +00:00
Matthew Hodgson
02c3bc9476
Merge pull request #2069 from matrix-org/t3chguy/slate_cont2 
Moar Slate Fixes
 2018-07-17 17:15:01 +01:00
Michael Telatynski
720a728278
workaround for placeholder being shown when empty text but block. Fixes vector-im/riot-web#7042 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 16:13:33 +01:00
Michael Telatynski
1b467f6ca8
fix pasting of plaintext content (prevent loads of <p>s) Fixes vector-im/riot-web#7043 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 16:02:37 +01:00
Michael Telatynski
414908611d
prevent exception if there is no text node at anchor 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 13:48:15 +01:00
Michael Telatynski
688776bc10
allow enter to remove current block if its empty useful for lists 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 13:29:40 +01:00
Michael Telatynski
8d4cead105
special-case 'inline-code' button because mark is called 'code' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 13:24:28 +01:00
Michael Telatynski
ff76b6a981
allow user to break out of blockquote/etc by hitting enter twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 12:30:22 +01:00
Michael Telatynski
5b79e3bcd5
fix user autocomplete not adding : if at the start 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 11:56:24 +01:00
Michael Telatynski
23b6abf8b7
no point saving history at this point, maybe future supported 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-17 09:27:11 +01:00
Szimszon
09a504ba0e Translated using Weblate (Hungarian) 
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/hu/
 2018-07-17 05:44:59 +00:00
Michael Telatynski
cbe5944ff0
preserve selection and history between room changes and refreshes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-16 22:04:42 +01:00
Weblate
c958e14c0e Merge remote-tracking branch 'origin/develop' into develop 2018-07-16 20:37:02 +00:00
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