a
/
code-server-2
mirror of https://git.tuxpa.in/a/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,373 Commits 18 Branches 71 Tags 90 MiB
Commit Graph

414 Commits

Author SHA1 Message Date
Joe Previte 74d6d5e1e1
fix: remove unnecessary grep line in fmt script 2020-12-17 10:00:32 -07:00
Joe Previte fdde5a87a5
chore: format lint file 2020-12-16 17:04:49 -07:00
Joe Previte be97f80d00
fix: add grep -v lib/vscode to git ls-files 2020-12-16 16:56:44 -07:00
Joe Previte e391f68fcd
docs: update workflow and remove yarn vscode 2020-12-16 11:48:43 -07:00
Joe Previte 5830532726
refactor: remove submodule code from steps scripts 2020-12-16 11:48:02 -07:00
Joe Previte fcc16e5397
refactor: move vscode.sh to postinstall 2020-12-16 11:47:20 -07:00
Joe Previte 25e6f8414a
feat: remove vscode scripts used with submodule 2020-12-15 15:59:12 -07:00
Joe Previte faeed81d43
feat: add vscode:clean script 2020-12-15 14:54:07 -07:00
Asher 9fb661d91e
Use patience algorithm for diffs 
This should prevent us from generating different diffs and adding noise
to our PRs. Patience seems like a good one; it generated a diff that I
felt was easier to read in the case of the yarn.lock optionator section.
 2020-12-15 11:14:56 -06:00
Asher f8b782bd68
Move ignore-last-opened to ipc.d.ts 
This is so it can be used in VS Code. Don't tell anyone but I forgot to
run `yarn ci`.
 2020-12-15 11:14:21 -06:00
Joe Previte cc584f86b9
Merge pull request #2435 from cdr/issue-2328-customize-go-home 
cli: add --home flag to customize "Go Home" button
 2020-12-15 09:52:39 -07:00
Anmol Sethi 71abff74ec
Revert yarn.lock to master 2020-12-14 16:23:36 -07:00
Joe Previte b0336e9d50
chore: revert yarn.lock to match master 2020-12-14 16:23:36 -07:00
Joe Previte c266d4ac68
chore: revert accidental yarnlock changes in patch 2020-12-14 16:23:36 -07:00
Joe Previte 066ce21688
fix: remove unused import in workbench.ts 2020-12-14 16:23:36 -07:00
Joe Previte 77ddac28fe
chore: fix lint issue in patch 2020-12-14 16:23:35 -07:00
Joe Previte 157eeab30c
chore: generate new patch 2020-12-14 16:23:35 -07:00
Anmol Sethi 7e05ca09bb
release-image: Remove unnecessary call to chsh (#2457) 
Confused me in #2410, see #2455

debian:10 defaults to bash as $SHELL
 2020-12-14 16:22:24 -05:00
Anmol Sethi 32c5ed8a33
release-image: Ignore $DOCKER_USER on restart (#2458) 
Closes #2267
 2020-12-14 13:57:36 -05:00
Anmol Sethi eb4864f9a5
Merge pull request #2400 from cdr/HTTP_PROXY-7e1f 
Use proxy-agent to support $HTTP_PROXY
 2020-12-04 16:12:45 -05:00
Anmol Sethi a021bf5d35
Fix CI 2020-12-04 13:52:52 -05:00
Anmol Sethi c15b526eff
vscode: Fix exthost logging 
Closes #2364
See #2366

cc @code-asher

My previous commit didn't fix anything but still good to update @coder/logger.
 2020-12-04 13:52:52 -05:00
Anmol Sethi 8a3471cbc7
vscode: Fix @coder/logger version 
The previously used version seems to be buggy. I was seeing undefined
errors when using a logger.named logger at level info.
 2020-12-04 13:51:50 -05:00
Anmol Sethi ca3af6dd38
vscode/coder.js: Remove unnecessary vs/css and vs/nls args 
buildfile.entrypoint ignores all args now and is hard coded to use these
strings as exclude.
 2020-12-04 13:51:50 -05:00
Anmol Sethi 9e44dd81ee
vscode: Document argument to extensionHostProcess 2020-12-04 13:51:40 -05:00
Anmol Sethi 6738cff544
media: Improve icon size (#2401) 
See https://github.com/cdr/code-server/pull/2383#issuecomment-738024951
 2020-12-04 11:31:45 -05:00
Anmol Sethi 691d44d4a8
Use proxy-agent to support $HTTP_PROXY 
Closes #124

This works by monkey patching the http and https modules's default agent
at runtime to the one given by the proxy-agent package.
 2020-12-04 02:34:43 -05:00
Anmol Sethi 11f53784c5
v3.7.4 2020-12-01 18:50:31 -05:00
Anmol Sethi ebe4d7ef29
Revamp icons (#2383) 
I took our website's SVG favicon and plopped it on a round
white rectangle in Affinity Designer. The I exported it as an SVG and
wrote a script that uses imagemagick to convert to the various sizes and
formats we need.

Closes #2307
 2020-11-30 19:11:26 -05:00
Asher f71d98f95c
Only attach to orphaned terminals (#2382) 
Fixes #2356.
 2020-11-30 17:31:14 -06:00
Anmol Sethi 261af28f70
vscode: Fixes for linting 2020-11-30 15:39:57 -05:00
Anmol Sethi 0713fa900b
vscode: Fix update check timeouts 
Forgot an extra 60 in the check interval and the notification timeout.
Very unfortunate. Check has been allowed every 168 minutes instead of
every week.
 2020-11-30 15:30:19 -05:00
Anmol Sethi cc18175ce3
cli: Add --disable-update-check flag 
Closes #2361
 2020-11-30 15:30:06 -05:00
Anmol Sethi 27f0f195a8
vscode: Use options.base for update checking 
See https://github.com/cdr/code-server/pull/2358#discussion_r529858749
 2020-11-30 15:29:53 -05:00
Anmol Sethi c35d558352
vscode: Reconnect in the background up to 5 seconds 
Based on the previous commits by @mgmachado but simplified.

I also changed the threshold to error after a single attempt as the
connection has likely been borked and the user should be in the know if
they couldn't reconnect after 5 seconds.

Closes #1791
 2020-11-30 13:59:40 -05:00
Anmol Sethi 8cb4e2c226
vscode: Remove background reconnection fixes from patch 
I'll have to manually apply as they are not compatible with the latest
VS Code after rebase anymore.
 2020-11-30 13:56:41 -05:00
Machado, Meygha e5067ba2a9
separate event domain from UI 2020-11-30 13:56:41 -05:00
Machado, Meygha fa0853dca6
revert reconnect wait times 2020-11-30 13:56:41 -05:00
Machado, Meygha a898dd34b9
solution with forceDialog for attempt 3 and no change to VisibleProgress class 2020-11-30 13:56:41 -05:00
Machado, Meygha 4eb4375119
one working solution without event suppression 2020-11-30 13:56:41 -05:00
Machado, Meygha 290c533c8e
turn off visibleProgress on ConnectionLost 2020-11-30 13:56:40 -05:00
Machado, Meygha 67e2a99df2
show popup on third attempt 2020-11-30 13:56:40 -05:00
Anmol Sethi 4cb8a32f4c
ci: Fetch vscode node_modules in lint.sh for eslint 2020-11-29 21:05:11 -05:00
Anmol Sethi 833314aae8
vscode: Make eslint pass 
I disabled code-layering and code-import-patterns as I don't think we
can make them easily pass as we reference all sorts of code from both
browser and node files. At least not worth the headache now to refactor
everything.
 2020-11-27 08:21:44 -05:00
Anmol Sethi 5247878d93
ci: Enable vscode linting 
Updates #2359
 2020-11-27 08:20:31 -05:00
Asher ae65c83cbd
Fix exthost error and warn logging (#2366) 
Previously anything that wasn't "log" such as "warn" would end up doing
`logger[logger.warn]`. Would have caught this if I hadn't used `any`...

Fixes #2364.
 2020-11-26 17:58:34 -05:00
Anmol Sethi 93fb76e4a7
v3.7.3 2020-11-24 13:12:10 -05:00
Anmol Sethi def81245a4
vscode: Check updates with absolute path 
In case the window location path changes. Not entirely sure if it can
but best to be on the safe side.
 2020-11-24 13:07:30 -05:00
Anmol Sethi 37c80c9bbd
vscode: Add missing semicolons 
See #2359
 2020-11-24 12:48:22 -05:00
Anmol Sethi f74f1721e6
doc: Add note on upgrading into release notes and install.md 
Closes #1652
Closes #2221
 2020-11-24 12:42:26 -05:00
Anmol Sethi fb63c0cd22
vscode: Show notification when upgrade is available 
And link to the release notes.
 2020-11-24 12:13:21 -05:00
Anmol Sethi bb26d2edd3
Merge pull request #2357 from cdr/branding-0570 
vscode: Customize welcome page for code-server
 2020-11-24 11:58:31 -05:00
Anmol Sethi 303fe2bc4e
vscode: Customize welcome page for code-server 
- Title/subtitle are now code-server and VS Code version
- Added a list of code-server help links
 2020-11-23 21:16:14 -05:00
Anmol Sethi 5a38ab95fe
vscode: Disable go home button 
See https://github.com/cdr/code-server/issues/2328
 2020-11-23 21:16:14 -05:00
Anmol Sethi 19710ab144
vscode: Update product.json 
The new fields are from vscodium and make the welcome page
documentation links work correctly.

I also renamed the distribution to "code-server" so that when you're
in a browser, it now says code-server instead of Code OSS.
 2020-11-23 19:06:09 -05:00
Asher 3d7fbec40f
Use file system for settings and fix data home path 
It's possible that using browser storage makes more sense with settings
sync, so we might want to revisit this once/if we get settings sync
working. As it currently is though, browser storage just causes jank.

The path was also missing a `User` at the end so I added that. This
might affect the Vim extension which would have been writing to the
wrong path previously but I don't believe it should affect anything
else since they would have been writing to browser storage.

- Fixes #2208
- Fixes #2231
- Fixes #2279
- Fixes #2274
 2020-11-20 14:03:07 -06:00
Anmol Sethi 96170de191
Merge pull request #2342 from cdr/v3.7.2 
v3.7.2
 2020-11-19 18:22:45 -05:00
Anmol Sethi 2e2d03371f
ci: Fix typo in release template 2020-11-19 18:03:12 -05:00
Anmol Sethi a0db6723c1
v3.7.2 2020-11-19 17:28:22 -05:00
Asher 42390da097
Don't persist terminals for now 2020-11-19 15:51:37 -06:00
Asher d0f6cbb02d
Use resolverEnv to get exec path 
This is the last unused variable in the create terminal payload.
 2020-11-19 15:51:36 -06:00
Asher fa59156a2a
Implement remaining resolver methods 2020-11-19 15:51:35 -06:00
Asher 8ffe599796
Add notes on unimplemented terminal events 2020-11-19 15:51:34 -06:00
Asher a6f8840009
Add timeout for disposing detached terminals 2020-11-19 15:51:33 -06:00
Asher 1feb30a7ff
Send back workspace ID and name in terminal list 
This makes it re-connect automatically.
 2020-11-19 15:51:32 -06:00
Asher 182aca6490
Only replay terminals when detached 2020-11-19 15:51:31 -06:00
Asher 8311cf5657
Handle non-persistent terminals 2020-11-19 15:51:30 -06:00
Asher 4de2511162
Implement terminal replay event 2020-11-19 15:51:30 -06:00
Asher 3f7b91e2e2
Implement most of remote terminal service 
It works, at least, but there are still some missing parts.
 2020-11-19 15:51:29 -06:00
Asher 431137da45
Add new (unimplemented) terminal service 2020-11-19 15:51:28 -06:00
Asher 4d276b88c0
Add new logger service 
The telemetry service depends on this now. I had to move it into
invokeFunction and use accessor.get otherwise getLogger on the service
was undefined.

I also had to move some the extension management service because it
depends on the moved telemetry service. I moved a few other services as
well to better match VS Code (sharedProcessMain.ts).

I swapped some this.services.get with accessor.get since that seems to
be the correct method although for these other services either method
seems to work.
 2020-11-19 15:51:27 -06:00
Asher e28c9ab287
Update VS Code to 1.51.1 2020-11-19 15:51:23 -06:00
Asher 624cd9d44f
Fix webview 404s 
An extra slash caused a 404 (was /webview//vscode-resource).
 2020-11-18 17:10:53 -06:00
Anmol Sethi 2bf91ff6a6
v3.7.1 2020-11-16 17:18:12 -05:00
Anmol Sethi ccc519ecbd
ci: Pin nfpm to v1.9.0 
Closes #2310
 2020-11-16 16:57:04 -05:00
Anmol Sethi 40e1f066ff
ci: Improve release template (#2311) 2020-11-16 16:56:53 -05:00
Anmol Sethi f64599b94d
ci: Update standalone build test 
ms-toolsai.jupyter is now a dependency of ms-python and is installed
along with it.
 2020-11-16 14:40:06 -05:00
Anmol Sethi 9917da068a
v3.7.0 2020-11-16 11:11:50 -05:00
Anmol Sethi 8bf1bf2c9f
helm: Use upgrade --install everywhere 
See @sreya's review
 2020-11-13 18:45:13 -05:00
Anmol Sethi 79e8f3dfdb
ci: Only use helm kubeval if installed 2020-11-13 18:44:29 -05:00
Anmol Sethi f4d48bc880
ci: Remove helm validation action in favour of helm kubeval directly 2020-11-13 18:38:58 -05:00
Anmol Sethi 9af3671c05
helm: Add link in install.md 2020-11-13 18:38:58 -05:00
Anmol Sethi 248c2adb2e
helm: Fix README examples 
Not sure where --name came from? Maybe an older version of helm.

Ah, it's from v2.16.7
 2020-11-13 18:38:58 -05:00
Anmol Sethi 52ea32f4a7
helm: Move chart into ci/helm-chart 2020-11-13 17:27:52 -05:00
Asher 9889f30224
Remove unused ts-expect-error from VS Code 
I'm not sure why other builds are passing with this still in.
 2020-11-12 12:30:41 -06:00
Asher e1702a1d21
Merge branch master into code-asher/ch1385 2020-11-12 11:52:02 -06:00
Anmol Sethi 706bc23f04
plugin: Fixes for CI 2020-11-06 10:13:01 -05:00
Anmol Sethi 75e52a3774
plugin.ts: Fixes for @code-asher 2020-11-06 10:12:46 -05:00
Anmol Sethi 481df70622
ci/dev/test.sh: Pass through args 2020-11-06 10:11:57 -05:00
Anmol Sethi f9e0990594
Merge pull request #2255 from cdr/self-signed-3b2c 
Fix self signed certificate for iPad
 2020-11-03 14:04:47 -05:00
Anmol Sethi 31306f7fdd
docs: Add iPad self signed certificate documentation 
Closes #1816
Closes #1566
 2020-11-03 14:04:19 -05:00
Asher 6fbbb1047f
fmt 2020-11-02 17:17:09 -06:00
Asher e07a591745
Catch cloud agent download failure 
- See #2251 and #2229.
 2020-11-02 16:48:25 -06:00
Asher 0b9af6ef67
Initiate connection handshake from server 
This way the connection can be initiated by either side. It looks like
sometimes the initial message from the client is lost (it never makes it
into the onControlMessage callback) but I'm still not sure why or if
that is preventable.

Also added a timeout on the server end to clean things up in case the
client never responds.
 2020-10-30 16:16:45 -05:00
Asher c63dc3a1ea
Add more logging around connections 2020-10-30 16:16:44 -05:00
Asher 112eda4605
Convert routes to Express 2020-10-26 17:56:13 -05:00
Anmol Sethi 79443c14ff
release-image: Remap UID within the image before handling $DOCKER_USER (#2223) 
If do not update the UID within the passwd database to match whatever
uid the container is being ran as, then sudo will not work when renaming
the user to match $DOCKER_USER as it will complain about the current
user being non-existent.
 2020-10-23 12:07:08 -04:00
Anmol Sethi 4a3d2e5a94
Remove unnecessary whoami 
Closes #2213
 2020-10-21 16:40:25 -04:00
Asher daf204eeda
Exclude browser-supported remote extensions 
Removing them just for peace of mind even though they seem to get
filtered out later. This line is meant to only add remote extensions
that aren't capable of running in the browser. If they are
browser-capable they don't need to run in our shimmed Node environment.
 2020-10-14 17:36:47 -05:00
Asher f20f7ac166
Move extension fetch to main thread 
This makes the fetch work independently of the worker's origin which is
no longer the same as the main thread (the main problem is the inability
to send cookies without setting SameSite to None).
 2020-10-14 17:11:25 -05:00
Asher e3699cf258
Update VS Code to 1.50.0 
- The .js build files are no longer committed so they're gone.
- ParsedArgs and EnvironmentService are now NativeParsedArgs and
  NativeEnvironmentService.
- Interface for environment service was moved.
- getPathFromAmdModule was deprecated.
 2020-10-14 17:11:22 -05:00
Asher ec564091f1
Fix agent copy during release 
If there isn't a lib dir yet it'll copy as lib instead of getting put
inside the directory.
 2020-10-12 17:29:39 -05:00
Anmol Sethi ea105a9290
Fix release image entrypoint.sh 2020-10-12 04:26:36 -04:00
Anmol Sethi a4a03c1492
Fix CI 2020-10-12 03:08:24 -04:00
Asher d7e3112625
Update standalone test 2020-10-09 18:01:43 -05:00
Asher fe19391c03
Read most recent socket path from file 2020-10-09 16:57:43 -05:00
Anmol Sethi 64a6a460c8
Adjust npm package postinstall to install extension dependencies (#2180) 
Closes #1961
 2020-10-09 15:00:49 -04:00
Anmol Sethi daa1c86fe0
Merge pull request #2086 from nhooyr/master 
Integrate Coder Cloud Agent
 2020-10-09 07:52:09 -04:00
Anmol Sethi 9002f118c3
Remove the extra releases for autoupdating purposes 2020-10-09 07:50:58 -04:00
Asher 9f963c7e66
Update Node to 12.18.4 (#2175) 2020-10-08 16:15:05 -05:00
Anmol Sethi 8063c79e44
Patch VS Code to avoid deleting extension dependencies (#2170) 
Closes #1961
 2020-10-08 16:55:13 -04:00
Anmol Sethi febf4ead96
Fix the clean script 
🤦
 2020-10-07 17:40:19 -04:00
Anmol Sethi 85b0804be5
Remove cliArgs from main 
No purpose when all the args are in the args parameter.

We only need configArgs for bindAddrFromAllSources.
 2020-10-07 17:40:19 -04:00
Anmol Sethi 7cc16ceb3a
Document KEEP_MODULES 2020-10-07 16:16:01 -04:00
Anmol Sethi 6e8248cf0c
Fix zip release creation 2020-10-07 15:58:30 -04:00
Anmol Sethi fae07e14fb
Fix Go inside dev image 2020-10-07 15:58:30 -04:00
Anmol Sethi 9035bfa871
Add coder cloud agent binary to build process 2020-10-07 15:58:30 -04:00
Anmol Sethi 607444c695
Switch off debian:8 to debian:10 for the typescript build image 
We only want to use an old version for glibc which the centos:7
image takes care of.

The old version of git used in debian:8 was causing problems
with the uid/gid passthrough with no user in passwd.
 2020-10-07 15:58:30 -04:00
Anmol Sethi b22f3cb72f
Add $HOME to ./ci/dev/image/run.sh 2020-10-07 15:58:30 -04:00
Anmol Sethi eacca7d692
Unrelated fixes for CI 2020-10-07 15:58:30 -04:00
Asher 402f5ebd77
Update VS code to 1.49.3 (#2081) 2020-10-07 12:37:37 -05:00
Anmol Sethi b3811a67e0
Add $KEEP_MODULES argument to build-release.sh (#2167) 2020-10-07 13:24:31 -04:00
Asher 9d87c5328c
Add robots.txt (#2080) 
Closes #1886.
 2020-09-14 17:34:48 -05:00
Asher e44e574ce1
Fix language packs (#2058) 
* Fix incorrect nls.json fetch

When moving this out of the HTML I didn't remove {{BASE}}.

* Fix language package installation

Updates #2046.
 2020-09-04 10:10:40 -05:00
Anmol Sethi 9fb318cf15
docker: Fix $DOCKER_USER (#2057) 
We do not try renaming $HOME anymore as there is no good way
to do it.

We also only try to convert if the user hasn't been changed.

Finally I added usage to the docker docs in install.md

Closes #2056
 2020-09-03 18:38:40 -04:00
Asher 4a250be79a
Use --full-index for patch 
This should eliminate potential noise in the diffs for the patch since
different versions seem to default to different hash lengths.
 2020-09-03 14:32:51 -05:00
Asher 3761f7bd51
Patch VS Code to wait for storage write (#2049) 
VS Code has a short delay before writing storage (probably to queue up
rapid changes). In the web version of VS Code this happens on the client
which means if the page is reloaded before the delay expires the write
never happens.

Storage updates are already promises so this simply returns the promise
returned by the delayer so it won't resolve until the write actually
happens.

Fixes #2021.
 2020-09-03 13:57:46 -05:00
Anmol Sethi 35a2d71b67
Minor release process fixes (#2042) 2020-09-03 02:16:57 -04:00
Anmol Sethi de41646fc4
Fix path of systemd system service in nfpm 2020-08-31 05:22:52 -04:00
Anmol Sethi d8d5908d85
Merge pull request #2001 from cdr/docker-user-1c5d 
docker: Allow passing $DOCKER_USER to set the username in the container
 2020-08-27 15:51:28 -04:00
Anmol Sethi 1558ff6dac
Streamline dev container workflow (#2014) 2020-08-27 15:39:24 -04:00
Anmol Sethi 4b7c2ea322
Use static version of node for all builds, not just darwin 
This way, building a standalone release locally and putting it in the
release contianer for testing is less likely to break.
 2020-08-27 14:20:56 -04:00
Anmol Sethi 4c4a7413a1
docker: Allow passing $DOCKER_USER to set the username in the container 
Needs to be reflected in the documentation and the dockerhub description now.

Closes #881
 2020-08-27 14:20:56 -04:00
shayne ceb2265b14
Allow opening files, folders, and workspaces in existing code-server from CLI (#1994) 
Add initial support for opening files / folders in running code-server instance.

Current limitations:

- unable to open a file in a new window, only folders
- unable to use addMode feature
- others...
 2020-08-27 13:06:21 -05:00
Anmol Sethi 255fa37e1d
Bundle systemd system unit 
systemd's user units are buggy on certain versions
and do not linger by default.

Closes #1771
Closes #1673
Closes #1882
Closes #1861
 2020-08-27 13:20:21 -04:00
Asher eebb8bb314
Add proposed API flag (#2002) 
Co-authored-by: giddyuptiger <65830808+giddyuptiger@users.noreply.github.com>
 2020-08-26 14:18:40 -05:00
Anmol Sethi a730bec6f4
Ship with node 12 (#1998) 
See #1894
See #1892
See #1810
 2020-08-26 11:54:50 -04:00
Asher ce2eaf2f10
Update to VS Code 1.48.2 (#2000) 2020-08-26 10:18:47 -05:00
Anmol Sethi 5c6cd11836
Fix clean.sh 
tsc doesn't check if the output exists when incremental is true.

i.e if I delete the out directory, but keep the tsbuildinfo and
try to rebuild, nothing happens cause it thinks everything is
up to date I guess...

With this change, yarn clean will now remove the tsbuildinfo correctly
so things work as expected.
 2020-08-26 10:33:59 -04:00
Asher e237589f2e
Update VS Code to 1.48.0 (#1982) 2020-08-25 13:06:41 -05:00
Asher c6f054ad6f
Fix watch exiting if no plugin 2020-08-18 16:34:59 -05:00
Asher 8590f80c31
Remove unnecessary tsc settings 2020-08-13 17:11:33 -05:00
Asher d6d24966be
Move vscode JS to a separate file 
Mostly to match everything else.
 2020-08-13 17:10:59 -05:00
Asher 751a5ea3ad
Move login JS to a separate file 
Mostly so the base URL resolution code can be shared.
 2020-08-13 17:10:54 -05:00
Asher 934c8d4eb6
Clarify exported types and ipc.d.ts 2020-08-05 13:00:37 -05:00
Asher 42467b3e66
Watch plugin and restart when it changes 2020-07-31 17:42:49 -05:00
Asher 361e7103ea
Enable loading external plugins 2020-07-31 17:42:48 -05:00
Asher bac948ea6f
Add plugin system 2020-07-31 15:08:02 -05:00
Asher 1c8eede1aa
Add missing types to release 
code-server exports its types but they weren't complete since it imports
ipc.d.ts and that wasn't being included.
 2020-07-31 14:08:00 -05:00
Asher 486652abaf
Update standalone test to account for timestamp 
The updated logger outputs timestamps now.
 2020-07-31 14:06:49 -05:00