Robin Townsend
e798b36f1d
Decorate forward dialog room avatars
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-16 08:39:22 -04:00
Robin Townsend
64e828d069
Merge branch 'develop' into improved-forwarding-ui
2021-05-16 08:13:59 -04:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276
...
Decorate room avatars with publicity in add existing to space flow
2021-05-14 11:23:46 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674
...
Improve Spaces "Just Me" wizard
2021-05-14 10:58:55 +01:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622
2021-05-13 16:12:42 +01:00
Michael Telatynski
6aa477f0f5
Decorate room avatars with publicity in add existing to space flow
2021-05-13 14:23:28 +01:00
Michael Telatynski
423c515708
Consolidate AddExistingToSpace between Dialog and Just Me integrated flow
2021-05-13 09:46:45 +01:00
Michael Telatynski
565e41c3df
Extract UntrustedDeviceDialog and fix e2ee icon
2021-05-12 17:04:24 +01:00
Michael Telatynski
607ca17971
Iterate beta feedback dialog
2021-05-12 16:11:38 +01:00
Michael Telatynski
7396ce76e5
Tweak the feedbacks a tad
2021-05-11 17:30:33 +01:00
Robin Townsend
7efbd2d930
Hide unencrypted badge from ForwardDialog preview
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:57:47 -04:00
Robin Townsend
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Robin Townsend
bfba2b0b6f
Push ForwardDialog scrollbar into the gutter
...
…to give more space between it and the buttons.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 11:16:51 -04:00
Robin Townsend
b9b237fc9a
Replace forwarding UI with dialog
...
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690 .
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Michael Telatynski
70087b30bf
Add disclaimer about subspaces being experimental in add existing dialog
2021-05-05 17:53:31 +01:00
Michael Telatynski
acce9a4548
Fix rounded progress bars
2021-05-05 11:50:55 +01:00
Michael Telatynski
07f5b6e8c4
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 11:45:12 +01:00
Michael Telatynski
8656212eb9
Space creation prompt user to add existing rooms instead of creating new ones
2021-04-26 12:41:04 +01:00
Robin Townsend
3d7842d696
Remove old FormButton CSS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:25:04 -04:00
Robin Townsend
0f84b3dff3
Align checkboxes with names in add rooms to space dialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:25:04 -04:00
Robin Townsend
024cf7f66c
Cut off long names in add rooms to space dialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:24:50 -04:00
Šimon Brandner
910a3e5f31
A little nicer spacing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 20:59:54 +02:00
Šimon Brandner
b52d6e3d97
A tiny change to make the dialog a little nicer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 20:52:40 +02:00
Travis Ralston
262475f96e
Add a button to reset personal encryption state during login
2021-03-30 15:37:06 -06:00
Michael Telatynski
6e0ab86168
Small usability tweaks to the add existing to space dialog
2021-03-24 14:10:26 +00:00
Michael Telatynski
fb46815b6a
Spaces move away from Form Buttons
2021-03-24 13:15:31 +00:00
Jason Robinson
f2d2a048e1
Ensure HostSignupDialog border colour matches light theme
...
Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
2021-03-04 11:07:14 +02:00
Michael Telatynski
e479edd47a
Add an add existing room to space CTA to Space View
2021-03-02 13:34:53 +00:00
Michael Telatynski
ab4b7b73ea
Add a basic Space Settings view
2021-03-02 13:26:00 +00:00
Travis Ralston
10b0051c02
Appease the linter
2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58
Add developer tool to explore and edit settings
2021-02-18 14:56:19 -07:00
Jason Robinson
538272a827
Tweak the dialog dimensions
...
Make height/width max (as per design wish) and
actual based on viewport.
2021-02-10 15:13:01 +02:00
Jason Robinson
c92a930d0a
Fix positioning of minimize action and add titles
2021-02-09 12:40:12 +02:00
Jason Robinson
3ed6f1fe5d
Fix maximise and minimise icon references
2021-02-09 12:22:58 +02:00
Jason Robinson
03fe0f1f17
s not z
2021-02-04 23:17:48 +02:00
Jason Robinson
f5f8050172
Add minimize button to HostSignupDialog.tsx
2021-02-04 23:09:58 +02:00
Jason Robinson
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
Jason Robinson
3901cd9c72
WIP
2021-01-15 17:02:28 +02:00
Jason Robinson
90a1c5a267
WIP
2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414
WIP
2021-01-15 15:32:30 +02:00
Jason Robinson
d4a58bdb2a
WIP minimize
2021-01-14 11:53:20 +02:00
Jason Robinson
3da5049dc7
WIP minimize
2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa
WIP minimize
2021-01-12 14:08:09 +02:00
Jason Robinson
e8c716f33e
First stage of host signup flow now sits here
...
Need to make things configurable, image and text for the first step should be configurable.
Also missing privacy related words, though they should be configurable too.
2021-01-11 15:47:21 +02:00
Jason Robinson
5f84371038
Update some copyrights
2021-01-05 14:29:48 +02:00
Jason Robinson
bb53ae8038
Rename Element Pro -> Host Signup
2021-01-04 16:05:49 +02:00
Jason Robinson
7a358b1ca3
Rename components to be less EMS specific
2020-12-28 11:21:42 +02:00
Jason Robinson
5aa24b97cd
Merge remote-tracking branch 'origin/develop' into jaywink/elementPro
2020-12-16 14:45:16 +02:00
Jason Robinson
db370f218e
Rename also _HostingSignupDialog.scss
2020-12-15 10:53:59 +02:00
Jason Robinson
cd836be809
Rename everything HostingSignup -> EMSElementPro
...
This setup flow ended up quite specific due to all the various moving parts.
2020-12-15 10:50:38 +02:00
Will Hunt
8d203043d4
Remove hide/show behaviour
2020-12-14 12:59:59 +00:00
Jason Robinson
5ad9b83870
Fix copyright strings
2020-11-27 15:10:35 +02:00
Jason Robinson
c818a719bf
Try a slightly larger HostingSignupDialog
...
Make HostingSignupBaseDialog larger
2020-11-27 15:10:35 +02:00
Jason Robinson
bdab1faf16
Fix hosting signup dialog height
2020-11-27 15:10:35 +02:00
Jason Robinson
b3b3f5ebeb
Fix HostingSignupDialog layouting inside dialog
2020-11-27 15:10:35 +02:00
Jason Robinson
c7706ac3d5
Add possibility for hosting provider IFrame
...
Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.
Add iframe for hosting provider signup content
2020-11-27 15:10:35 +02:00
Michael Telatynski
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
Michael Telatynski
b1ca1eb3f5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-11-24 11:30:51 +00:00
Michael Telatynski
2263280035
Improve no email warning during registration
2020-11-23 10:25:46 +00:00
Travis Ralston
c80b0aff7d
Appease the linter
2020-11-19 12:09:57 -07:00
Travis Ralston
0104164d51
Approximate the design as proposed
2020-11-19 12:06:24 -07:00
Travis Ralston
a212dab84c
Developer design a permissions dialog
2020-11-17 20:38:59 -07:00
Michael Telatynski
3b7b66c856
Change out caption for email invite suggestions and stack vertically
2020-11-03 14:56:06 +00:00
Michael Telatynski
66377eb731
Invite UX tweaks:
...
+ re-focus input field after all interactions
+ change textarea to text input
+ fix margins between things
+ improve keyboard usage with enter/space autofilling
2020-11-03 13:14:35 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Michael Telatynski
b6fd2a0691
Iterate the Modal Widget Dialog paddings and phishing warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:22 +01:00
Michael Telatynski
00b1a03a3e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
...
Conflicts:
src/@types/global.d.ts
src/FromWidgetPostMessageApi.js
src/WidgetMessaging.js
src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00
J. Ryan Stinnett
43ea5de320
Adjust Settings styles
2020-10-07 20:23:34 +01:00
J. Ryan Stinnett
f2b72efe39
Remove various remaining bits of ILAG flows
...
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +01:00
Michael Telatynski
13d09df7d7
tidy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 11:59:39 +01:00
Michael Telatynski
44bc8fc67e
Initial Modal Widget work tweaks MSC2790
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 14:08:27 +01:00
J. Ryan Stinnett
ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup
...
Defer encryption setup until first E2EE room
2020-09-18 10:28:33 +01:00
Michael Telatynski
c11abb74e0
UI Feature Flag: Share dialog QR code and social icons
2020-09-16 16:06:17 +01:00
J. Ryan Stinnett
46f37fb969
Create cross-signing keys during authentication
...
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7bd5e3fa31
Move security-related dialogs to a common directory
2020-09-16 15:03:06 +01:00
Travis Ralston
fdbaddbace
Add a simple edit dialog for communities
2020-08-31 10:52:08 -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
Travis Ralston
cc2fc911af
Minor copy addition to DM dialog for communities prototype
2020-08-28 10:03:27 -06:00
Travis Ralston
82b015bd5f
Rename components to match prior convention
2020-08-26 08:52:39 -06:00
Travis Ralston
5ea11e90b2
Appease the style linter
2020-08-25 21:17:35 -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
Michael Telatynski
8aa50ecb59
Iterate rageshake download styling
2020-08-13 13:08:07 +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
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
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
J. Ryan Stinnett
f28bce36e1
Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons
2020-07-31 18:23:57 +01:00
J. Ryan Stinnett
72056128fe
Larger chevron for rebrand
2020-07-30 17:41:26 +01:00
J. Ryan Stinnett
e917c0d92e
Replace all chevrons with a single icon
...
This replaces all chevrons with a single icon, affecting components like the
room list, network dropdown, and rebrand modal.
Rather than having files for each direction that can get out of sync, this
change uses one direction and rotates in CSS for the others.
Fixes https://github.com/vector-im/riot-web/issues/14663
2020-07-30 16:49:46 +01:00
Travis Ralston
c5574219bb
Implement dialog for resending local echo transactions
2020-07-29 20:36:04 -06:00
Jorik Schellekens
d55699211e
Update copy icon on pre block and share dialogues
2020-07-27 15:13:02 +01:00
Swapnil Raj
4006ae6701
Fix copy button in share dialog
2020-07-16 10:30:31 +01:00
Travis Ralston
17dba01993
Fix style lint
2020-07-15 03:49:59 -06:00
David Baker
8701e9293e
Add in-app rebranding toasts & prompts
...
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
2020-07-10 15:32:34 +01:00
Bruno Windels
571bd30898
update call icons
2020-07-08 18:02:30 +02:00
Bruno Windels
df072a12b2
room settings icons
2020-07-07 12:30:02 +02:00
Bruno Windels
af333db6ae
change settings icons
2020-07-07 12:16:03 +02:00
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2
...
Add file upload button to recovery key input
2020-06-30 18:06:12 +01:00
David Baker
1e457994f9
More padding between header & text in radio button
2020-06-30 11:10:12 +01:00
David Baker
15ebaa1470
Port recovery key upload button to new designs
2020-06-26 15:22:04 +01:00
David Baker
178cbca934
Use mask images in key entry dialogs
2020-06-26 12:56:41 +01:00
David Baker
e18ea55d20
Convert icons to masks
...
so they're a sensible colour in other themes
2020-06-26 12:41:24 +01:00
David Baker
2b144a846a
Apply some of the newer styling to passphrase / recovery key entry
2020-06-25 12:44:15 +01:00
David Baker
966837232c
Add header icons & justification
2020-06-24 16:12:46 +01:00
David Baker
0694776b25
Update the 'save your security key' screen
2020-06-23 16:27:41 +01:00
David Baker
6ce8584337
Implement first screen (recovery key / passphrase choice)
2020-06-23 15:04:39 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases"
2020-06-18 09:35:11 +01:00
David Baker
6f3bfc96ca
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases
2020-06-03 11:01:43 +01:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD
...
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
2020-06-03 10:45:47 +01:00
David Baker
b83ecb1781
Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases
2020-06-02 18:53:54 +01:00
David Baker
f54bac0e95
Use recovery keys over passphrases
...
Step 1 - change CreateSecretStorageDialog to just give a recovery key
rather than a passphrase.
2020-05-29 15:42:07 +01:00
Jorik Schellekens
66c0d53f3e
Create and use stylised checkboxes
2020-05-28 22:33:00 +01:00
Jorik Schellekens
1ab6f27535
Stop copy icon repeating weirdly.
2020-05-28 19:37:49 +01:00
Michael Telatynski
8aaa7825ef
Also kill off things that these kept behind
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:12:19 +01:00
Michael Telatynski
f0cabd55c0
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
...
as we now always `setGlobalErrorOnUnknownDevices(false)`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:01:22 +01:00
David Baker
563a36e0a1
Remove unused CSS too
2020-05-26 13:42:00 +01:00
Jorik Schellekens
6d9d4ee547
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider
2020-05-20 13:46:17 +01:00
Michael Telatynski
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour
...
Consolidate password/passphrase fields into a component & add dynamic colour to progress
2020-05-18 11:08:08 +01:00
Michael Telatynski
f2979f3fd8
replace zxcvbn field in CreateKeyBackupDialog with PassphraseField
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:59:46 +01:00
Michael Telatynski
865495dd69
replace zxcvbn field in CreateSecretStorageDialog with PassphraseField
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:50:22 +01:00
Michael Telatynski
d1c6f3099c
move styling to QRCode scss
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:06 +01:00
Michael Telatynski
1ba19e78f8
Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode
...
Conflicts:
package.json
2020-05-14 10:50:42 +01:00
Jorik Schellekens
33a5b5142d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider
2020-05-07 18:01:20 +01:00
Zoe
465442c31e
fragments and i18n don't play nice together
2020-04-29 15:13:24 +01:00
Zoe
326d567468
Fixed the dialog height
2020-04-29 14:29:36 +01:00
Jorik Schellekens
600a812227
Add brush icon for appearance setting tab
2020-04-23 12:20:10 +01:00
Michael Telatynski
237084da78
wrap node-qrcode in a React FC and use it for ShareDialog instead of qrcode-react
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 23:46:58 +01:00
Michael Telatynski
ffecf03b2a
Update margins to improve grouping
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:48:50 +01:00
Michael Telatynski
4041c030a5
Apply changes from Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a
Update styling and copy to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
Michael Telatynski
ada860f163
Add toggle for e2ee when creating private room in x-signing world
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
Jorik Schellekens
3ed457ea7d
Merge pull request #4305 from JorikSchellekens/joriks/font-scaling
...
Make all 'font-size's and 'line-height's rem
2020-04-02 17:40:39 +01:00
Michael Telatynski
6293684218
Fix Room Settings Dialog Notifications tab icon
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-01 12:57:28 +01:00
Jorik Schellekens
6cf9166c4a
Use variables for the rem values.
...
It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase.
2020-03-31 15:26:23 +01:00
Jorik Schellekens
da34e6241d
Make all 'font-size's and 'line-height's rem
...
Font size of the whole app would ideally be controlled by a single
value. This value is currently hard coded using the :root CSS selector.
It is the intention to make this value configurable within riot. In the
interim all font-sizes have been converted to rem by the simple process
of regex. Replacing px values with their equivalent rem values assuming
a font size of 15px and then rounded to three decimal places, which was
the base at the time of this transformation.
I'm expecting another commit cleaning up rem values but I thought it
best to leave that to review.
This commit doesn't address any scaling issues. I thought it better to
land this unwieldy, mechanical, invisible change before the others
otherwise the pr would be impossible to review thoroughly.
2020-03-30 18:23:46 +01:00
Michael Telatynski
578b3f2b97
Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 19:07:33 +00:00
Michael Telatynski
d593a76f28
Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd
2020-03-18 20:41:13 +00:00
Michael Telatynski
1d5001544c
Improve colouring
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 17:32:36 +00:00
Michael Telatynski
9cda84c675
fix kbd background colour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:54:46 +00:00
Michael Telatynski
cad28c81c0
Add Keyboard shortcuts dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
Michael Telatynski
1b933b7bfe
remove UnknownDeviceDialog gemini specific css
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:54:13 +00:00
Michael Telatynski
b68d4583d1
migrate UnknownDeviceDialog away from Gemini
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:49:28 +00:00
Zoe
0663ab3b87
lint, and detect new requests
2020-02-24 10:17:33 +00:00
Zoe
72789897a0
Quick n dirty verificatio request viewer in devtools
2020-02-21 17:15:53 +00:00
Michael Telatynski
0393a57b5a
fix submit button disabled breaking async task
2020-02-09 14:49:54 +00:00
unknown
aa52118fa1
the width was not properly set to other languages than english, a min-width will keep the proper size of the button while leaving some room for more word expensive languages such as french
2020-02-02 17:31:06 +01:00
Michael Telatynski
a180dddc66
Pass an ID to the <Field/> as needed and fix div inside p nesting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:31:19 +00:00
David Baker
39c8a9d204
Start new key backup in security setup flow
...
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
Half-Shot
bfaa9d56fb
prefixes
2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 16:01:50 +00:00