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

18170 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
4aa11cdac8 Merge branch 'origin/develop' into Weblate. 2019-09-23 13:56:50 +00:00
송태섭
4cc6fe0f19 Translated using Weblate (Korean) 
Currently translated at 100.0% (1812 of 1812 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-23 13:56:50 +00:00
Bruno Windels
f4fd6d699b
Merge pull request #3469 from matrix-org/bwindels/cider-deserialize-fixes 
Fix: paragraphs not being preserved when editing in CIDER
 2019-09-23 13:56:44 +00:00
Bruno Windels
7f4e070807 fix deserialize unit tests 2019-09-23 15:34:01 +02:00
Bruno Windels
04720db2a3 don't append extra newline after blockquote anymore 
now that P prepends newline when not first element
 2019-09-23 15:33:30 +02:00
Bruno Windels
2445421270 add extra newline before P tags (when not first node) 2019-09-23 15:06:22 +02:00
Bruno Windels
0a663398ed Use underscore for <em> when doing html > md 
to be consistent with the format bar, which also uses underscores for italics
 2019-09-23 14:59:53 +02:00
Weblate
36cde97ac4 Merge branch 'origin/develop' into Weblate. 2019-09-23 12:31:27 +00:00
Bruno Windels
fc26850d9e
Merge pull request #3467 from matrix-org/bwindels/cider-formatbar-zindex 
Fix: formatbar appearing below other elements
 2019-09-23 12:31:22 +00:00
Weblate
30c0d7e7fc Merge branch 'origin/develop' into Weblate. 2019-09-23 12:22:24 +00:00
J. Ryan Stinnett
2c7c1ed2a3
Merge pull request #3466 from matrix-org/jryans/msisdn-submit-url 
Use alternate MSISDN submit URL when returned by HS
 2019-09-23 13:22:20 +01:00
Bruno Windels
0ab7962ebd add z-index to format bar so it appears above status area and reply wrapper 2019-09-23 14:06:59 +02:00
Weblate
0ddb1ab7db Merge branch 'origin/develop' into Weblate. 2019-09-23 11:52:00 +00:00
송태섭
1925e6b152 Translated using Weblate (Korean) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-23 11:51:59 +00:00
shuji narazaki
eaf00955c3 Translated using Weblate (Japanese) 
Currently translated at 58.8% (1059 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2019-09-23 11:51:59 +00:00
Szimszon
1bbb68ce7f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-09-23 11:51:59 +00:00
Tirifto
7189ab812c Translated using Weblate (Esperanto) 
Currently translated at 93.7% (1687 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-09-23 11:51:59 +00:00
Bruno Windels
133e68191a
Merge pull request #3464 from matrix-org/bwindels/createroomdialog-makeover-rebased 
FTUE: Create Room Dialog update
 2019-09-23 11:51:53 +00:00
J. Ryan Stinnett
0ab9efc594 Delay IS access tokens 2019-09-23 12:28:41 +01:00
J. Ryan Stinnett
e98b753c21 Use alternate MSISDN submit URL when returned by HS 
This changes MSISDN token submission to send to an arbitrary URL (instead of the
current IS) when the HS provides such a URL.

Fixes https://github.com/vector-im/riot-web/issues/10923
 2019-09-23 12:21:25 +01:00
Bruno Windels
3c7a0f4c49 remove invalid css 2019-09-23 11:22:30 +02:00
Bruno Windels
53b28b9de8 i18n 2019-09-23 11:22:30 +02:00
Bruno Windels
6a3723c69e dialog styling 2019-09-23 11:22:30 +02:00
Bruno Windels
3e0278d41a add validation when clicking Ok in dialog 2019-09-23 11:22:30 +02:00
Bruno Windels
6ae4b3e966 add room alias field to dialog 2019-09-23 11:22:30 +02:00
Bruno Windels
8a1c1bbec4 implement RoomAliasField component 
adding a postfix to Field to show the domain name
 2019-09-23 11:22:30 +02:00
Bruno Windels
c5f9ef87ba fixup: detailsOpen state var 2019-09-23 11:22:30 +02:00
Bruno Windels
761233c473 add public switch 2019-09-23 11:22:30 +02:00
Bruno Windels
4a7ae3ca8e add optional topic field 2019-09-23 11:22:30 +02:00
Bruno Windels
157a3388a5 change name to Field, no_federate to switch 
also construct room create options in dialog,
instead of MatrixChat, as we'll have more to come
 2019-09-23 11:22:30 +02:00
Tuomas Hietala
fae47fd3a6 Translated using Weblate (Finnish) 
Currently translated at 98.0% (1765 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-09-22 03:51:08 +00:00
Nathan Follens
00ad663112 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-09-22 03:51:06 +00:00
Jeff Huang
889b4bebff Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-09-22 03:51:03 +00:00
Weblate
c0ba5199b9 Merge branch 'origin/develop' into Weblate. 2019-09-20 13:37:10 +00:00
송태섭
4904cea196 Translated using Weblate (Korean) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2019-09-20 13:37:09 +00:00
Kévin C
ae30eafa9c Translated using Weblate (French) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-09-20 13:37:09 +00:00
Slavi Pantaleev
a351245032 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1801 of 1801 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2019-09-20 13:37:09 +00:00
J. Ryan Stinnett
351a3ebd67
Merge pull request #3462 from matrix-org/jryans/msc2290 
Use separate 3PID add and bind flow for supporting HSes
 2019-09-20 14:37:03 +01:00
J. Ryan Stinnett
f9a09d271b Use separate MSISDN add and bind flow for supporting HSes 
This changes the paths used for binding MSISDNs for discovery to use the new
separate bind / unbind APIs on supporting servers.

Fixes https://github.com/vector-im/riot-web/issues/10839
 2019-09-20 12:45:22 +01:00
J. Ryan Stinnett
ff69ad02b9 Use separate email add and bind flow for supporting HSes 
This changes the paths used for binding emails for discovery to use the new
separate bind / unbind APIs on supporting servers.

Part of https://github.com/vector-im/riot-web/issues/10839
 2019-09-20 12:19:43 +01:00
Weblate
076df930e3 Merge branch 'origin/develop' into Weblate. 2019-09-19 15:01:39 +00:00
Michael Telatynski
46e0a7cafa
Merge pull request #3460 from matrix-org/t3chguy/room_avatar 
Add roomavatar slash command to set avatar of the current room
 2019-09-19 16:01:35 +01:00
Weblate
6fa6e0abaf Merge branch 'origin/develop' into Weblate. 2019-09-19 14:59:54 +00:00
Michael Telatynski
54643d28d4
Merge pull request #3458 from matrix-org/t3chguy/register_disable_no_custom_url_spinner 
Don't show spinner if registration is disabled
 2019-09-19 15:59:49 +01:00
J. Ryan Stinnett
9a1305bf4a Extract separate add / bind methods on AddThreepid 2019-09-19 15:53:50 +01:00
Michael Telatynski
d5c96b86d4 fix test 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-19 10:31:34 +01:00
Michael Telatynski
d1fb31a6dc Merge branches 'develop' and 't3chguy/register_disable_no_custom_url_spinner' of github.com:matrix-org/matrix-react-sdk into t3chguy/register_disable_no_custom_url_spinner 2019-09-19 10:07:42 +01:00
Michael Telatynski
f8b1b36051 Fix copy-paste issue 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-19 09:48:35 +01:00
Michael Telatynski
4983378230 Merge branches 'develop' and 't3chguy/room_avatar' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_avatar 2019-09-19 09:44:56 +01:00
Weblate
8769cfb88e Merge branch 'origin/develop' into Weblate. 2019-09-19 08:27:17 +00:00