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
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
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
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
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
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
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
Michael Telatynski
f356b8a3c9
Merge pull request #3457 from matrix-org/t3chguy/sso_device_name
...
Use same initial device name rules for SSO login as password login
2019-09-19 09:27:13 +01:00
Michael Telatynski
1a330374fe
Merge pull request #3459 from matrix-org/t3chguy/editing_enable_onPaste
...
Fix disabled save button on message editor when pasting
2019-09-19 09:26:50 +01:00
Michael Telatynski
2a3c8d350d
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 18:02:45 +01:00
Michael Telatynski
2632e648b4
Add roomavatar slash command to set avatar of the current room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 16:33:56 +01:00
Michael Telatynski
02dfdffc4f
Fix failing test due to newly added assumption
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 14:35:13 +01:00
Michael Telatynski
c286f2214f
Fix disabled save button on message editor when pasting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 14:09:38 +01:00
Michael Telatynski
6209d62f49
Don't show spinner if registration is disabled
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 13:19:33 +01:00
J. Ryan Stinnett
99b804d567
Change to separate add and bind to guard 3PID account section
...
This changes to checking for HS support of separate add and bind when guarding
the 3PID account section.
For older HSes, we in fact always require an IS for add with bind param, so the
previous version of this was incorrect.
Part of https://github.com/vector-im/riot-web/issues/10839
2019-09-18 13:02:52 +01:00
Michael Telatynski
020f15ca6f
Merge pull request #3456 from matrix-org/t3chguy/delint
...
Some delinting
2019-09-18 13:00:49 +01:00
Michael Telatynski
c633df3c15
Use same initial device name rules for SSO login as password login
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 12:16:41 +01:00
David Baker
58c333f9c1
Merge pull request #3455 from matrix-org/t3chguy/nvl/fix_phone_numbers
...
Fix failure to render newly verified phone number and nested forms
2019-09-18 09:57:19 +01:00
Michael Telatynski
e502558f7d
Delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 09:27:43 +01:00
Michael Telatynski
54ea85f235
regenerate .eslintignore.errorfiles
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 09:12:23 +01:00
Michael Telatynski
648527e650
Fix failure to render newly verified phone number and nested forms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 08:41:05 +01:00
Travis Ralston
d7a1116880
Merge pull request #3454 from matrix-org/travis/focus
...
Focus context menus so screen readers can find them
2019-09-17 16:00:47 -06:00
Travis Ralston
9f3f88ba00
Focus context menus so screen readers can find them
...
Fixes https://github.com/vector-im/riot-web/issues/10899
The `tabIndex` is required to make the thing actually focusable. This is the same trick employed in https://github.com/matrix-org/matrix-react-sdk/pull/2994
2019-09-17 15:41:39 -06:00
Travis Ralston
df2632d164
Merge pull request #3453 from matrix-org/travis/fix-tests1
...
Fix unit tests: Use correct ShallowRenderer and updated lolex
2019-09-17 14:47:45 -06:00
Travis Ralston
10b2501785
Upgrade lolex to pull in a clock fix
...
See https://github.com/sinonjs/lolex/issues/136
We don't use fake timers, but we do use lolex's clock, which probably causes the same thing. Jumping from 2.x to 4.x looks largely compatible - tests pass.
2019-09-17 14:37:59 -06:00
Travis Ralston
99b8193ce7
Use the new ShallowRenderer over ReactTestUtils
...
Mostly because the ReactTestUtils renderer doesn't exist anymore.
2019-09-17 14:33:32 -06:00