Michael Telatynski
280690cf3c
use useIsEncrypted hook in UserInfo
2020-09-03 15:07:10 +01:00
Michael Telatynski
ad9be61477
Move HeaderButtons to an abstract class
2020-09-03 15:05:24 +01:00
Michael Telatynski
c7e40d0751
Fix MemberAvatar props interface
2020-09-03 15:05:10 +01:00
J. Ryan Stinnett
fb2bde94fa
Rename CrossSigningManager to SecurityManager
...
The file encompasses bits of cross-signing and also secret storage / secure
backup.
2020-09-03 14:50:49 +01:00
J. Ryan Stinnett
7efa9ba77d
Fix DOM nesting error in cross-signing panel
...
The spinner can't be inside a `<p>` element. This also changes to block spinner
to match key backup.
2020-09-03 13:23:50 +01:00
Michael Telatynski
24006588d5
iterate PR
2020-09-03 10:34:19 +01:00
Travis Ralston
03588f8450
Merge pull request #5161 from matrix-org/travis/communities/proto/userinfo
...
Communities v2 prototype: "In community" view
2020-09-02 10:50:07 -06:00
Michael Telatynski
8484422c55
Merge pull request #5165 from matrix-org/t3chguy/fix/15080
...
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:45:34 +01:00
Michael Telatynski
beb77799f6
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:26:23 +01:00
Travis Ralston
9b12355b2a
Appease the linter
2020-09-02 08:59:24 -06:00
Michael Telatynski
cffe902504
Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling
2020-09-02 12:00:35 +01:00
Michael Telatynski
6178b3c0e2
Wire up resizeNotifier
2020-09-02 11:13:00 +01:00
Michael Telatynski
243af3c9f2
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
2020-09-02 09:27:06 +01:00
Travis Ralston
92c184385c
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-01 10:51:42 -06:00
Travis Ralston
afec470ec3
Merge branch 'develop' into travis/copy2
2020-09-01 10:50:58 -06:00
Michael Telatynski
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts
...
Fix eslint ts override tsx matching and delint
2020-09-01 16:44:22 +01:00
Michael Telatynski
d668f8018b
undo some delint
2020-09-01 15:59:19 +01:00
Michael Telatynski
a13cc0ce6a
Merge pull request #5159 from matrix-org/t3chguy/react-err
...
Fix react error about functional components can't take refs
2020-09-01 09:13:42 +01:00
Michael Telatynski
842821b038
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash
2020-09-01 09:09:50 +01:00
Michael Telatynski
656a815991
delint some more
2020-09-01 09:07:46 +01:00
Travis Ralston
29089821f4
Merge branch 'develop' into travis/copy2
2020-08-31 11:03:01 -06:00
Travis Ralston
fdbaddbace
Add a simple edit dialog for communities
2020-08-31 10:52:08 -06:00
Travis Ralston
724e3f6905
Run all selected prototype community logic through one store
2020-08-31 10:19:05 -06:00
Travis Ralston
93d67a6689
Wire up members button to member view
...
Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.
2020-08-31 10:12:12 -06:00
Michael Telatynski
3c5eb1f42c
fix Registration Form
2020-08-29 18:28:15 +01:00
Michael Telatynski
da97d8885b
Fix react error about functional components can't take props
2020-08-29 13:51:43 +01:00
Michael Telatynski
517dee413e
Delint
2020-08-29 12:57:11 +01:00
Michael Telatynski
78812b6f85
Fix some stuff
2020-08-29 12:53:04 +01:00
Michael Telatynski
72498df28f
Remove create-react-class
2020-08-29 12:14:16 +01:00
Michael Telatynski
672d0fe97b
Remove redundant components and devDependencies
2020-08-29 12:09:07 +01:00
Michael Telatynski
9ba33c7f80
Fix eslint ts override tsx matching and delint
2020-08-29 01:11:08 +01:00
Travis Ralston
90d9d7128d
Use FlairStore's cache for group naming
...
Turns out GroupStore doesn't really know much.
2020-08-28 14:56:59 -06:00
Travis Ralston
e68c4efd0b
Merge branch 'travis/copy2' into travis/communities/proto/userinfo
2020-08-28 13:54:03 -06:00
Travis Ralston
6f237161fd
Appease the linter
2020-08-28 13:28:54 -06:00
Travis Ralston
e58b514803
Add clarifying text to DM dialog about what is about to happen
2020-08-28 13:22:20 -06:00
Michael Telatynski
1fc55b33c1
Stash lodash import optimization
2020-08-28 18:53:43 +01:00
Michael Telatynski
2823156ef6
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/display-capture
2020-08-28 17:26:10 +01:00
Michael Telatynski
b9cfa95ceb
Add display-capture to iframe allow
2020-08-28 17:06:56 +01:00
Travis Ralston
cc2fc911af
Minor copy addition to DM dialog for communities prototype
2020-08-28 10:03:27 -06:00
Travis Ralston
52e095fa61
Merge pull request #5151 from matrix-org/travis/copy-change
...
Update create room dialog copy & community prototype home icon
2020-08-28 09:47:53 -06:00
Travis Ralston
f038103f97
Fix copy
2020-08-28 09:47:36 -06:00
J. Ryan Stinnett
e2acec6059
Merge pull request #5149 from matrix-org/jryans/defer-cross-signing-setup
...
Migrate to new, separate APIs for cross-signing and secret storage
2020-08-28 12:40:35 +01:00
Travis Ralston
be1de1d295
Update create room dialog copy
2020-08-27 13:49:40 -06:00
Michael Telatynski
bf3c49b8df
Remove redundant CSS rules
2020-08-27 10:46:29 +01:00
Michael Telatynski
89ec90cf04
Rewrite useLocalStorageState hook
2020-08-27 10:27:27 +01:00
resynth1943
2c20afc047
Fix lodash imports
...
Signed-off-by: resynth1943 <resynth1943@tutanota.com>
2020-08-26 23:23:18 +01:00
Travis Ralston
4f29770adb
Force the GroupStore to update after creating a prototype community
2020-08-26 11:02:14 -06:00
Travis Ralston
027f263589
Remove prototype code from CreateGroupDialog
...
The prototype code paths prevent users from ending up here, so we don't need custom code.
2020-08-26 11:01:58 -06:00
Travis Ralston
c28134eb11
Associate created rooms with the selected community
2020-08-26 10:53:06 -06:00
Travis Ralston
fd71bca7c0
Change menu label if in a community
2020-08-26 10:33:05 -06:00
Travis Ralston
b294ec6427
Merge pull request #5145 from matrix-org/travis/communities/proto/switcher
...
Communities v2 prototype: Tag panel selection changes
2020-08-26 10:22:50 -06:00
Travis Ralston
82949c038a
Merge pull request #5144 from matrix-org/travis/communities/proto/create-flow
...
Communities v2 prototype: Create community flow
2020-08-26 09:07:17 -06:00
Travis Ralston
82b015bd5f
Rename components to match prior convention
2020-08-26 08:52:39 -06:00
Travis Ralston
3e7d82b421
Change tip copy
2020-08-26 08:48:01 -06:00
Travis Ralston
0c67a42b0f
Make padding only on the prototype tag panel
2020-08-26 08:42:26 -06:00
Travis Ralston
20c562c208
Change user avatar to a home icon
2020-08-25 21:46:26 -06:00
Travis Ralston
56c7f86983
Add an invite users to community step to dialog flow
2020-08-25 21:08:31 -06:00
Travis Ralston
7c1a9993e3
Add new create group dialog
2020-08-25 21:08:24 -06:00
Travis Ralston
65fe562cbf
Select new tag after creating the group
2020-08-25 21:08:12 -06:00
Travis Ralston
2d4ac548d0
Override invite metadata if the server wants a group profile
2020-08-25 21:03:11 -06:00
J. Ryan Stinnett
a732c55797
Add secret storage readiness checks
...
This visits all places that were checking for cross-siging readiness and adapts
them to also check for secret storage readiness if needed.
Part of https://github.com/vector-im/element-web/issues/13895
2020-08-25 13:20:15 +01:00
Michael Telatynski
634f7ba938
Merge pull request #5142 from matrix-org/t3chguy/hooks/base-avatar
...
BaseAvatar avoid initial render with default avatar
2020-08-25 09:02:57 +01:00
Michael Telatynski
186374a950
BaseAvatar avoid initial render with default avatar
2020-08-24 21:08:07 +01:00
J. Ryan Stinnett
8e0742b9fe
Merge pull request #5130 from matrix-org/jryans/secure-backup-required
...
Enforce Secure Backup completion when requested by HS
2020-08-24 17:32:58 +01:00
Travis Ralston
84d782022f
Merge pull request #5139 from matrix-org/travis/communities/room-behaviour
...
Communities v2 prototype: Explore rooms, global state, and default room
2020-08-24 07:43:01 -06:00
Travis Ralston
56e08f440e
Merge pull request #5133 from matrix-org/travis/communities/tag-panel
...
Add communities v2 prototyping feature flag + initial tag panel prototypes
2020-08-24 07:41:44 -06:00
Michael Telatynski
ef137d2234
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
2020-08-24 11:13:04 +01:00
Travis Ralston
f0bd4d3625
Show the group's room if one is returned
2020-08-21 18:19:34 -06:00
Travis Ralston
276ed90884
Add a personal group for an all-communities state
...
Design is approximate and needs review, though being completed out of band.
2020-08-21 18:19:29 -06:00
Michael Telatynski
97d8cec94e
dedup
2020-08-21 16:40:05 +01:00
Michael Telatynski
35cc1fb06d
small tweaks
2020-08-21 16:38:28 +01:00
Michael Telatynski
cca5ccd79d
Switch widget resizing to re-resizable and add persistence
2020-08-21 16:29:07 +01:00
Travis Ralston
d1c7d749aa
Merge pull request #5134 from matrix-org/travis/cleanup2
...
Remove some unused components
2020-08-21 07:45:32 -06:00
Heiko Carrasco
9193c81008
Fix image avatar view for 1:1 rooms
...
Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
2020-08-21 11:44:47 +02:00
Travis Ralston
c815a370e7
Remove some unused components
...
We no longer have tinting support, so remove it. We still need the `Tinter` to exist though as it's used in quite a few places (though does nothing). Similarly, we have to keep the `roomColor` setting due to it being used in a few places - another PR can take away the tinter support properly.
The room tile context menu and top left menu are artifacts of the old room list.
The end to end tests weren't failing before as the code path is unused, however it seems worthwhile to keep it as we will eventually need it.
2020-08-20 20:47:02 -06:00
Travis Ralston
d7a43df793
Disable context menu for v2 communities
2020-08-20 19:54:09 -06:00
Michael Telatynski
ae65ed5c2e
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into resizable-appsdrawer
...
Conflicts:
res/css/views/rooms/_AppsDrawer.scss
2020-08-20 10:26:35 +01:00
David Baker
0690c02e0c
Merge pull request #5131 from matrix-org/dbkr/clarify_media_device_id
...
Add clarifying comment in media device selection
2020-08-20 09:26:27 +01:00
David Baker
d1bca2838f
Add clarifying comment in media device selection
...
Hopefully explain the confusing mismatch.
2020-08-19 19:07:12 +01:00
Travis Ralston
c9d98a1d19
Merge pull request #5124 from matrix-org/travis/settings-v3
...
Settings v3: Feature flag changes
2020-08-19 12:00:48 -06:00
J. Ryan Stinnett
fed7ebb6bc
Hide Delete Backup button when Secure Backup required
...
If Secure Backup is required by the HS admin, then this hides the Delete Backup
button in Settings to ensure everyone keeps their backup per policy.
Part of https://github.com/vector-im/element-web/issues/14954
2020-08-19 16:23:27 +01:00
Michael Telatynski
d700a5a78c
Merge pull request #5129 from matrix-org/t3chguy/fix/14989
...
Clear url previews if they all get edited out of the event
2020-08-19 11:40:57 +01:00
Michael Telatynski
b95956a3a4
Clear url previews if they all get edited out of the event
2020-08-19 10:38:26 +01:00
Michael Telatynski
0bda80c57d
Consider tab completions as modifications for editing purposes to unlock sending
2020-08-19 10:32:24 +01:00
Travis Ralston
534f0cc89e
Revert "Merge pull request #5125 from matrix-org/travis/spec-i18n"
...
This reverts commit d3dba0ba3a
.
2020-08-18 13:09:33 -06:00
Travis Ralston
d3dba0ba3a
Merge pull request #5125 from matrix-org/travis/spec-i18n
...
Use matrix-doc for SAS emoji translations
2020-08-18 11:41:42 -06:00
Michael Telatynski
8cff59f123
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-18 17:36:04 +01:00
Michael Telatynski
24a390f840
Merge pull request #5123 from matrix-org/t3chguy/room-list/14466
...
Room List filtering visual tweaks
2020-08-18 17:22:05 +01:00
Bruno Windels
5c6a36f89a
Merge pull request #5072 from matrix-org/bwindels/make-reply-not-overlay
...
Make reply preview not an overlay so you can see new messages
2020-08-18 11:48:41 +00:00
Michael Telatynski
697ba12b3a
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14466
2020-08-18 12:48:32 +01:00
Michael Telatynski
d1971cb163
Merge pull request #5113 from matrix-org/t3chguy/room-list/14959
...
Allow room tile context menu when minimized using right click
2020-08-18 12:45:55 +01:00
Bruno Windels
5d98805d77
Merge branch 'develop' into bwindels/make-reply-not-overlay
2020-08-18 13:39:06 +02:00
Bruno Windels
fa1e27076d
remove dupe method
2020-08-18 12:34:43 +02:00
Travis Ralston
d9e7253561
Use matrix-doc for SAS emoji translations
...
This is done through the js-sdk's new SASEmojiV1 class.
2020-08-17 15:37:36 -06:00
Travis Ralston
4f851542ac
Implement force state for features like in the proposal
2020-08-17 13:51:41 -06:00
Travis Ralston
3659115921
Followup on some SettingsStore removals
2020-08-17 13:37:16 -06:00
Travis Ralston
eda4e24926
Update LabsUserSettings for new feature behaviour
2020-08-17 13:19:15 -06:00
Travis Ralston
96087d61f6
Convert feature setting usages to regular settings
2020-08-17 13:12:18 -06:00
Michael Telatynski
e20b375433
Add filter results count and explore prompt
2020-08-17 18:20:00 +01:00
Michael Telatynski
21cdf5073c
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/14617
2020-08-14 18:58:26 +01:00
Michael Telatynski
be1d390a93
Merge pull request #5106 from matrix-org/t3chguy/room-list/14608
...
Switch out the globe icon and colour it depending on theme
2020-08-14 18:10:29 +01:00
Michael Telatynski
655cc95570
fix typo
2020-08-14 13:37:28 +01:00
Michael Telatynski
591847b274
Watch for Event.status instead as we can do some things in SENT
2020-08-14 13:37:11 +01:00
Michael Telatynski
de9816574f
Make event subscriptions conditional when needed
2020-08-14 13:30:27 +01:00
Michael Telatynski
f982c7b334
Message Action Bar, subscribe to localEventIdReplaced events
2020-08-14 13:22:52 +01:00
Michael Telatynski
8f0e4dae9d
Allow room tile context menu when minimized using right click
2020-08-14 12:01:16 +01:00
Michael Telatynski
4ec602b960
Make cutout in the decorated room avatar transparent rather than fixed
2020-08-14 10:20:59 +01:00
Michael Telatynski
b8a260bb84
Change add room action for rooms to context menu
2020-08-13 16:18:26 +01:00
Michael Telatynski
8aa50ecb59
Iterate rageshake download styling
2020-08-13 13:08:07 +01:00
Michael Telatynski
df980dbf92
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-12 22:48:03 +01:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
...
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
J. Ryan Stinnett
0c76af19f0
Merge pull request #5100 from matrix-org/jryans/remove-rebranding-toast
...
Remove rebranding toast
2020-08-12 15:18:44 +01:00
J. Ryan Stinnett
9e429ee669
Remove rebranding toast
...
It's time to remove the rebranding toast, as we believe people have had
sufficient warning now.
Fixes https://github.com/vector-im/element-web/issues/14931
2020-08-11 14:27:53 +01:00
Travis Ralston
d866b2d9ef
Generate previews for rooms when the option changes
...
Fixes https://github.com/vector-im/element-web/issues/14853
This likely regressed in https://github.com/matrix-org/matrix-react-sdk/pull/5048 when the message preview information was made state, and the component wasn't updating the preview when the control flags changed.
2020-08-10 20:52:05 -06:00
Michael Telatynski
be2d0c9de7
Merge pull request #5095 from matrix-org/t3chguy/fix/14906
...
Fix Bridge Settings tab
2020-08-10 16:34:24 +01:00
J. Ryan Stinnett
538e222d1f
Merge pull request #5081 from matrix-org/msuess/fix-edit-multiple-widget-instances
...
get screen type from app prop
2020-08-10 14:14:25 +01:00
Michael Telatynski
4799f0ee43
Merge pull request #5085 from matrix-org/t3chguy/notifications11
...
Factor out Iconized Context menu for reusability
2020-08-08 11:41:28 +01:00
Michael Telatynski
5c0d332e9d
Convert Bridge Settings Tab to Typescript
2020-08-08 11:38:57 +01:00
Michael Telatynski
f784500b1c
Fix Bridge Settings Tab
2020-08-08 11:28:44 +01:00
Michael Telatynski
a095f858b0
Merge pull request #5087 from matrix-org/t3chguy/fix/14868
...
Make the room sublist show more/less buttons treeitems
2020-08-08 10:46:57 +01:00
J. Ryan Stinnett
4c1956a3c2
Show master key cache status in Settings
2020-08-06 15:25:33 +01:00
Michael Telatynski
0da31de5ad
Merge pull request #5086 from matrix-org/t3chguy/notifications12
...
Create Map comparison utilities and convert Hooks to Typescript
2020-08-05 16:28:52 +01:00
Jorik Schellekens
b871d7e849
Fix room security radios
2020-08-05 13:53:19 +01:00
J. Ryan Stinnett
7748e3ae1a
Merge pull request #5083 from matrix-org/jryans/riot-to-element
...
Replace Riot with Element in docs and comments
2020-08-05 12:25:45 +01:00
Michael Telatynski
f1505833b7
Make the room sublist show more/less buttons treeitems
2020-08-05 09:56:31 +01:00
Michael Telatynski
cd29edb442
Write more typescript defs
2020-08-05 09:13:01 +01:00
Michael Telatynski
d126f5c1e6
tidy up IconizedContextMenu CSS
2020-08-04 21:42:45 +01:00
Michael Telatynski
b30ce0355e
Factor out Iconized Context Menu for reusabilit
2020-08-04 21:42:39 +01:00
Jorik Schellekens
271eeeabee
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting
2020-08-04 15:04:56 +01:00
Bruno Windels
c1ec41715c
Merge pull request #5082 from matrix-org/bwindels/fixinvitedialogcrash
...
Add null guard in InviteDialog
2020-08-04 08:35:20 +00:00
Jorik Schellekens
5426d9f105
Use accessible button for copy icon.
2020-08-03 19:21:24 +01:00
J. Ryan Stinnett
ce226ab534
Replace Riot with Element in docs and comments
...
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.
Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Bruno Windels
fe1d375dd2
Merge remote-tracking branch 'origin/develop' into bwindels/remove-composer-overlay-icons
2020-08-03 18:05:26 +02:00
Bruno Windels
71a9fef491
fix InviteDialog crash
2020-08-03 17:42:54 +02:00
Marco Süß
5b8a8ecc5e
get screen type from app prop
2020-08-03 16:26:25 +02:00
Michael Telatynski
25499fc687
Merge pull request #5045 from matrix-org/t3chguy/fix/10818
...
Mass redact ignore room creation events
2020-08-03 13:52:21 +01:00
Michael Telatynski
0a700bc8e4
Iterate copy on download logs button
2020-08-03 13:21:04 +01:00
Michael Telatynski
cbcac9dd49
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
package.json
2020-08-03 12:54:06 +01:00
Travis Ralston
e8d1024c45
Merge pull request #5076 from matrix-org/travis/cleanup/1
...
Clean up documentation of Whenable + fix other code concerns
2020-07-31 11:27:19 -06:00
Travis Ralston
3443761007
Merge pull request #5062 from matrix-org/travis/settings/ts
...
Convert SettingsStore to TypeScript
2020-07-31 11:07:07 -06:00
Bruno Windels
a3ca80b206
move the reply preview one level higher so the buttons and avatar don't get centered with it
2020-07-31 18:27:07 +02:00
Travis Ralston
7645fe6b23
Update context transaction states
2020-07-31 10:00:02 -06:00
Bruno Windels
5c05b494df
remove emoji icons in autocomplete/reply by designer request
2020-07-31 14:14:37 +02:00
Bruno Windels
d24ddc415b
Notify the timeline it's height has changed, so it can keep being at the bottom
...
this way new messages will appear in the timeline without needing to scroll
2020-07-31 14:02:40 +02:00
Bruno Windels
01d624fdaf
Make the reply preview not an overlay on the timeline anymore
...
As users can't scroll down all the way down to the timeline like this to
see the last message (and perhaps adjust their reply to it)
This also remove the wrapper div as it is not needed anymore
2020-07-31 13:47:40 +02:00
J. Ryan Stinnett
af49639bd8
Merge pull request #5065 from matrix-org/travis/echo/audit
...
Add local echo for notifications in the new room list
2020-07-31 12:20:20 +01:00
Travis Ralston
49abfc1fb2
Ensure sublists are updated when rooms are removed from them
...
Fixes https://github.com/vector-im/riot-web/issues/14798 (part 2)
This is in two parts itself: The `RoomSublist` needs to break its references to the `RoomListStore`, so it now clones the room arrays. The `Algorithm` is the other part, which is slightly more complicated.
It turns out that we weren't handling splicing as a change in the `ImportanceAlgorithm`, therefore the `Algorithm` wasn't really feeling like it needed to change anything. Further, the `Algorithm` was using the wrong reference to where it should be dumping rooms (`this.cachedRooms` is a getter which returns a different object depending on conditions), so having fixed that we need to ensure that the filtered and sticky maps are also updated when we remove a room. Because we send the new tag through a Timeline update, we'll end up updating the tag later on and don't need to update the filter and sticky collections.
2020-07-30 15:06:04 -06:00
Travis Ralston
5b15d12865
Ensure list visibility changes get counted as list changes
...
Fixes https://github.com/vector-im/riot-web/issues/14799
We were checking to see if the tags were visible at render time, but we needed to ensure that they were(n't) included when checking for diffs. This introduces a new kind of object cloning for semantic reasons.
This also fixes the selection indicator being a bit off on custom tags.
2020-07-30 14:18:54 -06:00
Travis Ralston
e953bfbf88
Replace flawed objectHasValueChange usage with objectHasDiff
...
Fixes https://github.com/vector-im/riot-web/issues/14782
We need to check if the keys changed, not just the values.
2020-07-30 14:08:18 -06:00
Travis Ralston
968fbd5cba
Merge branch 'develop' into travis/echo/audit
2020-07-30 10:18:30 -06:00