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

15364 commits

This branch
This branch
All branches
Author SHA1 Message Date
J. Ryan Stinnett
2054d53782 Tweaked wording after discussing with @lampholder 2019-04-15 15:10:48 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Bruno Windels
6bc659c93b layout for error codes 2019-04-15 15:25:34 +02:00
Bruno Windels
1b2fba3fe2 move p tags for subtitles out of switch 2019-04-15 15:22:08 +02:00
Bruno Windels
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
Bruno Windels
b09c7f97e9 implement most of new messages 2019-04-15 14:44:00 +02:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Thomas Karner
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
Travis Ralston
9478ccc683 Add missing newline 2019-04-14 20:46:32 -06:00
YaoiFangirl420
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
YaoiFangirl420
3dae9f3d58 Move FormattingButton to separate component 
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-04-13 01:45:15 -07:00
YaoiFangirl420
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
YaoiFangirl420
419cb4e8b2 Define Stickerpicker inline 
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-04-13 01:45:15 -07:00
YaoiFangirl420
485ad6a3f0 Make UploadButton a separate component 
Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>
 2019-04-13 01:45:15 -07:00
YaoiFangirl420
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
YaoiFangirl420
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
YaoiFangirl420
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
YaoiFangirl420
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
Travis Ralston
0479901daa Load data for permalink creators once 2019-04-12 10:38:39 -06:00
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Bruno Windels
b67152d98e WIP 2019-04-12 14:40:31 +02:00
Bruno Windels
01e9de9a3a differentiate style based on preview or not 2019-04-12 12:54:13 +02:00
Bruno Windels
16ed06cebb dont show room header and timeline when room cant be peeked (just preview bar) 2019-04-12 12:47:52 +02:00
Andrew Morgan
d431e37d9b Move and lint 2019-04-12 10:37:14 +01:00
Bruno Windels
7e78149f06
Merge pull request #2911 from matrix-org/bwindels/e2emediumagent 
use medium agent for e2e tests
 2019-04-12 09:26:19 +00:00
Bruno Windels
ed7e79af8f
Merge pull request #2912 from matrix-org/bwindels/propwarn 
adjust prop in HeaderButton
 2019-04-12 09:02:50 +00:00
Travis Ralston
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
Travis Ralston
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
Andrew Morgan
cecd2cbd71 Focus the composer view on file upload 2019-04-11 18:42:32 +01:00
Travis Ralston
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
Travis Ralston
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
Travis Ralston
ccf292f053 Load permalink creators to get proper state of the room 2019-04-11 10:59:00 -06:00
Travis Ralston
ec01f6ffb1 Change wording for old room link 2019-04-11 10:40:25 -06:00
Bruno Windels
fee30d4482 adjust prop in HeaderButton 2019-04-11 18:32:38 +02:00
Bruno Windels
6e8e62e619 use medium agent for e2e tests 2019-04-11 16:16:29 +02:00
Bruno Windels
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
Bruno Windels
483b7fc14d take buttons into account that are active over multiple phases when toggling 2019-04-11 13:31:21 +02:00
Bruno Windels
02792132e1 dont create functions in render 2019-04-11 13:22:47 +02:00
Bruno Windels
0553a6f1d6 some style changes 2019-04-11 13:07:54 +02:00
Andrew Morgan
2d411630ae
Merge pull request #2909 from matrix-org/anoa/punctuation 
Add period to the end of the room upgrade notice
 2019-04-11 11:12:05 +01:00
Andrew Morgan
b3946c7766 Add period to the end of upgrade notice 2019-04-11 10:55:53 +01:00
Andrew Morgan
8398e5dd71 Appease CI 2019-04-11 00:42:27 +01:00
Andrew Morgan
be02f67eef Switch logic 2019-04-11 00:09:38 +01:00