OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,852 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

17852 Commits (4c6d11d088b8f6b7e44f92def03df520f8af12de)

Author SHA1 Message Date
J. Ryan Stinnett df03477907 Show change warning only when different from current 2019-09-06 11:54:08 +01:00
J. Ryan Stinnett 19fff51b01 Rework handling for terms CORS error 
Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
 2019-09-06 11:12:10 +01:00
Weblate 31027ba864 Merge branch 'origin/develop' into Weblate. 2019-09-06 10:05:24 +00:00
Kévin C 4201515863 Translated using Weblate (French) 
Currently translated at 100.0% (1772 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-06 10:05:24 +00:00
Besnik Bleta 79d488b52a Translated using Weblate (Albanian) 
Currently translated at 99.8% (1768 of 1772 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-09-06 10:05:23 +00:00
Bruno Windels 4876f4c469
Merge pull request #3396 from matrix-org/bwindels/fix-formatbar-merge-error 
Fix error on load in composer
 2019-09-06 10:05:19 +00:00
Bruno Windels dd1c01068f fix rename that didn't make it through rebasing 2019-09-06 11:58:27 +02:00
J. Ryan Stinnett 2ff592c542 Use existing modal promises 2019-09-06 10:48:24 +01:00
Weblate 48f844fb92 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:28:22 +00:00
Bruno Windels 5014b606db
Merge pull request #3391 from matrix-org/bwindels/cider-format-history 
New composer: ensure undo history is persisted before applying formatting
 2019-09-06 09:28:18 +00:00
Weblate 5916b48f41 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:22:41 +00:00
Bruno Windels df4762871a
Merge pull request #3392 from matrix-org/bwindels/cider-paste-plain 
New composer: fix pasting from word processors
 2019-09-06 09:22:37 +00:00
Weblate 69d6ff26fa Merge branch 'origin/develop' into Weblate. 2019-09-06 09:22:14 +00:00
Bruno Windels 6b104f6344
Merge pull request #3393 from matrix-org/bwindels/cider-fix-lastcaret 
New composer: fix needing to push arrow-up twice after sending first message after switching to a room
 2019-09-06 09:22:10 +00:00
Bruno Windels 9dac91a70d ensure step before formatting is persisted in undo history 2019-09-06 11:20:24 +02:00
Weblate 79d120b9d2 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:12:46 +00:00
Bruno Windels 8820546f49
Merge pull request #3390 from matrix-org/bwindels/selection-color 
Remove accent color as selection color
 2019-09-06 09:12:42 +00:00
Bruno Windels 0252c7ae37 force pasting as plain text in new composer 2019-09-06 11:10:41 +02:00
Weblate 8cfe178913 Merge branch 'origin/develop' into Weblate. 2019-09-06 09:09:50 +00:00
Bruno Windels 556ccf45dc
Merge pull request #3389 from matrix-org/bwindels/cider-format-shortcuts 
New composer: formatting keyboard shortcuts
 2019-09-06 09:09:47 +00:00
Bruno Windels 2596281a7c update last caret from update callback instead of input event 
many editor updates are not caused by an input event, so
the last caret wasn't always up to date.

Updating the caret from the update callback ensures that every
time the editor contents is changed, the last caret is updated.
 2019-09-06 11:09:01 +02:00
Bruno Windels f4938f9d11 dont format empty ranges 2019-09-06 10:59:41 +02:00
Bruno Windels 06143ba7a1 show keyboard shortcuts in format button tooltip 2019-09-06 10:59:41 +02:00
Bruno Windels bdcea6f21e add shortcuts for formatting 2019-09-06 10:59:41 +02:00
Weblate db288f9c95 Merge branch 'origin/develop' into Weblate. 2019-09-06 08:52:05 +00:00
Bruno Windels de787c798c
Merge pull request #3387 from matrix-org/bwindels/cider-formatbar-tooltips 
New composer: format bar tooltips
 2019-09-06 08:52:00 +00:00
Bruno Windels 042822c90a copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:39:19 +02:00
Bruno Windels d6a493a2b1 fixup: language strings moved 2019-09-06 10:39:19 +02:00
Bruno Windels b4b9c7d072 Add tooltip for format buttons 2019-09-06 10:39:19 +02:00
Bruno Windels da29057fd8 move format bar to own component 2019-09-06 10:39:19 +02:00
Weblate f53af6ecdb Merge branch 'origin/develop' into Weblate. 2019-09-06 08:38:07 +00:00
송태섭 11b324e063 Translated using Weblate (Korean) 
Currently translated at 100.0% (1768 of 1768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-06 08:38:07 +00:00
random 5c3ac21fa9 Translated using Weblate (Italian) 
Currently translated at 100.0% (1768 of 1768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-09-06 08:38:07 +00:00
Kévin C 9c3d801c3c Translated using Weblate (French) 
Currently translated at 100.0% (1768 of 1768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-06 08:38:07 +00:00
Slavi Pantaleev 50acdf9a86 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1768 of 1768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-09-06 08:38:06 +00:00
Bruno Windels 02681d50b9
Merge pull request #3386 from matrix-org/bwindels/cider-formatbar 
New composer: show format bar on selection
 2019-09-06 08:38:01 +00:00
Bruno Windels 92c0c1a4e2 add comment about positioning the format bar 2019-09-06 10:29:18 +02:00
Bruno Windels d2949babcd copyright is solely assigned to matrix foundation now, copy paste error 2019-09-06 10:29:12 +02:00
J. Ryan Stinnett d5552e4a17 Add bound 3PID warning when changing IS as well 
This extends the bound 3PID warning from the disconnect button to also appear
when changing the IS as well. At the moment, the text is a bit terse, but will
be improved separately.

Fixes https://github.com/vector-im/riot-web/issues/10749
 2019-09-05 17:52:46 +01:00
Bruno Windels 124b7135cd make sure the update callback gets a caret when calling reset 2019-09-05 17:54:08 +02:00
Weblate decf23f1fc Merge branch 'origin/develop' into Weblate. 2019-09-05 14:02:19 +00:00
Szimszon 4a32be529a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1768 of 1768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-05 14:02:19 +00:00
J. Ryan Stinnett 46ee52a406
Merge pull request #3388 from matrix-org/jryans/bound-3pids-warning 
Add new agreed URLs to account data instead of overwriting
 2019-09-05 15:02:15 +01:00
Bruno Windels 39bbf9af24 remove accent color as selection color 2019-09-05 15:40:33 +02:00
Weblate 2374ab8d3a Merge branch 'origin/develop' into Weblate. 2019-09-05 13:17:01 +00:00
송태섭 fd98db635d Translated using Weblate (Korean) 
Currently translated at 100.0% (1766 of 1766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-05 13:17:01 +00:00
Szimszon 9f6cd5feaa Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1766 of 1766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-05 13:17:00 +00:00
jadiof e5e551103c Translated using Weblate (German) 
Currently translated at 87.5% (1545 of 1766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-09-05 13:17:00 +00:00
Kévin C 7dde3776f7 Translated using Weblate (French) 
Currently translated at 100.0% (1766 of 1766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-05 13:17:00 +00:00
Tuomas Hietala 09e9d44c96 Translated using Weblate (Finnish) 
Currently translated at 97.8% (1727 of 1766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-09-05 13:16:59 +00:00