Bruno Windels
d416ba2c0c
add verify button while we don't have the verification in right panel
2019-11-15 16:14:18 +01:00
Bruno Windels
ecc842629a
fix css lint errors
2019-11-15 16:14:18 +01:00
Bruno Windels
edd5d3c915
make custom power level not grow too wide
2019-11-15 16:14:18 +01:00
Bruno Windels
1162d1ee43
Fix user info scroll container growing larger than available height
...
making whole room view grow taller than viewport
2019-11-15 16:14:18 +01:00
Bruno Windels
48b1207c6e
split up PowerLevelEditor into two components
...
one while editing (PowerLevelEditor) and one
while not editing (PowerLevelSection).
Also save when pressing the button, not when changing the
power dropdown.
Also show the spinner next to the dropdown when saving,
not at the bottom of the component.
2019-11-15 16:14:18 +01:00
Bruno Windels
6db162a3a7
add PL edit mode, don't show selector by default
...
still saves when changing the selector though
2019-11-15 16:14:18 +01:00
Bruno Windels
b278531f2f
add IconButton as in design
2019-11-15 16:14:18 +01:00
Bruno Windels
942a1c9a56
fix e2e icon in composer having wrong colors
2019-11-15 16:14:18 +01:00
Bruno Windels
e3f7fe51dc
use normal shield for verification requests
2019-11-15 16:14:18 +01:00
Bruno Windels
fe059e524f
don't need this, as it takes height from the constrained width
2019-11-15 16:14:18 +01:00
Bruno Windels
030827f77d
mark destructive actions in red
2019-11-15 16:14:18 +01:00
Bruno Windels
0bd1e7112d
style security section as per design
2019-11-15 16:14:18 +01:00
Bruno Windels
73b6575082
fixup: verified shield should be green
2019-11-15 16:14:18 +01:00
Bruno Windels
0a2255ce73
fixup: bring back margin above display name
2019-11-15 16:14:18 +01:00
Bruno Windels
3e356756aa
style profile info
2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9
restyle e2e icons
2019-11-15 16:14:18 +01:00
Bruno Windels
af4ad488bd
Restyle Avatar
...
Make it a circle with the profile picture centered,
with a max height/width of 30vh
2019-11-15 16:14:18 +01:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir
2019-11-12 10:00:01 -07:00
Michael Telatynski
1c4d89f2d7
Migrate all standard Context Menus over to new custom framework
2019-11-11 17:53:17 +00:00
J. Ryan Stinnett
cc9ef57f0e
Merge pull request #3609 from matrix-org/jryans/rounded-style-bar
...
Fix draw order when hovering composer format buttons
2019-11-11 17:40:58 +02:00
J. Ryan Stinnett
ef05294133
Fix draw order when hovering composer format buttons
...
This ensures all 4 sides of a button show the hover border colour as intended.
Another part of https://github.com/vector-im/riot-web/issues/11203
2019-11-11 10:24:40 +00:00
J. Ryan Stinnett
719709250b
Merge pull request #3605 from matrix-org/jryans/rounded-style-bar
...
Fix rounded corners for the formatting toolbar
2019-11-08 20:01:31 +02:00
J. Ryan Stinnett
e161e99b63
Fix rounded corners for the formatting toolbar
...
The formatting toolbar is meant to have rounded corners like the message action
bar.
Fixes https://github.com/vector-im/riot-web/issues/11203
2019-11-08 17:46:08 +00:00
J. Ryan Stinnett
2a5dc9bfac
Remove lint comments about no-descending-specificity
...
We have disabled the `no-descending-specificity` stylelint rule, so we no longer
need these block comments.
2019-11-08 16:35:42 +00:00
David Baker
3070ee6d7b
Put back the grouped rule & disable the linting rule instead
2019-11-08 16:10:51 +00:00
David Baker
4283f9ec74
Split CSS rule to fix descending specificity lint error
2019-11-08 16:01:53 +00:00
Bruno Windels
2516d8ee61
fix repeated css class
2019-11-07 20:11:31 +01:00
Bruno Windels
0d2f9c4215
add verification request tile + styling
2019-11-07 19:54:56 +01:00
Michael Telatynski
c00974d22d
Now that part of spacing is padding, make it smaller when collapsed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-11-07 10:16:57 +00:00
David Baker
d14c0c342d
Merge pull request #3594 from matrix-org/bwindels/fixfilenotifpanel
...
Fix: file and notifications panel back-paginating forever.
2019-11-06 10:52:15 +00:00
David Baker
328fc5a02d
fix style lint
2019-11-06 10:41:10 +00:00
Bruno Windels
eb4220a836
scroll panels should be in flex container so they don't grow w/ content
2019-11-06 10:34:22 +01:00
Michael Telatynski
888da3ad84
delint stylesheet
2019-11-05 12:01:30 +00:00
Michael Telatynski
99c8a909b3
Fix focus-within on EventTile and more showing onClick
2019-11-04 16:47:20 +00:00
Michael Telatynski
92ee50fb77
Merge pull request #3587 from matrix-org/t3chguy/a11y_message_actions_bar
...
Improve A11Y of timeline. Show timestamp & Actions on focus-within
2019-11-04 10:33:16 +00:00
Michael Telatynski
10a63ada48
Fix SVG mask-image usage in a bunch of places for correct outlining
2019-11-01 14:46:30 +00:00
Michael Telatynski
fd4cdd0dec
Improve A11Y of timeline. Show TS & Actions on focus-within
2019-11-01 10:50:58 +00:00
Travis Ralston
3c45a39caa
Appease the other linter
2019-10-31 16:30:51 -06:00
Travis Ralston
11068d189c
Hide messages blocked by ban lists
2019-10-31 16:19:42 -06:00
Travis Ralston
39b657ce7c
Add basic structure for (un)subscribing from lists
2019-10-31 15:54:22 -06:00
Travis Ralston
b93508728a
Add personal list management to Mjolnir section
2019-10-31 14:24:51 -06:00
Travis Ralston
23383419e8
Add settings base for Mjolnir rules
2019-10-31 13:20:18 -06:00
J. Ryan Stinnett
e661e3b115
Fix quick reactions to be aligned with other emoji
...
This uses center alignment for quick reactions as well, so that they line up
with the larger emoji categories above.
2019-10-28 13:17:59 +00:00
Michael Telatynski
2e6899be93
Improve Accessibility of the new Emoji picker
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-23 18:39:39 +01:00
Michael Telatynski
190fccea15
delint scss
2019-10-22 16:35:36 +01:00
Michael Telatynski
e7f292794c
Merge pull request #3556 from matrix-org/t3chguy/a11y4
...
Use Navigation Treeview pattern for RoomList Accessibility
2019-10-22 13:42:08 +01:00
Michael Telatynski
ebc5628782
fix typo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-22 11:30:47 +01:00
Michael Telatynski
2a3655e9b8
Focus highlight room sublist label, catch right arrow and simplify code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-22 11:10:25 +01:00
Michael Telatynski
c5d5cd72bc
Merge pull request #3465 from matrix-org/t3chguy/nvl/userinfo
...
UserInfo consolidation of GroupMemberInfo and MemberInfo panels
2019-10-21 15:50:08 +01:00
Tulir Asokan
438ad54701
Remove space between emojis in picker
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-20 12:31:28 +03:00
Tulir Asokan
be829980f6
Split inline SVGs to their own files
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-20 12:13:32 +03:00
Michael Telatynski
f09a3b4281
Fix outline on RoomSubList badges
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-17 16:21:33 +01:00
Michael Telatynski
3400808f6e
Use navigation treeview aria pattern for roomlist sublists and tiles
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-17 15:53:39 +01:00
Tulir Asokan
6ce2e3d796
Make selected emojis more transparent
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-15 19:10:10 +03:00
Tulir Asokan
318754d31c
Reorganize reaction sending and show if emoji is selected
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-15 19:07:04 +03:00
Tulir Asokan
a6e0986bf8
Improve style
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-14 20:38:09 +03:00
Tulir Asokan
e16d0bfa4d
Underline visible sections in header
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-14 20:14:44 +03:00
Tulir Asokan
088c9bff9e
Add recently used section and scroll to category
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-14 19:41:10 +03:00
Tulir Asokan
497b779334
Add full emoji picker for reactions
...
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-14 00:32:11 +03:00
Michael Telatynski
6e33cc0650
Merge pull request #3433 from matrix-org/t3chguy/nvl/react16/EventListSummary
...
Summarise state events after room creation
2019-10-11 09:53:26 +01:00
Michael Telatynski
5643743167
Don't intercept TAB on the app outside of the composer, fix tabIndex > 0
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-10 14:13:29 +01:00
Michael Telatynski
37b8b52d0d
regenerate components
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:50:19 +02:00
Michael Telatynski
34530843f4
Factor out generic EventListSummary from MELS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 12:50:03 +02:00
Michael Telatynski
df02eb8e92
Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-07 16:52:50 +01:00
Travis Ralston
c547367b62
Merge pull request #3513 from matrix-org/travis/mask-eye
...
Use a mask instead of an img for "Show image" eye
2019-10-07 12:45:22 +01:00
David Baker
ae7ecf7f8f
Merge pull request #3512 from matrix-org/jryans/error-boundary
...
Add error boundaries to catch rendering errors
2019-10-03 10:49:03 +01:00
Travis Ralston
0491b742c2
Use a mask instead of an img for "Show image" eye
...
See https://github.com/matrix-org/matrix-react-sdk/pull/3492#pullrequestreview-296223646
2019-10-02 12:52:07 -06:00
Travis Ralston
b94c94db04
Merge pull request #3492 from matrix-org/travis/hide-images
...
Add an option to hide image previews
2019-10-02 12:46:45 -06:00
J. Ryan Stinnett
0e8dc24c3f
Add a basic error boundary for the entire app
...
This adds a basic error boundary around the entire app to catch errors during
rendering and present the user with the options on how to proceed. This is not
implemented as a modal so that it could be used selectively in portions of the
app as well, such as just the `RoomView`.
Fixes https://github.com/vector-im/riot-web/issues/11009
2019-10-02 17:31:22 +01:00
Bruno Windels
4bd72b1494
dont let placeholder show scrollbar when composer is narrow
2019-10-02 11:36:56 +02:00
Bruno Windels
c8c4dc29d1
Merge pull request #3503 from matrix-org/bwindels/custom-themes-mvp
...
Custom theming MVP
2019-10-02 09:14:07 +00:00
Bruno Windels
fbc3f68fd2
remove old style
2019-10-02 11:06:31 +02:00
Travis Ralston
4b0596b6b7
Apply lipstick to hidden image design
2019-10-01 17:00:01 -06:00
Travis Ralston
3c589cffec
Merge branch 'develop' into travis/hide-images
2019-10-01 09:31:54 -06:00
Bruno Windels
15b7a5af31
fix contrast issue
...
when badges with and without highlighted state have a very
different brightness (as they might do in dark mode), hardcoding
the fg color of a badge independent of it's highlighted state
to $accent-fg-color doesn't work well, so add an extra SASS
variable we can reassign to something more specific in the custom theme
2019-10-01 16:58:14 +02:00
Travis Ralston
59b29e4a7f
Add an option to hide image previews
...
Applies to images, stickers, and URL previews.
Fixes https://github.com/vector-im/riot-web/issues/10735
2019-09-27 21:08:31 -06:00
J. Ryan Stinnett
d80a2df979
Move document name to new column
2019-09-27 17:57:10 +01:00
Michael Telatynski
192dcbb31f
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-27 09:14:29 +01:00
Michael Telatynski
8d1d3090f3
Improve keyboard accessibility using :focus-visible CSS polyfill
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-27 09:00:54 +01:00
Bruno Windels
cca41c184c
very basic color pickers for custom theme
2019-09-26 17:35:06 +02:00
Bruno Windels
151af65e4f
hide details summary arrow in create room dialog on webkit too
2019-09-23 18:05:44 +02:00
Bruno Windels
0ab7962ebd
add z-index to format bar so it appears above status area and reply wrapper
2019-09-23 14:06:59 +02:00
Bruno Windels
3c7a0f4c49
remove invalid css
2019-09-23 11:22:30 +02:00
Bruno Windels
6a3723c69e
dialog styling
2019-09-23 11:22:30 +02:00
Bruno Windels
8a1c1bbec4
implement RoomAliasField component
...
adding a postfix to Field to show the domain name
2019-09-23 11:22:30 +02:00
David Baker
6f3f0f0a3c
Merge pull request #3430 from matrix-org/bwindels/roomdirectorybuttonwrap
...
Dont wrap text in room directory buttons
2019-09-12 16:56:45 +01:00
Bruno Windels
2bed264b0d
dont wrap text in room directory buttons
2019-09-12 15:59:15 +02:00
Bruno Windels
e6554bdaad
Merge pull request #3429 from matrix-org/bwindels/breadcrumbs-empty
...
Breadcrumbs: show placeholder for empty slot
2019-09-12 12:56:58 +00:00
Bruno Windels
df8ce7fb33
Show placeholder for empty slot in breadcrumbs
2019-09-12 14:46:54 +02:00
Bruno Windels
a4f8f34368
Merge pull request #3423 from matrix-org/bwindels/register-selector-wrap
...
Fix register page selector buttons growing too wide
2019-09-12 10:28:50 +00:00
Bruno Windels
cc67742fa9
undo whitespace setting, accessible button is used in too many places to make this a safe assumption
2019-09-12 12:24:05 +02:00
Bruno Windels
95060d4e95
reduce vertical padding around explore/filter
2019-09-12 11:27:20 +02:00
Bruno Windels
4ae4e68967
make explore button and filter field equal width
2019-09-12 11:11:32 +02:00
Bruno Windels
886402fe31
reduce padding on dialogs, as in design
2019-09-11 16:23:59 +02:00
Bruno Windels
24c4a16da1
adapt design of room list in directory
2019-09-11 16:23:59 +02:00
Bruno Windels
6f62cdb22c
basic styling to make it look ok before applying new design
2019-09-11 15:45:51 +02:00
Bruno Windels
4148f1697c
make input fields on a dark panel have a white background (filter field)
2019-09-10 11:11:08 +02:00
Bruno Windels
fdadc615f7
make explore button white on hover
2019-09-10 11:11:08 +02:00
Bruno Windels
1c4093eb0f
make filter feed transparent when not focussed
2019-09-10 11:11:08 +02:00
Bruno Windels
da98080859
hide explore button when focusing filter field
2019-09-10 10:57:25 +02:00
Bruno Windels
80dd5a1b0a
add explore button next to filter field
2019-09-10 10:55:55 +02:00
Bruno Windels
8820546f49
Merge pull request #3390 from matrix-org/bwindels/selection-color
...
Remove accent color as selection color
2019-09-06 09:12:42 +00:00
Bruno Windels
06143ba7a1
show keyboard shortcuts in format button tooltip
2019-09-06 10:59:41 +02:00
Bruno Windels
042822c90a
copyright is solely assigned to matrix foundation now, copy paste error
2019-09-06 10:39:19 +02:00
Bruno Windels
b4b9c7d072
Add tooltip for format buttons
2019-09-06 10:39:19 +02:00
Bruno Windels
da29057fd8
move format bar to own component
2019-09-06 10:39:19 +02:00
Bruno Windels
39bbf9af24
remove accent color as selection color
2019-09-05 15:40:33 +02:00
Bruno Windels
e3d70f3999
ensure selection is not lost upon clicking format bar in chrome
2019-09-05 11:01:44 +02:00
Bruno Windels
af535986d2
fix css lint
2019-09-04 16:40:34 +02:00
Bruno Windels
e7db660820
fixup: css, we have 5 buttons
2019-09-04 16:39:07 +02:00
Bruno Windels
65ddfc0a50
show format bar when text is selected
2019-09-04 16:35:03 +02:00
Bruno Windels
1063da0ed1
Revert "New composer: show markdown legend on focus"
2019-09-03 08:27:45 +00:00
Bruno Windels
422f482a6d
Merge pull request #3378 from matrix-org/bwindels/cider-md-legend
...
New composer: show markdown legend on focus
2019-09-02 14:59:44 +00:00
Bruno Windels
b7768f34f2
Add legend and style it
2019-09-02 16:15:18 +02:00
J. Ryan Stinnett
3feeaceb68
Restrict green link colours to address picker dialog
...
This changes to a more targeted selection of what becomes green (just the
actionable links in address picker).
Fixes https://github.com/vector-im/riot-web/issues/10703
2019-09-02 10:33:19 +01:00
J. Ryan Stinnett
27fdef557d
Merge pull request #3359 from matrix-org/jryans/features-without-is
...
Allow connecting to an IS from address picker
2019-08-30 10:19:28 +01:00
J. Ryan Stinnett
166fb696c2
Allow connecting to an IS from address picker
...
This allows those who previously disconnected from an IS to either choose the
default IS or a custom one from Settings via the address picker dialog.
Part of https://github.com/vector-im/riot-web/issues/10619
2019-08-29 15:28:34 +01:00
Sorunome
fe9ae46ffb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers
2019-08-28 20:23:24 +02:00
J. Ryan Stinnett
599fccd9ce
Merge pull request #3343 from matrix-org/jryans/hide-is-field-during-auth
...
Reveal custom IS field only when required
2019-08-28 18:36:02 +01:00
Michael Telatynski
7ef087db86
Merge pull request #3354 from matrix-org/t3chguy/avatar_change_cursor_perms
...
Don't use cursor: pointer on roomsettings avatar if you can't change it
2019-08-28 17:44:31 +01:00
Bruno Windels
f119ac4b22
Merge pull request #3349 from matrix-org/bwindels/tab-complete-name
...
New composer: support forcing auto complete on name by hitting tab
2019-08-28 16:17:16 +00:00
Bruno Windels
eddaece43e
add visual bell color to theme + choose better value for dark mode
2019-08-28 18:00:57 +02:00
Bruno Windels
85efb71a23
add visual bell when no replacements are available
...
also add try/catch in _tabCompleteName so errors don't get swallowed
2019-08-28 15:53:16 +02:00
Michael Telatynski
591fa3d8c5
Don't use cursor: pointer on roomsettings avatar if you can't change it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 14:46:47 +01:00
J. Ryan Stinnett
72ec6c7062
Reveal custom IS field only when required
...
This hides the identity server at first from the custom server auth flows. For
the flows that may need an IS if the HS requires it (registration, password
reset), we then check with the HS before proceeding further and reveal the IS
field if it is in fact needed.
Fixes https://github.com/vector-im/riot-web/issues/10553
2019-08-23 18:43:55 +01:00
Travis Ralston
266e3af475
Appease the scss linter
2019-08-23 09:20:28 -06:00
Travis Ralston
b3cda4b19a
Support multiple integration managers behind a labs flag
...
Fixes https://github.com/vector-im/riot-web/issues/10622
Implements [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957 )
Design is not final.
2019-08-23 09:12:40 -06:00
Bruno Windels
f39dc6feab
Merge pull request #3287 from matrix-org/bwindels/new-main-composer
...
Support editing composer to be used as main composer (feature flagged)
2019-08-23 10:06:19 +00:00
Bruno Windels
4a27abb131
fix css lint
2019-08-22 15:11:31 +01:00
Bruno Windels
71286b5610
restore reply_to_event action
2019-08-22 13:33:20 +01:00
Bruno Windels
d4ca087abe
fix styling issues
...
- grow/shrink between min and max height correctly
- don't grow wider than available space
- some space between editor and buttons
2019-08-22 13:33:20 +01:00
Bruno Windels
33c6945fc4
align autocomplete at top of composer
2019-08-22 13:33:20 +01:00
Bruno Windels
64e83a8111
font-size
2019-08-22 13:33:20 +01:00
Bruno Windels
f9992a1fc6
implement editor placeholder
2019-08-22 13:33:20 +01:00
Bruno Windels
cfbd2e9cc8
support basic sending with new main composer
...
this removes all formatting options, as the new editor doesn't
have any.
2019-08-22 13:33:20 +01:00
Bruno Windels
92d7263046
move editor padding to edit specific style file
...
as it will be different for the main composer
2019-08-22 13:33:20 +01:00
Bruno Windels
505846ce53
split up css, update class names
2019-08-22 13:33:20 +01:00
Travis Ralston
6449016d4b
Fix alignment of discovery section addresses
...
We target the addresses specifically to avoid crushing the subsection text.
2019-08-21 14:41:25 -06:00
Travis Ralston
04bb2ed322
Merge pull request #3327 from matrix-org/travis/discover-terms
...
Handle terms agreement in Discovery section of user settings
2019-08-21 10:14:45 -06:00
Travis Ralston
0b2331440b
Newlines mean everything
2019-08-20 13:24:51 -06:00
Travis Ralston
f55a40001c
Touch up settings: alignment, spacing, error states
...
Fixes https://github.com/vector-im/riot-web/issues/10554
Issues fixed:
* Fields were not ~30px from the avatar (too much right margin)
* Tooltips overflowed the dialog on some resolutions
* SetIdServer didn't have an error state for making the field red
* Spacing between sections in Discovery was wrong (fixed by just removing the problematic n+2 selector - it didn't help anything)
2019-08-20 13:20:07 -06:00
David Baker
f5da870040
Merge pull request #3326 from matrix-org/dbkr/device_name_public
...
Clarify that device names are publicly visible
2019-08-20 09:29:45 +01:00
Travis Ralston
3181829532
Use new InlineTermsAgreement component on IS Discovery section
...
Fixes https://github.com/vector-im/riot-web/issues/10522
2019-08-19 23:00:05 -06:00
Travis Ralston
417de0cac7
Add an inline terms agreement component
...
Handles agreement of terms in an inline way.
2019-08-19 22:59:33 -06:00
David Baker
f7083ac332
Clarify that device names are publicly visible
...
And also a bunch of other UI fixes in the devices table:
* It's the devices table, don't need 'device' in all the headers
* Not really necessary to label checkboxes with 'select'
* Stop table from moving down when the delete button appears
Fixes https://github.com/vector-im/riot-web/issues/10216
2019-08-19 18:09:37 +01:00
J. Ryan Stinnett
8a7b43fd1a
Tweak Settings padding / margin slightly
...
This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554 will
soon take a holistic view on the problem, so this is a more conservation
temporary change.
2019-08-19 15:45:04 +01:00
J. Ryan Stinnett
7cc27beb44
Remove custom font size for IM URL
...
As best as I can tell, the designs call for the IM URL to be the same size as
other subheadings. The font size in Zeplin doesn't match what is currently used
in Settings, so this likely caused confusion.
2019-08-19 14:34:22 +01:00
Travis Ralston
02a4121401
Mixin for field width
2019-08-14 08:55:49 -06:00
Travis Ralston
beb6ec4327
Merge branch 'develop' into travis/integs/account_set
2019-08-14 08:45:01 -06:00
Travis Ralston
d4bbed31d5
Merge branch 'develop' into travis/integs/account_set
2019-08-13 09:03:50 -06:00