OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
11,468 Commits
219 Branches
563 Tags
450 MiB
Commit Graph

11468 Commits (c5c43173523c67609809ce634f3ba368a7ee3cbd)

Author SHA1 Message Date
Jeff Huang fc18c301a1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-07-22 13:01:26 +00:00
Michael Telatynski 93abb4b74b
workaround to prevent Slate getting too empty when undoing RT pastes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-20 15:06:27 +01:00
Weblate da8f77e621 Merge remote-tracking branch 'origin/develop' into develop 2018-07-20 14:01:32 +00:00
David Baker fc29e89f63
Merge pull request #2062 from matrix-org/dbkr/use_configured_integ_url 
Jitsi: Use integrations URL from config
 2018-07-20 15:01:28 +01:00
Weblate 972d59c77b Merge remote-tracking branch 'origin/develop' into develop 2018-07-20 13:45:29 +00:00
Bruno Windels a8a40f1514
Merge pull request #2075 from matrix-org/dbkr/allow_jitsi_in_e2e_rooms 
Allow jitsi in e2e rooms
 2018-07-20 14:45:24 +01:00
David Baker bd3dd9aafc Allow jitsi in e2e rooms 
We have a separate warning about how widgets are not very e2e, so
this should be sufficient warning.
 2018-07-20 14:30:38 +01:00
Weblate ad6397a7f4 Merge remote-tracking branch 'origin/develop' into develop 2018-07-20 11:23:07 +00:00
Bruno Windels 6f278ceab0
Merge pull request #2071 from matrix-org/dbkr/persistedelement_border 
Fix border around persisted widgets
 2018-07-20 12:23:02 +01:00
Weblate 503caafc87 Merge remote-tracking branch 'origin/develop' into develop 2018-07-20 11:20:24 +00:00
Bruno Windels 95eafd7489
Merge pull request #2073 from matrix-org/dbkr/kill_more_random_z_indexes 
Fix e2e icons floating above jitsi
 2018-07-20 12:20:18 +01:00
Peter Vágner 19f4d4e15b Translated using Weblate (Slovak) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-07-20 08:02:47 +00:00
Szimszon 25a3d49f67 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-07-19 13:38:39 +00:00
Weblate d35ef7e7eb Merge remote-tracking branch 'origin/develop' into develop 2018-07-19 12:51:09 +00:00
David Baker 3c895e5a0d
Merge pull request #2074 from matrix-org/t3chguy/hide_ddg_me_after_space 
hide some commands after space as they have special semantics
 2018-07-19 13:51:05 +01:00
Weblate 173806e657 Merge remote-tracking branch 'origin/develop' into develop 2018-07-19 12:49:49 +00:00
David Baker f9af96d422
Merge pull request #2070 from matrix-org/t3chguy/slate_cont2 
Even More Slate Fixes :D
 2018-07-19 13:49:42 +01:00
Kévin C 0d1fd1b892 Translated using Weblate (French) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-19 11:23:39 +00:00
Weblate f700c8e60d Merge remote-tracking branch 'origin/develop' into develop 2018-07-19 11:00:43 +00:00
Andrey eb0a1d9b92 Translated using Weblate (Russian) 
Currently translated at 99.4% (1208 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-07-19 11:00:42 +00:00
Marc Yustin 0ddf84c45e Translated using Weblate (Italian) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-07-19 11:00:42 +00:00
Szimszon 50c6b91c8f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-07-19 11:00:42 +00:00
Kévin C 7612910507 Translated using Weblate (French) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-19 11:00:42 +00:00
Hugues De Keyzer 89bc4776e9 Translated using Weblate (Esperanto) 
Currently translated at 91.0% (1106 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-07-19 11:00:42 +00:00
Slavi Pantaleev 1a61f15a97 Translated using Weblate (Bulgarian) 
Currently translated at 99.3% (1207 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-07-19 11:00:41 +00:00
Bruno Windels 10e4a4f288
Merge pull request #2035 from matrix-org/dbkr/widget_echo 
Improve UX for Jitsi by adding local echo for widgets
 2018-07-19 12:00:36 +01:00
Marc Yustin df025ca935 Translated using Weblate (Italian) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-07-18 18:40:28 +00:00
Michael Telatynski 855f8871b8
replace heuristic for the time being as it failed with inlines like pills. Fixes vector-im/riot-web#7059 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 16:50:07 +01:00
Michael Telatynski 5867fe73dd
hide some commands after space as they have special semantics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 15:38:21 +01:00
David Baker f658753610 Fix e2e icons floating above jitsi 
Remove another seemingly redundant z-index

Fixes https://github.com/vector-im/riot-web/issues/7056
 2018-07-18 14:14:38 +01:00
Jeff Huang cbb61e3b2b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-07-18 12:52:22 +00:00
David Baker 22bde9fd50 Read jitsi widget URL from config 2018-07-18 12:05:32 +01:00
David Baker f868cd6699 Fix border around persisted widgets 
The PersistedElement had zero height so the border ended up in the
wrong place. Add a wrapper to fix the height back.

Fixes https://github.com/vector-im/riot-web/issues/7030
Fixes https://github.com/vector-im/riot-web/issues/7029
 2018-07-18 11:52:57 +01:00
Michael Telatynski 88dddb628d
in MD mode forgo any Magic Rich Pasting conversion as its confusing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 11:50:13 +01:00
Michael Telatynski 6bb88c0548
attempt to fix clash of Cmd-M on Mac. Should fix vector-im/riot-web#7047 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 11:28:48 +01:00
Michael Telatynski 3e956514b3
also prevent merge/skip on rich text pastes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 11:00:45 +01:00
Michael Telatynski 1a9de3fabe
fix undo on pasting plaintext content 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:58:27 +01:00
Michael Telatynski f5856270cc
undo removal of stripping <p>s as it breaks HTML `/me`s 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:48:54 +01:00
David Baker 68c46a694e lint 2018-07-18 10:18:55 +01:00
Michael Telatynski 19e5dc5799
do less rewriting for composer quote to prevent breaking pills 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:10:42 +01:00
Michael Telatynski 8bb08b1b75
fix focus on new editorState as it didn't have focus so broke when alt tab 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-18 10:10:11 +01:00
David Baker 7aab6fa6f1 Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo 2018-07-18 09:35:57 +01:00
Kévin C c4caaecfb3 Translated using Weblate (French) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-07-18 07:03:06 +00:00
Miguel Branco 0118027354 Translated using Weblate (Galician) 
Currently translated at 100.0% (1215 of 1215 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-07-17 18:59:16 +00:00
Weblate dff3425a00 Merge remote-tracking branch 'origin/develop' into develop 2018-07-17 16:46:57 +00:00
Bruno Windels 0a432dfb8f
Merge pull request #2063 from matrix-org/dbkr/jitsi_check_scalar_first 
Jitsi: Check integrations server before call
 2018-07-17 17:46:53 +01:00
Weblate bfe8b0c8e4 Merge remote-tracking branch 'origin/develop' into develop 2018-07-17 16:42:44 +00:00
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