523311b50c
saner order for message case detection (can't be joining when kicked)
2019-04-16 17:23:01 +02:00
65020a56c1
Merge pull request #2922 from matrix-org/travis/merge-config
...
Add a function to append/overwrite objects in the config on the fly
2019-04-16 09:14:24 -06:00
e40757a801
make sure long subtitles dont overflow
2019-04-16 16:19:50 +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
c1ff5f2fba
implement style
2019-04-15 17:11:26 +02:00
1d0c402093
improve error messages, etc
2019-04-15 17:11:17 +02:00
1dc9e485ad
Merge pull request #2917 from jryans/key-backup-restore-button
...
Clarify that use backup means restore
2019-04-15 15:29:24 +01: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
32f28a7184
Merge pull request #2918 from jryans/bold-for-all
...
Ensure `<b>` tags appear bold for all browsers
2019-04-15 09:55:09 +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
11bd82ee4c
Ensure <b> tags appear bold for all browsers
...
In Firefox, the default <b> style is such that it doesn't appear bold with our
current selection of specific font weights. This specifically sets a working
font weight.
2019-04-12 15:09:32 +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
7e78149f06
Merge pull request #2911 from matrix-org/bwindels/e2emediumagent
...
use medium agent for e2e tests
2019-04-12 09:26:19 +00: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
9bd8f47cdf
Merge pull request #2913 from matrix-org/travis/breadcrumbs/scrolling-3
...
Remove breadcrumb scroll tolerances and use sensible defaults
2019-04-11 11:30:47 -06:00
Bruno Windels