Charles Morgan
4a234af7a3
Minor changes
...
Changes CopyOnClick to allow any.
Allows database information to be copied on click.
Changes layouts on database/backups to match the network tab.
Changes text to lighten it one level from 400 to 300 for easier visibility.
Moves database api endpoints to their own folder for some organization.
2020-11-08 21:09:22 -05:00
Dane Everitt
085fa8dcb5
Update CopyOnClick.tsx
2020-11-08 17:13:55 -08:00
Dane Everitt
842652a6b8
Update CopyOnClick.tsx
2020-11-08 17:13:33 -08:00
Dane Everitt
6795bae335
Fix server state not being updated correctly when adding/removing allocation; closes #2680
2020-11-08 17:12:07 -08:00
Dane Everitt
74e90e087f
Fix allocation permission
2020-11-08 17:07:26 -08:00
Dane Everitt
7cf6b4bcfe
Only load GA when valid key is provided; closes #2678
2020-11-08 13:18:15 -08:00
Dane Everitt
de943eac4a
Merge pull request #2636 from AreYouRlyScared/copynetwork
...
Network info added to details + ClickToCopy
2020-11-08 11:48:45 -08:00
Dane Everitt
74b1776c00
Merge pull request #2646 from AreYouRlyScared/#2608
...
Add admin area link to view config
2020-11-08 11:48:22 -08:00
Charles Morgan
e340cf16bf
remove permission based view
...
recent changes that were made always show the primary allocation to the end users even if they don't have the read permission.
2020-11-07 17:25:05 -05:00
Dane Everitt
625fd92130
Fix URKL encoding hellscape; closes #2664 closes #2663
2020-11-06 20:47:03 -08:00
Dane Everitt
c4df534722
Handle reconnect events for websocket errors
2020-11-03 20:33:05 -08:00
Dane Everitt
fb03c411ad
Get EULA hook modal into working order and start server when accepted
2020-11-02 21:06:47 -08:00
Dane Everitt
aba7df3afa
Basic concept for the EULA feature to demo how this will all work
2020-11-02 20:52:41 -08:00
Dane Everitt
7ec614ed2c
Reset modal spinner state when dismissed; closes #2647
2020-11-02 20:03:28 -08:00
Dane Everitt
027c705733
Correctly overlay spinner over all modal elements
2020-11-02 20:03:02 -08:00
Charles Morgan
274ed6c232
Update ServerDetailsBlock.tsx
2020-11-02 02:32:38 -05:00
Charles Morgan
40eee1220c
Update ServerDetailsBlock.tsx
2020-11-02 02:31:57 -05:00
Charles Morgan
c75a621c52
Only show allocation if user has permission
...
prevents just a blank scetion in the details box if a sub user dosn't have the permission of `allocation.read`
Also fixes the server router where it was set to `allocations` and not `allocation` making it not showup period even if the sub user had the correct permissions.
2020-11-02 00:49:07 -05:00
Charles Morgan
6d909a4a97
Add admin area link to view config
2020-11-02 00:14:02 -05:00
Matthew Penner
85af073438
Switch to s3 multipart uploads for backups
2020-11-01 15:27:43 -07:00
Dane Everitt
4082503190
Show next schedule run time
2020-11-01 14:07:31 -08:00
Dane Everitt
63f8f53367
Fix server pagination when using search queries; closes #2593
2020-11-01 12:28:14 -08:00
Dane Everitt
0132b51642
Merge pull request #2637 from AreYouRlyScared/fix2434
...
Fixes for PR#2434
2020-11-01 11:45:31 -08:00
Dane Everitt
8c8feffcb7
Encode all parts of the URI individually, closes #2620
2020-11-01 11:44:47 -08:00
Charles Morgan
f029b7239e
re-remove console limiting options
2020-11-01 03:16:30 -05:00
Charles Morgan
fc0f8ee48e
Update ServerDetailsBlock.tsx
2020-11-01 02:55:29 -05:00
Charles Morgan
e80b125543
Add network info
...
Adds network info to the server details section, Also copied to clipboard when clicked.
Closes https://github.com/pterodactyl/panel/issues/2585
2020-11-01 02:50:35 -05:00
Dane Everitt
9ff691bfde
Merge pull request #2554 from AreYouRlyScared/subusers
...
Duplicate save/invite button at top
2020-10-31 22:30:52 -07:00
Dane Everitt
49c29aae47
Logic fixes
2020-10-31 22:30:03 -07:00
Dane Everitt
b2be067f38
Support deleting an allocation for a server
2020-10-31 21:22:44 -07:00
Dane Everitt
c6bd7ff661
Improve logic handle auto-allocation of ports for a server
2020-10-31 14:58:15 -07:00
Charles Morgan
aad3019747
Merge branch 'develop' into subusers
2020-10-31 17:32:10 -04:00
Charles Morgan
0f09dfed92
Update EditSubuserModal.tsx
2020-10-31 17:29:41 -04:00
Dane Everitt
7638ffccde
Merge branch 'develop' into pr/2434
2020-10-31 14:12:13 -07:00
Dane Everitt
31ad238e8b
Thanks for that highlight phpstorm...
2020-10-31 14:11:53 -07:00
Dane Everitt
db7e4e749f
UI cleanup for add allocation button
2020-10-31 14:10:53 -07:00
Dane Everitt
abb043c1cc
Merge branch 'develop' into pr/2434
2020-10-31 13:55:56 -07:00
Dane Everitt
283cb08e33
Remove unused
2020-10-31 13:55:45 -07:00
Dane Everitt
665a4dd8a4
Merge branch 'develop' into develop
2020-10-31 13:47:12 -07:00
Dane Everitt
7fd49dd823
Merge pull request #2610 from occanowey/feature/command_history
...
Add console command history.
2020-10-31 13:46:24 -07:00
Dane Everitt
e157b8baf2
Merge pull request #2627 from pterodactyl/matthewpi/admin-patch-1
...
Tweaks to admin area
2020-10-31 13:45:26 -07:00
Dane Everitt
c757abfdc2
Merge pull request #2633 from AreYouRlyScared/changes
...
Network view changes
2020-10-31 13:45:09 -07:00
Charles Morgan
394cd815d2
Network tab changes
...
Allows address feild to be copied to the clipboard when clicked
If alias is used changes it to hostname instead of ip address ( might just make it say address as that would cover both? )
Fixed overflow for allocations with a long alias
2020-10-31 16:16:41 -04:00
Dane Everitt
8eaa44411f
Update ServerRow.tsx
2020-10-31 12:09:59 -07:00
Dane Everitt
87a8238c56
Correctly render suspended server in dashboard listing; closes #2613
2020-10-31 12:07:20 -07:00
Matthew Penner
d9ad4af6a7
admin: update description on Mounts index view
2020-10-30 11:02:55 -06:00
Matthew Penner
48013eddcc
admin: update transfer server box on manage tab
2020-10-30 11:02:29 -06:00
Griffin T
6e4261b3a7
Limit per server command history to 32.
2020-10-27 18:19:33 +08:00
Griffin T
a4d3e7db1b
Add console command history.
2020-10-26 20:30:30 +08:00
Dane Everitt
0a6cf5ba25
lint; skip ci
2020-10-25 17:31:24 -07:00
Dane Everitt
092c942764
Fix server owner filtering; improve searching for servers; closes #2581
2020-10-25 17:29:57 -07:00
Dane Everitt
39dddba1d6
Refactor subuser modal and fix to be less of a code monstrosity; closes #2583
2020-10-25 15:47:50 -07:00
Dane Everitt
23872b844a
Fix unnecessary object structuring
2020-10-22 21:33:06 -07:00
Dane Everitt
7ed3c25d61
Merge pull request #2545 from wardpieters/develop
...
fix: duplicate 2FA error messages
2020-10-22 21:31:37 -07:00
Dane Everitt
903b5795db
Avoid breaking the entire UI when naughty characters are present in the file name or directory; closes #2575
2020-10-22 21:18:46 -07:00
Charles Morgan
e0bc9ac50f
Duplicate save/invite button at top
...
Adds the Save / Invite User button at the top also
2020-10-18 04:31:54 -04:00
Ward Pieters
1c4ee31491
fix: duplicate enable 2FA error messages
2020-10-18 00:46:46 +02:00
Ward Pieters
f5dfe86eff
fix: duplicate disable 2FA error messages
2020-10-18 00:42:52 +02:00
Ward Pieters
f859d37b25
fix: duplicate 2FA error messages ( https://github.com/pterodactyl/panel/issues/2455 )
2020-10-18 00:02:46 +02:00
Dane Everitt
cbbe5b6fa9
Reset error messages between login screens; ref #2455
2020-10-17 14:45:33 -07:00
Dane Everitt
527ba1adc4
Fix recaptcha not resetting on login fail; closes #2397
2020-10-17 14:30:54 -07:00
Dane Everitt
35f24e7f22
Fix theme stuff
2020-10-17 13:54:34 -07:00
Dane Everitt
0260efc966
Fix some PHPstorm nightmare
2020-10-17 13:47:21 -07:00
Dane Everitt
820d8f7560
Better logic for using theme values
2020-10-17 13:43:22 -07:00
Matthew Penner
ebe3375897
Fix white highlight hiding console text ( fixes #2541 )
2020-10-17 14:25:44 -06:00
Dane Everitt
f54151e0f6
Merge pull request #2525 from Spirit55555/patch-2
...
Remove target="blank" from /admin link
2020-10-17 10:38:14 -07:00
Nobody
10548c9d8f
Update message and update query
2020-10-17 18:26:34 +01:00
Anders G. Jørgensen
7ad26fc456
Remove target="blank" from /admin link
...
This should be changed to make it consistent with the admin panel, where the link back to the user panel does not open in a new tab.
2020-10-16 15:49:35 +02:00
Dane Everitt
a4abb2543b
lint
2020-10-15 21:28:43 -07:00
Dane Everitt
f52f13600f
Fix text wrap on long server names in search bar
2020-10-15 21:23:31 -07:00
Dane Everitt
f30dab053b
Support much better server querying from frontend
...
Search all servers if making a query as an admin, allow searching by a more complex set of data, fix unfocus on search field when loading indicator was rendered
2020-10-15 21:21:38 -07:00
Dane Everitt
9726a0de46
Autofocus search when opening; closes #2522
2020-10-15 20:09:13 -07:00
Dane Everitt
2685295110
Merge branch 'develop' into xtermstuff
2020-10-15 19:56:09 -07:00
Charles Morgan
8f2e90d1e8
Update Console.tsx
2020-10-15 16:41:11 -04:00
Dane Everitt
e7c64bc60e
Add test coverage for schedule execution
2020-10-14 21:06:27 -07:00
Dane Everitt
c1ee0ac4f8
Add support for executing a scheduled task right now
2020-10-14 20:38:59 -07:00
Dane Everitt
f33d0b1d72
Update schedule view UI
2020-10-14 20:13:36 -07:00
Charles Morgan
28844bf62c
Merge branch 'develop' into xtermstuff
2020-10-14 11:42:01 -04:00
Charles Morgan
807707c07e
Update Console.tsx
2020-10-14 11:38:59 -04:00
Charles Morgan
cdb881efaf
Fix naming
2020-10-14 09:54:06 -04:00
Charles Morgan
c53b14acef
Close search bar on esacpe
...
Allows the searchbar to be closed when a user clicks escape, just like in the browser.
2020-10-14 07:23:02 -04:00
Charles Morgan
471cadda77
Update UsersContainer.tsx
...
Closes #2514
2020-10-14 04:54:17 -04:00
Charles Morgan
9dc0c3e2c3
Upgrade Xterm to v4.9, Add Search
...
Changes:
Added ` xterm-addon-search ` v0.7.0
Added ` xterm-addon-search-bar ` v0.2.0
Updated ` webpack ` v4.43.0 -> v4.44.2
Updated ` xterm ` v3.14.4 -> v4.9.0
Updated ` xterm-addon-fit ` v0.1.0 -> v0.7.0
Updated ` xterm-addon-attach ` v0.1.0 -> v0.4.0
With the added packages above, when a user does Ctrl + F a search box will apear within the console for them to search whats in the console.
This was requested in discord to allow the lines in the console to be searchable.
2020-10-14 02:34:53 -04:00
Caleb
ea778e9345
Merge branch 'develop' into develop
2020-10-13 15:35:38 -04:00
Dane Everitt
6274c451af
COrrectly set the breadcrumbs when using browser back; closes #2485
2020-10-12 21:02:51 -07:00
Dane Everitt
7a0ac1d5c2
Revert "Merge pull request #2482 from AreYouRlyScared/fix-2386"
...
This reverts commit a967dbc6fc
, reversing
changes made to 289de72aca
.
2020-10-12 20:59:11 -07:00
Charles Morgan
f7fd63dff9
Remove trailing slash if one is present
...
Closes https://github.com/pterodactyl/panel/issues/2386
2020-10-11 18:38:09 -04:00
Dane Everitt
08dcb85e5d
Merge pull request #2480 from AreYouRlyScared/fix-2435
...
Remove unused settings from admin side
2020-10-11 15:24:31 -07:00
Charles Morgan
5c105822b6
Remove unused settings
...
Closes https://github.com/pterodactyl/panel/issues/2435
2020-10-11 18:21:01 -04:00
Dane Everitt
1e08f7d2d2
Merge pull request #2454 from zKoz210/patch-1
...
Fixed phantom shadow when opening modal window
2020-10-11 12:36:49 -07:00
Dane Everitt
2f5e080074
Remove unnecessary break-all
2020-10-11 12:34:48 -07:00
Dane Everitt
c6d6221711
Correctly fix the UI for API keys
2020-10-11 12:29:00 -07:00
Dane Everitt
78a3f933d1
Merge pull request #2476 from AreYouRlyScared/fix
...
Fix missing semi, Fixed task row overflow
2020-10-11 12:07:06 -07:00
Charles Morgan
c8b00f0ccf
Fix missing semi, Fixed task tow overflow
...
Was suppsoe to be correct in https://github.com/pterodactyl/panel/pull/2352 but seems to be picky. Should now correctly show a multiline text box and not a long skinny text box when the text overflows.
Also, fixed a missing semicolon. 👍
2020-10-11 04:35:26 -04:00
Oreo Oreoniv
1e3f3fb053
Fixed incorrect button appearance
2020-10-09 12:15:23 +03:00
LeJeanbono
0b559f8acb
Rename CPU Threads for CPU Pinning
2020-10-06 23:09:16 +02:00
Oreo Oreoniv
ec313a7362
Fixed description for API keys
2020-10-05 12:36:03 +03:00
Oreo Oreoniv
62e111657c
Fixed a bug with an incorrect size modal
2020-10-05 11:53:11 +03:00
Oreo Oreoniv
0fa503f923
Fixed phantom shadow when opening modal window
2020-10-05 11:36:47 +03:00
Dane Everitt
57457f0e9c
Oops, also include the server status
2020-10-03 19:37:36 -07:00
Dane Everitt
6b52a36b31
Significantly reduce the number of re-renders on the console page when stats are flowing
2020-10-03 19:36:26 -07:00
Dane Everitt
5fc4444f5a
Refit terminal when screen is resized; closes #2365
2020-10-03 19:21:11 -07:00
Dane Everitt
d1c30607cf
UI updates for server rows to show current status
2020-10-03 16:36:31 -07:00
Dane Everitt
2a42ef5c62
Mobile responsiveness fixes
2020-10-03 16:25:39 -07:00
Dane Everitt
47d59ca20f
Fix mobile UI for allocation rows
2020-10-03 15:48:31 -07:00
Dane Everitt
fb482abb9c
Also cache bust
2020-10-03 11:37:11 -07:00
Stepan Fedotov
62856556b9
Apply security fixes from #2441 to 1.0
2020-10-03 11:34:36 -07:00
Charles Morgan
3473e1dfbf
Remove console logging ( #2415 )
...
Remove console logging, as its not an error being logged i see no reason for this to be printed when the startup page is viewed.
2020-10-03 11:23:16 -07:00
Oreo Oreoniv
10eeae0927
Fix text overflows through out the front end ( #2406 )
2020-10-03 11:22:37 -07:00
Oreo Oreoniv
6893f9bfcd
Fixes for mobile responsiveness on the console page ( #2411 )
2020-10-03 11:21:09 -07:00
Caleb
fb33824e10
Added admin controls.
...
Removed the note in the server settings that stated that the allocations feature is currently not implemented.
Properly check to make sure that there are allocations available in range before trying to create it.
2020-09-29 12:00:59 -04:00
Caleb
d80660f047
Added admin configuration
...
This is not working just yet but the fields have been added to the admin control area.
2020-09-28 16:14:14 -04:00
Caleb
8f8bd0be83
Added Automatic Allocations
...
Known issues:
- Port range to auto create is hard coded
- React interface is still a WIP.
2020-09-28 11:50:34 -04:00
Dane Everitt
1db7e4db66
Request stats from wings when loading the console; closes pterodactyl/panel#2414
2020-09-27 09:45:37 -07:00
Dane Everitt
ff50940fa6
Fix keyboard save shortcut when saving a new file; closes #2427
2020-09-27 09:30:24 -07:00
Dane Everitt
da0b527715
Do not re-render rows excessively
2020-09-27 09:30:05 -07:00
Dane Everitt
3e899ffc51
Handle JWT expirations a little better
2020-09-27 09:22:09 -07:00
Dane Everitt
cc6f98c0fd
Replace all instances of 255 as a max length with 191; ref #2421
2020-09-26 16:29:26 -07:00
Dane Everitt
4f21fa85f8
finish fixing folder names when lots of slashes exist; closes #2377
2020-09-25 20:44:40 -07:00
Dane Everitt
fe849789a2
Dont display server usage as red if unlimited; closes #2417
2020-09-25 20:32:10 -07:00
Dane Everitt
c0fc9125ed
Fix database naming conventions; closes #2404
2020-09-24 19:31:42 -07:00
Dane Everitt
48a104667f
Fix re-rendering mess on allocation page
2020-09-24 19:20:19 -07:00
Dane Everitt
cbedd4539c
Performance cleanup; check main box when all children are checked; closes #2379
2020-09-22 21:41:35 -07:00
Dane Everitt
7968258004
appease TS
2020-09-22 20:52:37 -07:00
Dane Everitt
4bfc91a30e
Fix mutation of directory name with slashes in it; closes #2377
2020-09-22 20:50:44 -07:00
Dane Everitt
d4363cb36f
Merge pull request #2362 from AreYouRlyScared/fixes
...
Remove unused imports
2020-09-22 19:46:25 -07:00
Charles Morgan
c928214a83
Fix overflows through out the front end ( #2382 )
...
* Fix overflows through out the front end
Fixed Server row overflow for servers name and description
Fixed Sub-user overflow for users with oddly long emails....
Fixed Server new overflow on console view.
See Attached images.
* Remove conflicting server name limits
2020-09-22 19:37:41 -07:00
Charles Morgan
f6bec474f4
Remove unused imports
2020-09-18 03:43:33 -04:00
Charles Morgan
98ed96d08a
Merge branch 'bugfixes' of https://github.com/Sir3lit/panel into bugfixes
2020-09-17 00:07:30 -04:00
Charles Morgan
d1a325312d
Update ScheduleTaskRow.tsx
2020-09-17 00:07:20 -04:00
Charles Morgan
857d311135
Merge branch 'develop' into bugfixes
2020-09-17 00:04:16 -04:00
Charles Morgan
607184e578
Schedule Fixes
...
Limiting Schedule name 75>255
Moved Payload to bottom of new task window
Closes #2346
2020-09-17 00:01:48 -04:00
Dane Everitt
cca537d650
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2020-09-16 20:28:53 -07:00
Dane Everitt
95b27a8d56
Remove unused views
2020-09-16 20:28:38 -07:00
Dane Everitt
1e4b50fa61
Remove socketio connections from server listing; closes #1942
2020-09-16 20:28:32 -07:00
Dane Everitt
7f9f81a859
Merge pull request #2335 from ZeProf2Code/patch-2
...
fix: only show download button if it's a file
2020-09-16 20:23:39 -07:00
Dane Everitt
353f2487a0
Correctly send backup ignored files from textarea; closes #2349
...
For some reason Formik can't handle the css macro on these fields? Concerning, but not wasting time this close to release to dig into it more.
2020-09-16 20:20:48 -07:00
Dane Everitt
3af9e92603
Codemirror cleanup
2020-09-15 20:53:23 -07:00
Matthew Penner
9d7f4f954e
Replace Ace editor with CodeMirror
2020-09-13 17:17:40 -06:00
Dane Everitt
8b4bd3945d
Fix user search in admin area; closes #2100
2020-09-13 12:35:48 -07:00
Dane Everitt
88300e5448
Support searching servers in admin area using name; closes #2100
2020-09-13 12:26:15 -07:00
Dane Everitt
3c7ffaaadb
Remove all references of packs from the Panel
2020-09-13 11:13:37 -07:00
Dane Everitt
f1978683cc
More mobile cleanup
2020-09-13 10:49:57 -07:00
Dane Everitt
47283700a8
File manager cleanup for mobile devices
2020-09-13 10:33:12 -07:00
Rihan
9a4c0d8ba7
Make interface mobile responsive ( #2273 )
2020-09-13 10:02:25 -07:00
Arnaud Lier
34117017ec
fix: only show download button if it's a file
2020-09-13 09:35:35 +02:00
Dane Everitt
8c6c271916
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2020-09-11 23:18:02 -07:00
Dane Everitt
74767ed6a2
Disable buttons when not fully connected to instance
2020-09-11 23:18:01 -07:00
Dane Everitt
f711c1c046
Merge pull request #2328 from Sourack/develop
...
Update daemon_off_config_updated message core.json is now config.yml
2020-09-11 20:18:50 -07:00
Sourack
09071a43dc
Update daemon_off_config_updated message core.json is now config.yml
...
This error message isn't updated for wings 1.0 .
2020-09-11 21:50:43 -04:00
Arnaud Lier
8da56df641
fix: remove ./ before wings for auto-configuration
...
on the docs, you're downloading it to /usr/local/bin so it's easier like this
2020-09-12 02:29:52 +02:00
Dane Everitt
1c00c3b234
Merge pull request #2323 from Sir3lit/patch-1
...
Arrange cron times in proper order to match
2020-09-10 20:20:51 -07:00
Dane Everitt
d946cba2f3
Merge pull request #2321 from Sir3lit/movetitles
...
Move page titles to PageContentBlocks
2020-09-10 20:20:35 -07:00
Charles Morgan
735aae6df7
Arrange cron times in proper order to match
...
Moves the rendering of the time boxes to proper locations to match the view on the main schedules page and to match cron syntax
2020-09-10 01:02:44 -04:00
Dane Everitt
d86d0fedb4
Don't re-render entire file list when opening modals
2020-09-09 21:32:43 -07:00
Dane Everitt
deb61623b2
Don't try to upload dropped text
2020-09-09 21:22:13 -07:00
Dane Everitt
98d7b32036
Use fixed spinner overlay for uploads
2020-09-09 21:08:34 -07:00
Dane Everitt
6d922a7563
Show normal upload box when using upload button; closes #2294
2020-09-09 21:07:57 -07:00
Dane Everitt
6139b4e479
Fix chrome dismissing modals when dragging out of it; closes #2295
2020-09-09 20:55:23 -07:00
Charles Morgan
861911ca49
Move page titles to PageContentBlocks
2020-09-07 23:26:18 -04:00
Dane Everitt
ed83ab8fe9
Clear error when navigating through file manager; closes #2314
2020-09-07 15:03:26 -07:00
Dane Everitt
de9ec1eba6
Confirmation when deleting files via dropdown menu; closes #2293
2020-08-31 21:05:52 -07:00
Dane Everitt
981edb0d64
Require specific permission for reading the actual contents of a file; ref #2288
2020-08-31 19:36:30 -07:00
Dane Everitt
d87438621f
Don't allow opening of files we know cannot be edited; closes #2286
2020-08-30 10:25:48 -07:00
Dane Everitt
4ee19b6847
Tweak UI for dashboard
2020-08-29 18:20:12 -07:00
Dane Everitt
8c98264eed
Remove last calls to useServer
2020-08-25 22:09:54 -07:00
Dane Everitt
6bc51adad7
Merge branch 'develop' into dane/fix-performance-snafu
2020-08-25 22:02:45 -07:00
Dane Everitt
1598dac6f8
Remove more references to useServer
2020-08-25 21:39:00 -07:00
Dane Everitt
c4418640eb
Start cleaning up the mess of useServer; make startup page update in real time
2020-08-25 21:25:31 -07:00
Dane Everitt
0e0b58ba5e
Update wrapper.blade.php
2020-08-25 21:00:43 -07:00
Dane Everitt
96fef94578
Don't try to use the contents of the file as the file name when using the save shortcut... closes #2266
2020-08-25 18:47:26 -07:00
Dane Everitt
9e60cf9f53
Show server status
2020-08-24 21:17:15 -07:00
Matthew Penner
773c42e4f2
Fix #2253
2020-08-24 11:26:05 -06:00
Dane Everitt
034a310702
Use checksum more broadly, not specifically SHA256
2020-08-23 18:06:47 -07:00
Dane Everitt
4cd44d2025
Hide checkbox when editing/creating files
2020-08-23 16:03:54 -07:00
Dane Everitt
89b18cbcac
Fix pages not rendering
2020-08-23 15:55:10 -07:00
Dane Everitt
5173f1f7e8
Don't allow editing read only values; closes #2252
2020-08-23 14:56:05 -07:00
Dane Everitt
f21aca20b2
Mutate the store after uploading
2020-08-22 22:36:53 -07:00
Dane Everitt
b4c64d3dc0
Better handling of file uploads
2020-08-22 22:35:53 -07:00
Dane Everitt
f561089cad
Fix the unholy hell that is drag events
2020-08-22 22:10:16 -07:00
Dane Everitt
56475d89bb
Fix rendering when trying to access server from state
2020-08-22 19:05:43 -07:00
Dane Everitt
9ae3c17913
Don't even render components if the user doesn't have permission
2020-08-22 19:01:29 -07:00
Dane Everitt
54f9c5f187
Merge branch 'develop' into feature/file-uploads
2020-08-22 18:33:09 -07:00
Dane Everitt
91cdbd6c2e
Support modifying startup variables for servers
2020-08-22 18:13:59 -07:00
Dane Everitt
9b16f5883c
Refactor to a single transformer file
2020-08-22 15:46:13 -07:00
Dane Everitt
cae604e79d
Include egg variables in the output from the API
2020-08-22 15:43:28 -07:00
Dane Everitt
1e735cf0e8
Support failed backup display on the frontend; use SWR for backup pages
2020-08-20 21:44:33 -07:00
Dane Everitt
f144ba8394
Don't enter ✨ d i s c o m o d e ✨ when first opening the page; closes #2190
...
This was caused by the location.key being undefined when the page first renders (for some reason), and therefore the fade component just kept re-rendering since it wasn't using a unique key.
2020-08-19 21:30:45 -07:00
Dane Everitt
13ace83f42
Move the file selector out of the editor itself; closes #2147
2020-08-19 21:11:29 -07:00
Dane Everitt
57bb652d81
Whoops, don't always show this modal
2020-08-18 20:16:13 -07:00
Dane Everitt
e873c597bb
Allow passing props through to determine modal options
2020-08-17 22:04:24 -07:00
Dane Everitt
c28cba92e2
Make modals programatically controllable via a HOC
...
This allows entire components to be unmounted when the modal is hidden without affecting the fade in/out of the modal itself.
This also makes it easier to programatically dismiss a modal without having to copy the visibility all over the place, and makes working with props much simpler in those modal components
2020-08-17 21:35:11 -07:00
Dane Everitt
d41b86f0ea
Correctly pass along allowed IPs for client API keys, closes #2244
2020-08-17 19:48:51 -07:00
Dane Everitt
231ff0386c
Fix kill button not showing up when restarting
2020-08-13 20:47:16 -07:00
Dane Everitt
14c587eabe
Correctly inject new directory into file manager
2020-08-06 20:33:17 -07:00
Dane Everitt
95e8492c5d
What the heck are these abysmal timeouts; closes #2223
2020-08-06 20:25:35 -07:00
Dane Everitt
26704a2d5f
Clear reinstall messages when mounting; closes #2213
2020-08-03 20:58:15 -07:00
Dane Everitt
941da821e1
Merge pull request #2205 from Sir3lit/pagetitles2
...
Page Titles v2 - Using React Helmet
2020-08-01 21:27:23 -07:00
Dane Everitt
9387be3b0d
Fix permissions on subuser rows
2020-08-01 21:25:28 -07:00
Charles Morgan
658c2b12ae
Merge branch 'develop' into pagetitles2
2020-08-01 23:14:27 -05:00
Dane Everitt
b52fc0b4d9
Fix recaptcha handling during login & password reset flows; closes #2064
2020-08-01 21:08:35 -07:00
Charles Morgan
d3316f61d7
Titles on index / account pages
...
Also changed to use `const { ..., name: serverName } = useServer();` where feasible
2020-08-01 23:49:00 -04:00
Charles Morgan
27f201f27e
Merge branch 'develop' into pagetitles2
2020-08-01 22:10:58 -05:00
Dane Everitt
dd381f65a9
Don't try to be fancy, just pain
2020-08-01 20:06:17 -07:00
Charles Morgan
d604a4a5f2
Merge branch 'develop' into pagetitles2
2020-08-01 22:03:07 -05:00
Dane Everitt
a966613890
Fix task edit modal not filling the payload correctly
2020-08-01 19:52:13 -07:00
Dane Everitt
c58348735d
Avoid double-click double-submit issues in modals; closes #2199
2020-08-01 19:49:38 -07:00
Dane Everitt
0c7f118f45
add withFlash() context HOC
2020-08-01 19:44:50 -07:00
Dane Everitt
b92c97060b
Use a key that doesn't change to avoid re-render issues; closes #2203
2020-08-01 18:48:58 -07:00
Dane Everitt
b5d97c00df
Merge pull request #2184 from Sir3lit/scrollbar
...
Re-add scroll bar style, fix missed tw conversion
2020-08-01 16:55:23 -07:00
Dane Everitt
0d089acf3d
Merge pull request #2191 from Sir3lit/googleanalytics2
...
Add Google Analytics Support
2020-08-01 16:55:06 -07:00
Dane Everitt
0fa90dd6bd
Add listener for install start/end
2020-07-29 22:02:00 -07:00
Dane Everitt
4c558a8662
Fix date display for scheduled tasks; closes #2195
2020-07-29 20:23:46 -07:00
Charles Morgan
6d79ad23a5
Attempt 2?
...
80% sure this isn't how to use react-helmet.... but it works....
2020-07-26 23:32:24 -04:00
Charles Morgan
cb4f8efbe6
Add Google Analytics
...
Added Google Analytics to latest dev branch
2020-07-26 21:05:54 -04:00
Dane Everitt
f0ac0725b6
[Security] Don't return all servers on the system when not a root admin and admin level servers are requested
...
Cleaned up the API endpoint by simplifying the logic and adds test case to cover this bug.
If you ever need to list _all_ of the servers on the system you should be using the application API endpoint for the servers most likely.
2020-07-26 10:43:46 -07:00
Charles Morgan
1fe254efc6
Re-add scroll bar style, fix missed tw conversion
...
Fixed backup message still using old method of "className" changed to use css={ts}
readded scrollbar styling from PR#2118
2020-07-22 01:54:49 -04:00
Dane Everitt
ff9f893dc3
Code cleanup for file manager
2020-07-18 10:45:41 -07:00
Dane Everitt
c2b1e7e6ab
Use archive icon
2020-07-16 22:21:06 -07:00
Matthew Penner
df385cef3a
Add additional mimetypes to check if a file is an archive
2020-07-15 13:09:45 -06:00
Dane Everitt
1a6669aa5c
Add endpoint support for decompressing files
2020-07-14 21:16:49 -07:00
Dane Everitt
6c0d308348
Paginate servers on frontend; closes #2106
2020-07-14 20:48:41 -07:00
Matthew Penner
67ba3baff0
Fix lint warnings
2020-07-12 16:47:00 -06:00
Matthew Penner
1d2acbd5b4
Get basic file upload functionality working
2020-07-12 16:42:32 -06:00
Matthew Penner
3ebb6eadbf
Add upload button and drag&drop modal
2020-07-12 15:20:37 -06:00
Dane Everitt
17c57d37bc
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop
2020-07-12 11:57:50 -07:00
Dane Everitt
90ab185dce
Delete global.d.ts
2020-07-12 11:57:48 -07:00
Dane Everitt
cf366be06c
Merge pull request #2171 from pterodactyl/fix/2165
...
Fix table search bar not rendering properly across browsers
2020-07-12 11:16:19 -07:00
Dane Everitt
01faa86c73
swr for servers on dash; fix whatever is going on with the spinner
2020-07-12 11:15:54 -07:00
Matthew Penner
f26226e465
Fix table search bar not rendering properly across browsers
2020-07-12 12:15:01 -06:00
DarthShmev
3dbb297645
Update DisableTwoFactorModal.tsx - Fix lint errors
...
Whoops! Trailing space after `<Button` on line 60.
2020-07-12 13:51:54 -04:00
Dane Everitt
be1888f8eb
Merge pull request #2168 from DarthShmev/patch-2
...
Fix Two Factor Authentication Buttons colour and sizing. Closes #2167
2020-07-12 10:44:51 -07:00
Dane Everitt
474df81bf4
Merge pull request #2169 from DarthShmev/patch-3
...
Update ServerRow.tsx - Fix yarn compile errors.
2020-07-12 10:44:26 -07:00
Dane Everitt
85dcfd4cf5
Always tscheck, ignore eslint in prod
2020-07-12 10:43:37 -07:00
DarthShmev
156391ef6d
Update ServerRow.tsx - Fix yarn compile errors.
...
"Unlimited" -> 'Unlimited'
Removed extra blank line
2020-07-12 13:41:41 -04:00
DarthShmev
c59698d055
Update colour of disable two factor confirmation button
2020-07-12 01:14:08 -04:00
DarthShmev
3b16a4c5ab
Adjust size of close button for SetupTwoFactorModal
2020-07-12 00:59:34 -04:00
Dane Everitt
0d35ab95fd
Merge pull request #1915 from pterodactyl/feature/server-mounts
...
Add configurable server mounts
2020-07-11 17:19:25 -07:00
Dane Everitt
831673755a
Merge pull request #2105 from pterodactyl/fix/2071
...
Fix improper byte conversions
2020-07-11 17:18:45 -07:00
Dane Everitt
45a85938df
Merge pull request #2164 from pterodactyl/fix/2163
...
Fix 2FA codes missing prepended 0s
2020-07-11 17:18:24 -07:00
Dane Everitt
3df4d433f0
Support checking all
2020-07-11 17:09:54 -07:00
Dane Everitt
cb3288500a
Fix render performance and avoid re-rendering rows constantly
2020-07-11 16:57:30 -07:00
Dane Everitt
325626e46d
Only render the modal when needed
2020-07-11 16:49:46 -07:00
Dane Everitt
80ecd58b30
Mass actions for moving files, mostly working?
2020-07-11 16:47:13 -07:00
Dane Everitt
121f163b81
Handle new file rename/move API
2020-07-11 16:20:42 -07:00
Dane Everitt
2653321fc2
Support renaming multiple files at once
2020-07-11 16:00:30 -07:00
Dane Everitt
43f8ec23b8
Show a message when the spinner is displayed
2020-07-11 15:45:28 -07:00
Dane Everitt
93cab68cc3
Handle mass actions for file deletion
2020-07-11 15:37:59 -07:00
Dane Everitt
82bc9e617b
Add support for compressing items in the file manager
2020-07-11 13:38:49 -07:00
Dane Everitt
cb9eb918b2
Fix dropdown hiding under buttons
2020-07-11 13:19:28 -07:00
Matthew Penner
fbaabc2633
Merge branch 'develop' into fix/2163
2020-07-11 13:12:49 -06:00
Matthew Penner
984deab894
Remove debug log in LoginCheckpointContainer.tsx
2020-07-11 13:10:01 -06:00
Matthew Penner
55a3e76d99
Fix 2FA codes missing prepended 0s
2020-07-11 13:07:54 -06:00
Matthew Penner
295f09ca43
Merge branch 'develop' into feature/server-mounts
2020-07-11 12:29:30 -06:00
Matthew Penner
a9bb692112
Merge branch 'develop' into fix/2071
2020-07-11 12:29:04 -06:00
Dane Everitt
34a46a388f
Update DropdownMenu.tsx
2020-07-11 11:19:38 -07:00
Dane Everitt
c63382532e
Update DropdownMenu.tsx
2020-07-11 11:19:27 -07:00
Dane Everitt
117c1b1778
Support right click to use file context menu
2020-07-11 11:12:59 -07:00
Dane Everitt
6188b9287c
Remove unused code
2020-07-10 23:09:37 -07:00
Dane Everitt
fa9800fa88
Fix some SWR funkiness
2020-07-10 22:53:52 -07:00
Dane Everitt
5da9824fb7
Continue with file manager code cleanup
2020-07-10 22:38:07 -07:00
Dane Everitt
2692e98cd8
Massive speed improvements to filemanager
2020-07-10 22:10:51 -07:00
DarthShmev
f2cb41c074
Remove colon from port field on allocations page. Closes #2160
2020-07-10 11:37:55 -04:00
Dane Everitt
82d7fa1c53
Support setting notes on allocations; closes #561
2020-07-09 21:00:03 -07:00
Dane Everitt
2278927fb6
Update allocations to support ids; protect endpoints; support notes
2020-07-09 20:36:08 -07:00
Dane Everitt
9c3b9a0fae
Fix error handling and simplify showing http errors
2020-07-09 20:00:05 -07:00
Dane Everitt
fc9054312d
Support modifying the primary allocation for a server
2020-07-09 19:56:46 -07:00
Dane Everitt
5c18fd1f0c
Show allocated ports on settings page
2020-07-08 21:42:37 -07:00
Dane Everitt
7b5139b2b1
[Breaking] Return all server allocations in API response
2020-07-08 21:04:45 -07:00
Dane Everitt
d3c749ac56
Code cleanup & fix frontend searching servers; closes #2100
2020-07-06 21:25:00 -07:00
Dane Everitt
28992c5e43
Speed up animations throughout the panel
2020-07-05 13:56:04 -07:00
Dane Everitt
cbdede75a7
Fix suspense spinner to make it indistinguishable from other loading
2020-07-04 22:38:34 -07:00
Dane Everitt
db7f3e5fc0
Fix console and charting
2020-07-04 22:36:28 -07:00
Dane Everitt
becad7b3c7
Cut out all of the unused ace editor modes; significantly reduces bundle size
2020-07-04 22:16:06 -07:00
Dane Everitt
cbea4078fb
Remove lodash deps to reduce bundle size more
2020-07-04 21:46:49 -07:00
Dane Everitt
7f5ee04978
Remove a hilarious number of unused dependencies
2020-07-04 19:01:49 -07:00
Dane Everitt
732594a164
Remove unused imports
2020-07-04 18:46:09 -07:00
Dane Everitt
c419d15907
eslint cleanup
2020-07-04 18:30:50 -07:00
Dane Everitt
922383e232
Cleanup unused code and simplify webpack
2020-07-04 18:19:46 -07:00
Dane Everitt
43fbefbdb6
Fix up file manager
2020-07-04 17:57:24 -07:00
Dane Everitt
7e8a5f1271
Update database screens
2020-07-04 17:15:49 -07:00
Dane Everitt
a288374027
Update schedule page
2020-07-04 17:00:19 -07:00
Dane Everitt
f3586056f4
Update users screens
2020-07-04 16:26:07 -07:00
Dane Everitt
d27bda1c74
Get settings page in working order
2020-07-04 15:58:14 -07:00
Dane Everitt
1e163aa792
Get server console page rendering (mostly) correctly
2020-07-04 15:40:41 -07:00
Dane Everitt
43ff67238c
Fix search modal
2020-07-04 15:19:46 -07:00
Dane Everitt
82cf070c06
Fix styling on 2fa codes modal
2020-07-04 15:05:44 -07:00
Dane Everitt
1c97dd4e24
Correctly center the spinner in buttons
2020-07-04 14:34:43 -07:00
Matthew Penner
e4d141fa6f
Merge branch 'develop' into fix/2071
2020-07-04 15:22:25 -06:00
Dane Everitt
8c20158e58
Fix login form
2020-07-04 14:21:28 -07:00
Matthew Penner
29876e023b
Merge branch 'develop' into feature/server-mounts
2020-07-04 15:20:01 -06:00
Dane Everitt
02f83c58f5
Fix unhappy typescript
2020-07-04 13:31:00 -07:00
Dane Everitt
5473edc006
Get spinners back in working order
2020-07-04 12:39:55 -07:00
Dane Everitt
d260200947
Make the modal work again
2020-07-04 10:15:06 -07:00
Dane Everitt
ebe588718c
Fix route transitioning
2020-07-04 09:46:26 -07:00
Dane Everitt
bcf0a0586d
Support textareas and cleanup API page
2020-07-04 09:28:03 -07:00
Dane Everitt
baf35be8e8
Update fields to have a custom component
2020-07-04 09:13:41 -07:00
Dane Everitt
e8755ac598
Kind of get account stuff working; IDE is throwing a fit right now
2020-07-03 15:37:26 -07:00
Dane Everitt
7cea5e630c
Temporary hack to get fonts working
2020-07-03 14:51:40 -07:00
Dane Everitt
d93e804a31
Get server listing design working mostly correct
2020-07-03 14:50:37 -07:00
Dane Everitt
94e3acb9c4
Get compilation back to working
2020-07-03 14:19:05 -07:00
Dane Everitt
2193916fe4
Get basic compiling working with new CSS setup
2020-07-03 13:55:33 -07:00
Dane Everitt
7b75e7a648
Support using recovery tokens during the login process to bypass 2fa; closes #479
2020-07-02 23:01:02 -07:00
Dane Everitt
795e045950
Display generated recovery tokens when enabling two factor
2020-07-02 22:23:25 -07:00
Dane Everitt
655a751ef3
Prefix command with sudo
2020-06-29 20:34:58 -07:00
Dane Everitt
4a0627d182
Don't trigger a 500 error due to unchecked data being inserted; closes #2087
...
This also clears up allowed values for the disk input and normalizes the messaging between edit and create screens.
2020-06-23 20:24:09 -07:00
Dane Everitt
497f73d820
Only show limit warnings when necessary and relevant
2020-06-23 20:13:58 -07:00
Dane Everitt
1b54112129
Merge pull request #2118 from Sir3lit/stylingchanges
...
Add scrollbar styling + change syntax background color
2020-06-23 19:27:59 -07:00
Dane Everitt
173b75d44d
Merge pull request #2089 from Sir3lit/changedatabases
...
Database page edits, Shows message x of x databases when limit > 0, removes create button once limit is reached.
2020-06-23 19:27:00 -07:00
Dane Everitt
24852b8982
Merge pull request #2088 from Sir3lit/changebackup
...
Backup page edits, Shows client x of x backups when limit > 0. Removes create button if limit is reached or limit is 0
2020-06-23 19:26:43 -07:00
Dane Everitt
3d99b50e15
Merge pull request #2031 from Sir3lit/showunlimited
...
Show "unlimited" not 0
2020-06-23 19:24:32 -07:00
Dane Everitt
9efac27020
Merge pull request #2063 from Sir3lit/adminoverview
...
Show Unlimited instead of 0MB for disk space on about page ( Admin Side )
2020-06-23 19:24:10 -07:00
Dane Everitt
693b9eab0c
Fix handling of backup tasks; closes #2067
2020-06-18 21:00:04 -07:00
Charles Morgan
ad0fd4bf72
Change syntax background
...
Matches the background of file editor, keeps lighter border to say defiend.
2020-06-14 03:47:37 -04:00
Charles Morgan
03f37e1fb9
Add global scrollbar styling
...
Addeding styling to the scroll bar so its not "out of place" from everything else. Open to changes to the style. Anything is better then what it was.
Maybe remove the hover color?
2020-06-14 03:45:56 -04:00
Dane Everitt
364b645b81
Actually link the save action; closes #2092
2020-06-13 10:07:16 -07:00
Dane Everitt
b30d7429f3
Decode the filename when rendering it to the screen; closes #2101
2020-06-13 09:49:32 -07:00
Matthew Penner
e903d4cc2a
Use 1024 instead of 1000 for byte conversions, rename gloabl.d.ts to global.d.ts
2020-06-10 14:00:43 -06:00
Matthew Penner
0bec5b8581
Merge branch 'develop' into feature/server-mounts
2020-06-06 11:41:18 -06:00
Charles Morgan
5e68290267
Apply same logic to databases
...
Same logic as PR #2088
Shows using x of x databases.
Once limit is reached the create button is removed
2020-06-02 23:40:40 -04:00
Charles Morgan
2c326dcbe7
Fix condition
...
Fix condition for using message
2020-06-02 23:30:43 -04:00
Charles Morgan
e3ac933591
Add using x of x when limit > 0
...
Added a using x of x so the end user knows how many they have and are using.
2020-06-02 23:27:10 -04:00
Charles Morgan
48869d2eda
Remove create backup button if limit = 0, display message none can be created
...
Removes the create button if the limit is 0, just like it does with the database page
Also once limit is reached the create button is removed from view.
2020-06-02 23:14:16 -04:00
Charles Morgan
4d3563b8e1
Merge branch 'develop' into showunlimited
2020-06-02 11:18:00 -05:00
Dane Everitt
0795f8763d
Fix admins being unable to select permissions for subusers; closes #2055
2020-05-31 11:14:31 -07:00
Charles Morgan
3b42f110fb
Show BytestoHuman value, not server limit, change graph
...
Changes server view to use bytestohuman to show 10 GB like it does on the main index.
Removed animation duration so the graph dosn't look likes it glitching when a new value is pushed, also made it a little more curved.
2020-05-27 00:00:50 -04:00
Charles Morgan
6c60305617
Show Unlimited instead of 0, admin view
...
Guess i missed this one when i set everything to show unlimited when its 0 / -1.
Shows Unlimited disk space instead of 0 on admin about page.
2020-05-24 00:57:30 -04:00
Matthew Penner
0eb29dac9c
Add mount_server table, fix wrong field type on other many to many tables, add routes for mounting and unmounting mounts on a server, finish server admin mounts page
2020-05-21 14:23:12 -06:00
Matthew Penner
fa902cc074
Add mounts page to server admin view
2020-05-21 13:19:59 -06:00
Matthew Penner
34f718a8b1
Finish mount admin view page, add unique index to migration
2020-05-20 20:50:56 -06:00
Matthew Penner
0db7debb46
Add mount update and deletion services, add MountController@update and MountController@delete
2020-05-20 19:35:30 -06:00
Matthew Penner
77150b2551
Add increment id to mount, add basic mount view page
2020-05-20 19:17:35 -06:00
Matthew Penner
a4af8ec977
Add the ability to create mounts
2020-05-20 18:55:59 -06:00
Matthew Penner
00d1b5861a
Properly setup Mount model, add database migration, get mount admin page added
2020-05-20 18:07:56 -06:00
Matthew Penner
59a150148a
feature/server-mounts initial commit
2020-05-20 17:29:03 -06:00
Charles Morgan
917a1e8a87
Update ServerConsole.tsx
2020-05-18 13:33:02 -04:00
Charles Morgan
3df0febd0c
Less Lines = Better
...
Same logic, just more compact and react like
2020-05-17 00:34:25 -04:00
Charles Morgan
564933fcb1
Show "unlimited" not 0
...
Shows unlimited for resources if they're set to "0"
Im sure we could also just remove the "of {limit}" part if its unlimited? Dane Advise
Im sure there is a 100x better way of doing this? Dane please advise.
2020-05-16 03:16:06 -04:00
Charles Morgan
46285fefd7
CSS Changes
...
More CSS Changes....
Server overview page now looks more..... fluid
Boxes have their correct color top colors back, When admin side was changed to dark theme all by the yellow was changed to a single color, this is reverted.
Node overview page uses blue over gray box for total servers.
Lightened the text color on the side bar
Removed delete button for allocations that are assigned.
Changes Node configuration box to not hurt eyes
2020-05-10 18:09:01 -04:00
Dane Everitt
86dbb141f4
Make this helper text more correct
2020-05-09 15:45:38 -07:00
Dane Everitt
3b2e2c63c6
Only show relevant configuration; update default path to be what the daemon expects
2020-05-09 15:44:13 -07:00
Dane Everitt
2d95204e9a
Pass a value for skipping scripts correctly; closes #1991
2020-05-07 20:46:49 -07:00
Dane Everitt
69eb33fb89
closes #1787
2020-05-07 20:24:28 -07:00
Dane Everitt
c6d8bed095
close #1801
2020-05-07 20:20:20 -07:00
Dane Everitt
194688389d
Unused
2020-04-26 14:33:14 -07:00
Dane Everitt
6056b6f45d
Show console when an admin is viewing an installing server
2020-04-26 13:21:39 -07:00
Dane Everitt
f1c3762f4d
Add base support for definining the number of backups that can be created for a server
2020-04-26 12:12:29 -07:00
Dane Everitt
bed51b5871
Don't flash progress indicators when it is a failed request.
2020-04-26 11:19:40 -07:00
Dane Everitt
e2e82b9bf3
Little bit better UI for suspended
2020-04-25 17:59:46 -07:00
Dane Everitt
c4f4f1f5c8
Don't show an error in the listing if the server is still installing or suspended
2020-04-25 17:58:09 -07:00