Travis Ralston
4f75e2944c
Appease the linter
2021-04-19 23:11:41 -06:00
Travis Ralston
61730f2f88
Populate waveform data on voice message event
2021-04-19 23:05:53 -06:00
Travis Ralston
6f794cca9b
Fill in some metadata for the sent event
2021-04-19 21:01:48 -06:00
David Baker
59c5ab31de
Support MSC3086 asserted identity
2021-04-19 20:30:51 +01:00
Germain Souquet
33eebb84a6
Ensure PersistedElement are unmounted on application logout
2021-04-19 17:57:20 +01:00
Michael Telatynski
379df7f24d
Merge pull request #5883 from matrix-org/t3chguy/fix/16704
...
Fix typo in method call in add existing to space dialog
2021-04-19 17:53:10 +01:00
J. Ryan Stinnett
2d1615e433
Merge pull request #5872 from SimonBrandner/new-image-view-fixes
...
New Image View fixes/improvements
2021-04-19 17:37:42 +01:00
Michael Telatynski
4082a03769
Fix typo in method call in add existing to space dialog
2021-04-19 17:32:45 +01:00
Travis Ralston
01fc88f88a
Merge pull request #5871 from matrix-org/travis/voice/countdown
...
Limit voice recording length
2021-04-19 10:30:38 -06:00
Michael Telatynski
12d96fe096
Merge pull request #5881 from matrix-org/t3chguy/fix/16704
...
Clean up add existing to space dialog and include DMs in it too
2021-04-19 17:29:09 +01:00
Michael Telatynski
e01caba068
Clean up add existing to space dialog and include DMs in it too
2021-04-19 08:54:06 +01:00
Germain Souquet
3c85092f1a
Cleanup unused state in MessageComposer
2021-04-16 17:36:14 +01:00
Travis Ralston
d23f66bb47
Update documentation
2021-04-16 10:11:04 -06:00
Travis Ralston
f955f33071
Merge branch 'develop' into travis/voice/countdown
2021-04-16 10:00:11 -06:00
Travis Ralston
7878e1cd57
Merge pull request #5870 from matrix-org/travis/voice/disable-composer
...
Properly disable composer access when recording a voice message
2021-04-16 07:36:53 -06:00
Germain Souquet
c1c3ac20cd
correct always visible logic
2021-04-16 12:22:00 +01:00
Germain Souquet
daaaa3da95
add context for roomsublist rendering
2021-04-16 10:26:29 +01:00
Germain Souquet
327983672e
refactor renderSublists for better readability
2021-04-16 10:17:46 +01:00
Germain Souquet
f1453e8d2b
extract always visible logic to RoomList
2021-04-16 09:43:59 +01:00
Germain
4708c1682d
Merge pull request #5862 from matrix-org/gsouquet-start-dm
2021-04-15 17:25:15 +01:00
J. Ryan Stinnett
495aff898f
Merge pull request #5864 from SimonBrandner/dont-render-msg-option
...
Render msgOption only if showReadReceipts is enabled
2021-04-15 17:24:13 +01:00
Šimon Brandner
7fe5d2e9e4
Remove double blank line
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-15 17:49:35 +02:00
Germain Souquet
b9f80b49ad
Set correct initial state for notification on room
2021-04-15 16:33:49 +01:00
Germain Souquet
02debd12f6
Hide RoomSublist when empty rather than unmounting them
2021-04-15 16:11:45 +01:00
Germain Souquet
a59873df0b
Set rooms event listeners during the correct life cycle hook
2021-04-15 15:51:00 +01:00
Germain Souquet
3a91dff711
Check if address type is mx-user-id
2021-04-15 14:13:37 +01:00
Germain
36e729a626
Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation
2021-04-15 08:27:28 +01:00
Šimon Brandner
2e31355741
Don't do anything if we didn't press the left button
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-15 08:10:03 +02:00
Šimon Brandner
72d8e6ccca
Decrease ZOOM_COEFFICIENT
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-15 08:09:14 +02:00
Travis Ralston
1aeb9a5fb2
Appease the linter
2021-04-14 22:04:18 -06:00
Travis Ralston
0677cf866c
Cap recording length, and warn at 10s remaining
...
See diff for details. Note that this introduces an "Uploading" state which is not currently used.
At the moment, if a user hits the maximum time then their recording will be broken. This is expected to be fixed in a future PR.
2021-04-14 21:15:06 -06:00
Travis Ralston
22219e0e80
Adapt <Tooltip> to use an Alignment enum instead
2021-04-14 21:13:09 -06:00
Travis Ralston
fedb5b9f63
Fix disabled state of the composer
2021-04-14 20:12:10 -06:00
Travis Ralston
3cafed478c
Run voice recording updates through a dedicated store
2021-04-14 20:11:34 -06:00
Travis Ralston
b0a04c9f81
Rename VoiceRecorder -> VoiceRecording to better match expected function
2021-04-14 20:00:16 -06:00
Germain Souquet
3b66821258
move DM invite responsiblity to the server side
2021-04-14 19:59:17 +01:00
ColonisationCaptain
c521be2d16
add missing spaces
2021-04-14 14:28:41 +01:00
Travis Ralston
2fb241cfc2
Merge pull request #5859 from robintown/message-preview-tooltips
...
Add tooltips to message previews
2021-04-14 06:42:18 -06:00
Šimon Brandner
a7b1c5dfe0
Run getReadAvatars() only when neccessary
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 12:25:48 +02:00
Šimon Brandner
43c236e8a5
Pass showReadReceipts from MessagePanel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 12:24:33 +02:00
Šimon Brandner
ba0384f381
Render msgOption only if showReadReceipts is enabled
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-14 11:43:42 +02:00
Germain Souquet
67faaeaeff
Rename Velociraptor to NodeAnimator after velocity deprecation
2021-04-14 10:18:45 +01:00
Germain Souquet
8b2dc22fe1
fix closing modal when finished
2021-04-14 09:37:06 +01:00
Germain Souquet
f89bbea3f1
Ensure room is synced with account before sending invites
2021-04-14 09:03:47 +01:00
Germain Souquet
8d95c012ef
refactor _startDm invite flow to use async/await
2021-04-14 08:44:33 +01:00
Travis Ralston
ac00c80efb
Merge pull request #5521 from SimonBrandner/improve-image-view
...
Improve image view
2021-04-13 19:01:27 -06:00
Sam A. Horvath-Hunt
14b8b0f8da
Render ignored users setting regardless of if there are any
...
Signed-off-by: Sam A. Horvath-Hunt <hello@samhh.com>
2021-04-13 21:45:09 +01:00
Travis Ralston
7bd5c19bd9
Merge pull request #5819 from matrix-org/travis/reset-passphrase
...
Add a button to reset personal encryption state during login
2021-04-13 12:20:37 -06:00
Robin Townsend
c9c53dbcd7
Add tooltips to message previews
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-13 12:02:22 -04:00
Michael Telatynski
ae5b6ef831
Merge pull request #5854 from matrix-org/t3chguy/toml/hooks1
...
Fix useRoomPowerLevels hook
2021-04-13 11:29:02 +01:00
Michael Telatynski
1572a53af9
Fix useRoomPowerLevels hook
2021-04-13 10:39:09 +01:00
Michael Telatynski
c25df51534
Prevent state events being rendered with invalid state keys
2021-04-13 09:40:44 +01:00
Michael Telatynski
e79ad34fbd
EventTile make use of EventType enum
...
Removes m.room.encryption from non-state list as it makes no sense
2021-04-13 09:34:37 +01:00
Šimon Brandner
f9fde3670d
Set target to _blank
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:15:42 +02:00
Šimon Brandner
b1091a22a3
Don't render context menu button if mxEvent is missing
...
The button is useless and doesn't work if we're viewing an avatar
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:11:09 +02:00
Šimon Brandner
e1446f01e4
Make ImageView static
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00
Šimon Brandner
f1c80fcede
Call onCloseDialog straigh away
...
This avoids some delay in the dialog disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:04:50 +02:00
Travis Ralston
72a9bda3b7
One less try/catch
2021-04-12 14:57:21 -06:00
Travis Ralston
106de5f7ba
Merge branch 'develop' into travis/reset-passphrase
2021-04-12 14:55:31 -06:00
Travis Ralston
ee9e1a72cb
Merge pull request #5838 from matrix-org/travis/add-acl-pl
...
Give server ACLs a name in 'roles & permissions' tab
2021-04-12 14:13:30 -06:00
Michael Telatynski
187eef4f2d
Merge pull request #5843 from matrix-org/t3chguy/fix/16896
...
User Info hide disambiguation as we always show MXID anyway
2021-04-12 14:49:19 +01:00
J. Ryan Stinnett
098a8711a7
Merge pull request #5847 from matrix-org/jryans/reason-message-tweaks
...
Tweak appearance of invite reason
2021-04-12 13:36:20 +01:00
J. Ryan Stinnett
8a1180bd50
Rename toggle to view
2021-04-12 13:19:13 +01:00
J. Ryan Stinnett
798a891d83
Tweak appearance of invite reason
...
This adjusts the display of invite reasons to match design feedback.
Fixes https://github.com/vector-im/element-web/issues/16869
2021-04-12 12:28:42 +01:00
Michael Telatynski
591c8ffd83
User Info hide disambiguation as we always show MXID anyway
2021-04-12 11:10:51 +01:00
J. Ryan Stinnett
bef5c6593e
Remove key sharing feature flag
2021-04-09 17:05:55 +01:00
Šimon Brandner
86dd81cda0
Fix rotation animation when rotating 360 deg
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:16:52 +02:00
Šimon Brandner
829bef45a2
Close dialog on redact
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:13:42 +02:00
Šimon Brandner
b723092ed2
Add null check
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:05:49 +02:00
Šimon Brandner
90f9d20f45
Add comment about refs to functional components
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:03:10 +02:00
Šimon Brandner
4a40f67e75
Make private
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:02:38 +02:00
Šimon Brandner
cb02c39d7f
Add name to copyright
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-09 08:01:14 +02:00
Travis Ralston
073c05543c
Give server ACLs a name in 'roles & permissions' tab
...
The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events".
2021-04-08 19:20:08 -06:00
Travis Ralston
28d12016b7
Convert to using EventType enum
2021-04-08 19:18:30 -06:00
Travis Ralston
f2e2f1699b
Add some catches
2021-04-08 18:09:41 -06:00
Travis Ralston
01c5f84f60
Merge branch 'develop' into travis/reset-passphrase
2021-04-08 18:07:46 -06:00
Germain Souquet
bf34e37dcc
fix hiding read receipts animation
2021-04-08 11:43:13 +01:00
Germain Souquet
86d2e577cf
Animate read receipts for all component updates
2021-04-08 10:36:38 +01:00
Germain Souquet
8d60d85570
replace velocity-animate with CSS transitions
2021-04-08 10:36:14 +01:00
Travis Ralston
6e6a26f86a
Merge pull request #5710 from SimonBrandner/resizable-call-view
...
Resizable CallView
2021-04-07 11:02:46 -06:00
J. Ryan Stinnett
4462ac6203
Merge pull request #5826 from maunium/fix-no-thumbnail-video
...
Add fake fallback thumbnail URL for encrypted videos
2021-04-07 12:12:41 +01:00
Šimon Brandner
715fff6f0c
Redo and fix trailing characters in user pills
...
This removes the handling of trailing chars from createMentionParts as we need to determine whether or not to insert the trailing char differently in different situations
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-07 11:52:07 +02:00
Šimon Brandner
c2b66d0dbe
Fix inserting trailing colon after mention/pill
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-06 14:29:20 +02:00
J. Ryan Stinnett
5d027ffcf4
Merge pull request #5694 from robintown/show-invite-reasons
...
Show invite reasons
2021-04-06 10:48:54 +01:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation
...
Require strong password in forgot password form
2021-04-05 00:46:47 -06:00
Šimon Brandner
202ead40c4
Merge branch 'develop' into resizable-call-view
2021-04-04 11:35:26 +02:00
Šimon Brandner
88a881baec
ZOOM_DISTANCE into a const
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 16:19:22 +02:00
Šimon Brandner
fd8e785a5e
Why don't I convert this to Typescript while I am here?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 16:14:27 +02:00
Tulir Asokan
522d58eb57
Add fake fallback thumbnail URL for encrypted videos
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2021-04-02 20:27:26 +03:00
Šimon Brandner
429c945bbf
Don't allow translation when zoomed out
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:37:42 +02:00
Šimon Brandner
722178e26e
Don't return false
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:22:10 +02:00
Šimon Brandner
2ff34000fd
Reset translation with zoom out
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:16:42 +02:00
Šimon Brandner
7068996b60
Animate zooming
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:09:53 +02:00
Šimon Brandner
33a1006488
Iterate mouse actions and cursor behaviour
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 10:01:41 +02:00
Šimon Brandner
eb83ae0a9f
Use MIN_ZOOM in contructor
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 09:40:13 +02:00
Šimon Brandner
80854ab6bb
Don't show seconds in ImageView
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 09:25:21 +02:00
Šimon Brandner
535ae086b4
Make sender bold
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:31:42 +02:00
Šimon Brandner
e5a563f887
Close ImageView after forward click
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:17:05 +02:00
Šimon Brandner
9606297f7c
Merge branch 'develop' into improve-image-view
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-02 08:15:51 +02:00
David Baker
cd39474d26
Merge pull request #5798 from matrix-org/dbkr/attended_transfer
...
Attended transfer
2021-04-01 17:34:30 +01:00
Travis Ralston
f86e090b8a
Update src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-04-01 08:23:32 -06:00
Panagiotis
901d5a86d0
Merge branch 'develop' into forgot-password-validation
2021-04-01 12:39:25 +03:00
Panagiotis
d2f40a859b
define PASSWORD_MIN_SCORE in one place and import from there
2021-04-01 12:30:49 +03:00
Germain Souquet
a4345811b0
Merge branch 'develop' into gsouquet-seshat-reset
2021-04-01 09:06:35 +01:00
Germain Souquet
85f9e43f01
Update seshat reset dialog copy
2021-04-01 09:03:50 +01:00
Germain Souquet
4fcb258981
Refactor SeshatResetDialog props interface to use IDialogProps
2021-04-01 08:58:39 +01:00
Travis Ralston
2ab304189d
Merge pull request #5816 from aaronraimist/redact-re-request
...
Prevent Re-request encryption keys from appearing under redacted messages
2021-03-31 18:23:47 -06:00
Robin Townsend
2477258249
Merge branch 'develop' into show-invite-reasons
2021-03-31 16:13:29 -04:00
Robin Townsend
f0333b5b1c
Show invite reasons
...
Displays the reason for invitation in the invitation dialog, requiring a
click to reveal the message.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-03-31 15:46:09 -04:00
J. Ryan Stinnett
7c4437ac9b
Merge pull request #5815 from czeidler/keybindings-follow-up
...
Keybindings follow up
2021-03-31 17:54:05 +01:00
Germain
5e21a86da9
Merge pull request #5817 from matrix-org/gsouquet-docs
...
Change copy to point to native node modules docs in element desktop
2021-03-31 12:51:36 +01:00
J. Ryan Stinnett
58343c7699
Fix search error typo
...
This fixes a typo in the recently added search error message.
2021-03-31 11:55:21 +01:00
David Baker
299467c515
Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer
2021-03-31 10:14:48 +01:00
Travis Ralston
262475f96e
Add a button to reset personal encryption state during login
2021-03-30 15:37:06 -06:00
Travis Ralston
b68fabb44b
Merge pull request #5801 from matrix-org/travis/voice-messages/waveform
...
Show waveform and timer in voice messages
2021-03-30 12:16:19 -06:00
J. Ryan Stinnett
b089f3d2f9
Merge pull request #5585 from ndarilek/label-base-avatar
...
Label unlabeled avatar button in event panel
2021-03-30 12:21:17 +01:00
Travis Ralston
54412878a1
Merge branch 'develop' into travis/voice-messages/waveform
2021-03-29 22:59:51 -06:00
Travis Ralston
9998f18d67
Stop React complaining about componentShouldUpdate()
2021-03-29 21:59:45 -06:00
Travis Ralston
e523ce6036
Fix float operations to make a little more sense.
2021-03-29 21:25:06 -06:00
Germain Souquet
2a4e327dbf
Change copy to point to native node modules docs in element desktop
2021-03-29 16:03:06 +01:00
Germain Souquet
b38f5c9459
Simplify event index store reset flow
2021-03-29 15:46:58 +01:00
Germain
096d4102b8
Merge pull request #5793 from matrix-org/gsouquet-warn-before-exit
...
Add user settings for warn before exit
2021-03-29 12:11:55 +01:00
Germain Souquet
e53a8ad992
Refactor SeshatResetDialog in TypeScript
2021-03-29 08:44:27 +01:00
Aaron Raimist
4974cb43af
Prevent Re-request encryption keys from appearing under redacted messages
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-03-28 22:35:12 -05:00
Clemens Zeidler
57cd8afbc4
Split ApplySelection into CompleteOrPrevSelection and CompleteOrNextSelection
...
When moving through the autocomplete selection list distinguish between
the following cases:
1) When there is no autocomplete window open, only open one and select
the first item when the CompleteOrPrevSelection /
CompleteOrNextSelection actions are emitted (e.g. by pressing SHIFT +
TAB, TAB)
2) Otherwise navigate through the selection list (e.g. SHIFT + TAB, TAB,
UP, DOWN)
- Remove references to raw keyboard events in autocomplete.ts
- Clarify the purpose of startSelection (previously onTab)
Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2021-03-29 13:38:03 +13:00
J. Ryan Stinnett
33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
...
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12
...
Fixing spaces papercuts
2021-03-26 15:01:31 +00:00
Michael Telatynski
a64e0d7611
delint
2021-03-26 14:45:10 +00:00
Hubert Chathi
e23583db40
Merge pull request #5763 from uhoreg/room-history-key-sharing2
...
Share keys for historical messages when inviting users to encrypted rooms
2021-03-26 10:41:54 -04:00
David Baker
989d69ba16
Get tbe transfer target / transferee the right way around
...
and also switch to the transfer target's room when we call them
2021-03-26 14:21:58 +00:00
Travis Ralston
22b7081475
Merge pull request #5803 from matrix-org/travis/s-sso-login-crash
...
Fix crash on login when using social login
2021-03-26 08:06:34 -06:00
Michael Telatynski
9b4af91014
delint
2021-03-26 13:25:06 +00:00
Michael Telatynski
eff0e6fcc3
Add facepile to Space landing page and tweak layout slightly
2021-03-26 13:11:57 +00:00
J. Ryan Stinnett
ce19d07850
Merge pull request #5805 from matrix-org/travis/ts/access-ss-dialog
...
Convert AccessSecretStorageDialog to TypeScript
2021-03-26 12:37:24 +00:00
J. Ryan Stinnett
5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text
...
Tweak cross-signing copy
2021-03-26 12:12:25 +00:00
Michael Telatynski
4341dfb314
Iterate facepiles, fix default avatar alignment and sort explicit avatars first
2021-03-26 11:55:22 +00:00
J. Ryan Stinnett
aed247f44c
Move toast detail to a new line
2021-03-26 11:43:41 +00:00
Michael Telatynski
9fb653e522
Fix room space invite button for public spaces
2021-03-26 11:43:01 +00:00
Michael Telatynski
3cee8b2baa
fix space creation button busy state
2021-03-26 11:34:41 +00:00
J. Ryan Stinnett
fd59a66523
Tweak cross-signing copy
...
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
2021-03-26 11:13:39 +00:00
Michael Telatynski
8c6d92cc99
Move space room discovery & management into the space room view
2021-03-26 09:54:15 +00:00
Germain Souquet
c40f97fa25
Add reset option for corrupted event index store
2021-03-26 09:44:52 +00:00
Travis Ralston
264e24fc35
Merge pull request #5791 from thermaq/patch-1
...
Fix password change popup message
2021-03-26 00:07:50 -06:00
Travis Ralston
60e05d2e8c
Revert back to using sdk.getComponent()
2021-03-25 23:41:35 -06:00
Travis Ralston
550fba49f7
Appease the eternal linter
2021-03-25 23:37:23 -06:00
Travis Ralston
92ee1ad3cc
Convert AccessSecretStorageDialog to TypeScript
...
This is to make upcoming changes a bit easier to do.
2021-03-25 23:34:45 -06:00
Travis Ralston
8bc2356fd0
Fix crash on login when using social login
...
We weren't passing a matrix client through, and the peg wasn't set at this point. Just need to thread it through to the media endpoints.
Fixes https://github.com/vector-im/element-web/issues/16765
2021-03-25 22:22:43 -06:00
Michael Telatynski
09601f1071
Add display name tooltip to the facepile avatars
2021-03-26 00:05:05 +00:00
Travis Ralston
a848febd3d
Definitely didn't copy/paste these
2021-03-25 17:45:00 -06:00
Travis Ralston
101679f647
Adjust some settings
2021-03-25 17:30:44 -06:00