4784d5e9f2
Also say "Connect ..." on remaining key backup buttons
...
This updates the remaining buttons shown when a backup exists but is not trusted
so that they all now say "Connect this device to Key Backup" instead of "Use Key
Backup".
This is a follow up to https://github.com/matrix-org/matrix-react-sdk/pull/2917
and was agreed with Riot iOS team
https://github.com/vector-im/riot-ios/pull/2375#issuecomment-485788118 .
Fixes https://github.com/vector-im/riot-web/issues/9542
2019-04-24 11:05:27 +01:00
2ddaa06e67
Rebuild strings
2019-04-24 11:01:32 +01:00
9917bed942
Merge pull request #2883 from YaoiFangirl420/cleanup_message_composer
...
Cleanup message composer render() method
2019-04-18 10:14:01 +01:00
0fbe10a816
Merge pull request #2925 from matrix-org/bwindels/stylepreviewbar
...
Redesigned room preview bar
2019-04-18 08:50:56 +00:00
dd911d18cb
dont show right panel when previewing a room without invite, as its empty
2019-04-17 19:29:39 +02:00
0a463472b3
update prop types (and fix typo)
2019-04-17 19:05:52 +02:00
190143ca6c
dispatch for user screen
2019-04-17 18:26:07 +02:00
d5cc835a93
PR feedback
2019-04-17 18:23:49 +02:00
9f494fcc58
Merge pull request #2907 from matrix-org/anoa/no_big_pills_pls
...
Prevent user pills containing only emoji from embiggening
2019-04-17 10:15:16 -06:00
232fd8656b
Merge pull request #2923 from rosston/alt-enter-mac
...
Make alt-enter insert new line on macOS
2019-04-17 16:19:57 +01:00
65784afb91
Merge pull request #2924 from jryans/password-on-server-name
...
Test `defaultServerName` before showing it on forgot password
2019-04-17 15:23:03 +01:00
66e10e904d
remove obsolete translations
2019-04-17 11:46:20 +02:00
8e750e18d7
add class for message case for e2e tests
2019-04-17 11:46:04 +02:00
22874f62ab
Merge branch 'develop' into bwindels/stylepreviewbar
2019-04-17 11:06:21 +02:00
1100320351
make non-member inviter name also bold
2019-04-17 11:02:58 +02:00
86620839ae
make username clickable
2019-04-17 10:57:45 +02:00
adc23faf4b
Test `defaultServerName` before showing it on forgot password
...
The Forgot Password screen wasn't checking the default server name for a value
before showing it, leading to a possible "Your Matrix account on <blank>"
message.
Fixes https://github.com/vector-im/riot-web/issues/9507
2019-04-17 09:35:45 +01:00
8a371080d7
colored inviter name and layout
2019-04-17 10:22:35 +02:00
eeaa7143ac
move name coloring out of sender profile
...
so we can reuse it in room preview bar
2019-04-17 10:21:30 +02:00
e0c976e96e
Merge branch 'develop' into cleanup_message_composer
2019-04-16 11:18:52 -06:00
56ade1ead5
WIP on showing inviter avatar
2019-04-16 18:48:47 +02:00
f9a2b76966
show room name where available when header isn't visible (no preview)
2019-04-16 17:50:20 +02:00
eeb9b4b2e3
don't show re-join upon kicked when we know you can't
2019-04-16 17:23:45 +02:00
dbb73439e4
also return Joining when internally busy looking something up
2019-04-16 17:23:24 +02:00
523311b50c
saner order for message case detection (can't be joining when kicked)
2019-04-16 17:23:01 +02:00
15e68c3ba1
Make alt-enter insert new line on macOS
...
Alt-enter is a common macOS shortcut for inserting a new line in an
input that has a separate action tied to the enter key.
Signed-off-by: Ross Brandes <ross.brandes@gmail.com>
2019-04-15 21:15:38 -04:00
a11cf88e07
Add a function to append/overwrite objects in the config on the fly
...
Intended to be used to overwrite settings which may be calculated rather than provided.
2019-04-15 14:46:00 -06:00
f6154bc7cd
Merge pull request #2921 from eyetime-international-ltd/hotfix/fix_static_title
...
use SdkConfig brand name instead of static "Riot"
2019-04-15 11:46:15 -06:00
26928a48e3
Merge pull request #2898 from matrix-org/travis/upgrades/permalinks
...
Use dedicated permalink creators in search results with multiple rooms
2019-04-15 11:27:58 -06:00
36951dd7b7
cleanup spinner props and use always preview bar when room operation is in progress
2019-04-15 18:49:00 +02:00
7459e19f06
fix lint
2019-04-15 17:56:36 +02:00
fd6c594a8f
put auth buttons in preview bar
2019-04-15 17:52:17 +02:00
1d0c402093
improve error messages, etc
2019-04-15 17:11:17 +02:00
2054d53782
Tweaked wording after discussing with @lampholder
2019-04-15 15:10:48 +01:00
bded275f6a
Clarify messaging when key backup exists but is unused
...
This makes the key backup panel much more explicit about the case where an
existing backup does exist, but this device just isn't using it. You can join
the device to the backup and restore from it by going through the restore
workflow.
Fixes https://github.com/vector-im/riot-web/issues/9446
2019-04-15 15:10:48 +01:00
9a59b0d390
Clarify that use backup means restore
...
"Use key backup" feels like it's telling me I haven't set it up at all. This
changes to "Restore ..." which seems more reassuring.
Fixes https://github.com/vector-im/riot-web/issues/9438
2019-04-15 15:10:48 +01:00
6bc659c93b
layout for error codes
2019-04-15 15:25:34 +02:00
1b2fba3fe2
move p tags for subtitles out of switch
2019-04-15 15:22:08 +02:00
942669ae65
look at join rules to see if join button should still be shown in some error cases
2019-04-15 15:16:50 +02:00
b09c7f97e9
implement most of new messages
2019-04-15 14:44:00 +02:00
c0cf6a35c6
Merge pull request #2919 from jryans/key-backup-this-device
...
Fix key backup status when missing device
2019-04-15 12:44:08 +01:00
e256dd6b05
use SdkConfig brand name instead of static "Riot"
...
Signed-off-by: Thomas Karner <thomas.karner@bytepoets.com>
2019-04-15 09:13:18 +02:00
9478ccc683
Add missing newline
2019-04-14 20:46:32 -06:00
f7462371b1
Rename: Avatar -> ComposerAvatar
...
To avoid confusion with other components that also might be named Avatar
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
3dae9f3d58
Move FormattingButton to separate component
...
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
817f1d482f
Move format bar rendering to separate method
...
To reduce the complexity in render(), move the format bar rendering to a
separate method
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
419cb4e8b2
Define Stickerpicker inline
...
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
485ad6a3f0
Make UploadButton a separate component
...
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
452f0e6dcc
Generate placeholder text in separate method
...
To make the MessageComposer render() method a bit less busy
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
cfb9172121
Tighten up code around call buttons
...
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
6aa9f068b3
Tighten controls code in MessageComposer
...
Make the user avatar a separate function component, make the logic for
laying out components a little more concise
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
d08fbb4872
Make call buttons into separate components
...
Make the call/voice-call/hangup buttons separate react components
to reduce the amount of complexity on MessageComposer.
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
2019-04-13 01:45:15 -07:00
0479901daa
Load data for permalink creators once
2019-04-12 10:38:39 -06:00
e8d141fc3c
Merge pull request #2908 from matrix-org/travis/upgrades/linkback
...
Add a link in room settings to get at the tombstoned room if it exists
2019-04-12 10:21:39 -06:00
58ff5dc846
Merge pull request #2915 from matrix-org/travis/guests/block-ui
...
Add a generic error page element for startup errors
2019-04-12 10:21:20 -06:00
fa5c9f5683
Merge pull request #2916 from matrix-org/travis/guests/better-errors
...
Add strings for js-sdk autodiscovery errors
2019-04-12 10:20:56 -06:00
c8bd2e7aa5
Merge pull request #2914 from matrix-org/anoa/image_to_composer
...
Focus the composer view on file upload
2019-04-12 10:20:38 -06:00
5ee9de04c3
Fix key backup status when missing device
...
We might not have the device in `sig.device`, so we have to check for it's
existence first. This fixes the "Unable to load key backup status" message that
is incorrectly triggering.
Fixes https://github.com/vector-im/riot-web/issues/9442
2019-04-12 16:23:54 +01:00
b67152d98e
WIP
2019-04-12 14:40:31 +02:00
01e9de9a3a
differentiate style based on preview or not
2019-04-12 12:54:13 +02:00
16ed06cebb
dont show room header and timeline when room cant be peeked (just preview bar)
2019-04-12 12:47:52 +02:00
d431e37d9b
Move and lint
2019-04-12 10:37:14 +01:00
ed7e79af8f
Merge pull request #2912 from matrix-org/bwindels/propwarn
...
adjust prop in HeaderButton
2019-04-12 09:02:50 +00:00
9d55d0c897
Add strings for js-sdk autodiscovery errors
...
For https://github.com/matrix-org/matrix-js-sdk/pull/894
2019-04-11 15:54:37 -06:00
aadc1a8d75
Add a generic error page element for startup errors
...
Used by Riot to communicate configuration problems.
2019-04-11 15:52:37 -06:00
cecd2cbd71
Focus the composer view on file upload
2019-04-11 18:42:32 +01:00
934ca6908f
Remove breadcrumb scroll tolerances and use sensible defaults
...
Fixes https://github.com/vector-im/riot-web/issues/9394
Fixes https://github.com/vector-im/riot-web/issues/9400
Numbers chosen based on user feedback. The setting has also been removed because it isn't really needed anymore.
2019-04-11 11:07:31 -06:00
ccf292f053
Load permalink creators to get proper state of the room
2019-04-11 10:59:00 -06:00
ec01f6ffb1
Change wording for old room link
2019-04-11 10:40:25 -06:00
fee30d4482
adjust prop in HeaderButton
2019-04-11 18:32:38 +02:00
86a6037a12
Merge pull request #2906 from matrix-org/bwindels/toggleheaderbutton
...
Fix having to click the member list button twice to show it after having changed room.
2019-04-11 12:43:39 +00:00
483b7fc14d
take buttons into account that are active over multiple phases when toggling
2019-04-11 13:31:21 +02:00
02792132e1
dont create functions in render
2019-04-11 13:22:47 +02:00
0553a6f1d6
some style changes
2019-04-11 13:07:54 +02:00
b3946c7766
Add period to the end of upgrade notice
2019-04-11 10:55:53 +01:00
8398e5dd71
Appease CI
2019-04-11 00:42:27 +01:00
be02f67eef
Switch logic
2019-04-11 00:09:38 +01:00
52facdc0c3
Don't act on undefined attributes
2019-04-11 00:05:04 +01:00
6a41975826
Specific check for user pills
2019-04-10 23:34:09 +01:00
64423e1f7d
let -> const
2019-04-10 15:34:06 -06:00
15e8ce7a7f
Add a link in room settings to get at the tombstoned room if it exists
...
Fixes https://github.com/vector-im/riot-web/issues/8542
2019-04-10 15:00:02 -06:00
b8ffd0fca2
Merge pull request #2889 from matrix-org/anoa/one_space
...
Remove duplicate space in credits
2019-04-10 12:13:39 -06:00
a77c3d4d9b
Prevent user pills containing only emoji from embiggening
2019-04-10 18:00:04 +01:00
4e8b3c34c0
move room preview bar below timeline
2019-04-10 17:49:45 +02:00
49e96dc404
remove unused dispatcher import
2019-04-10 13:31:27 +02:00
6ca1a879c9
remove hacks, now that emitting show_right_panel is centralized
2019-04-10 13:22:31 +02:00
fe63b6b5bd
setPhase can now open the panel, don't open it if closed on view_room
2019-04-10 13:21:42 +02:00
2b4b6feba2
call togglePhase from header buttons
2019-04-10 13:21:07 +02:00
5fb9276ef3
add togglePhase method, where we can show the panel if needed
...
without needing to resort to redispatching the original action
2019-04-10 13:20:03 +02:00
d755263e33
Handle M_UNSUPPORTED_ROOM_VERSION in invites and room creation
...
Fixes https://github.com/vector-im/riot-web/issues/8925
2019-04-09 19:03:38 -06:00
687b43f7b4
Merge pull request #2903 from jryans/rm-bottom-left-menu
...
Remove BottomLeftMenu and supporting bits
2019-04-09 19:09:07 +01:00
e4a9d4f5c8
Cache permalink creators out of the component's state
2019-04-09 12:01:09 -06:00
12f7d1715b
Remove BottomLeftMenu and supporting bits
...
The `BottomLeftMenu` component is not used in the new design. This removes the
component and also any images and sub-components that were only used by it.
2019-04-09 17:38:32 +01:00
0592a1711a
Merge pull request #2439 from matrix-org/matthew/retina
...
Fix for retina thumbnails being massive
2019-04-09 16:14:25 +00:00
daaedb8291
Merge pull request #2894 from matrix-org/travis/breadcrumbs/ratelimit
...
Send breadcrumb updates only when they change
2019-04-09 09:58:04 -06:00
44e33ba5f1
Merge pull request #2892 from matrix-org/travis/breadcrumbs/scrolling
...
Add some tolerances to breadcrumb scrolling
2019-04-09 09:41:07 -06:00
43362bfb98
Explain why the breadcrumbs don't need persisting elsewhere
2019-04-09 09:40:49 -06:00
a23900c29d
Merge pull request #2902 from jryans/auth-validation
...
Fix validation to avoid `undefined` class on fields
2019-04-09 16:25:24 +01:00
f2da833ac9
Fix validation to avoid `undefined` class on fields
...
The class name handling for validation inadvertently added `undefined` as a
class when validation is not used. This rearranges the logic to avoid the issue.
Fixes https://github.com/vector-im/riot-web/issues/9345
2019-04-09 16:10:36 +01:00
12a9416741
Merge pull request #2895 from matrix-org/travis/return-client
...
Always return a client from onRegistered
2019-04-09 09:06:33 -06:00
J. Ryan Stinnett