Commit Graph

408 Commits

Author SHA1 Message Date
Andrew
49893ea5a6 Merge branch 'pretzels-fixes' into 'dev'
Pretzels fixes

See merge request crafty-controller/crafty-commander!110
2021-12-09 22:39:40 +00:00
Andrew
e12f11f6d5 Add translations
Add style to language select.
2021-12-09 11:44:08 -05:00
Andrew
ebe65e081f Minor change to aestetic for tasks 2021-11-30 15:50:40 -05:00
Andrew
0845efc3b8 Add initial frontend to schedules 2021-11-30 15:46:30 -05:00
Andrew
33ab2583da Fix security issues 2021-11-30 14:37:45 -05:00
Andrew
b996f7e7e7 One added file for schedules. Fix large bug where any user could access subpages when they did not have a role to give them access. 2021-11-30 12:29:53 -05:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Andrew
798dac02a5 Make exe update field not required. 2021-11-27 21:55:59 -05:00
Andrew
78834c1ed0 Fix bug where general user can change working directory and potentially destroy a system.
Initial commit for path traversal for server config only.
2021-11-27 21:52:49 -05:00
Andrew
0cd8f6b3a7 Fix bug where no fields were required while editing servers 2021-11-27 20:09:13 -05:00
Andrew
4c6b459b43 Remove useless if in backups.i 2021-11-27 19:28:53 -05:00
Andrew
c7d3b3aa1c Fix update notifications. 2021-11-27 18:32:53 -05:00
Andrew
b6a4698486 Add required to all server creation fields. 2021-11-27 13:52:53 -05:00
Andrew
b99f0f502e Change Donation Page
Remove direct link to donate to Phil's paypal.
Change Patreon Edition info since it's not relevant at this time.
2021-11-27 12:26:31 -05:00
bobsfriend12
f924c6e21a siwtch server ip description and server port description (on server config page) 2021-11-24 10:44:14 -06:00
Andrew
63857a54a4 Fix naming on users html table 2021-11-23 19:26:35 -05:00
Zedifus
f309107174 Merge branch 'dev' into bugfix/correct-tag-styles 2021-11-23 23:30:02 +00:00
Andrew
97ddc1b964 Merge branch 'pretzel-patches' into 'dev'
# Conflicts:
#   app/classes/shared/server.py
2021-11-23 22:12:06 +00:00
Andrew
dc83dc8fc8 Add EULA confirm message on server startup if EULA is not found. 2021-11-23 16:11:23 -05:00
Andrew
0e942311fb Add error message on login that does not direct to new page.
Remove failed to create dir error on startup when crafty cannot create dir since it exists after first startup.

Error logging is still enabled for every error except FileExists for this case.
2021-11-23 13:22:15 -05:00
Zedifus
1b1a7b75d2 Apply correct style to unlinked developer tag 2021-11-23 02:42:23 +00:00
bobsfriend12
8781621a4c make the buttons stop disappearing 2021-11-22 16:51:53 -06:00
Silversthorn
0f70b288d7 Merge branch 'dev' into dev_ultimateFixes 2021-11-20 10:25:11 +01:00
Silversthorn
564eedce32 Update of my Credits Items (Sorry pipeline) 2021-11-20 10:16:57 +01:00
Andrew
b7039573a4 Maybe I fixed backups?
Another attempt at allowing windows users to think about what they did by choosing windows to run a server on while also deleting backups
2021-11-19 22:17:24 -05:00
Andrew
67444a2d4f More reverts from the windows issue. 2021-11-19 22:02:59 -05:00
Andrew
79190e15f5 Revert last push 2021-11-19 21:56:09 -05:00
Andrew
bd3da474f5 Another attempt to fix backup delete issue.
This is hacky and can probably be done better.
2021-11-19 21:47:03 -05:00
Andrew
4d31ee399a Puts a temporary fix on deleting backups. Will be fixed in alpha 4 2021-11-19 21:09:09 -05:00
Silversthorn
0640a1ba98 Fixing MOTD on details server pages 2021-11-19 23:01:47 +01:00
Silversthorn
0ddc8015e9 Fixing server select list + traductions 2021-11-19 22:08:36 +01:00
Silversthorn
6f9d722a92 Fixing MOTD display 2021-11-19 21:59:23 +01:00
Zedifus
4139ac1152 Fix title formatting 2021-11-19 18:48:22 +00:00
Zedifus
9f066fbe39 Make Developer tag point to gitlab profile 2021-11-19 17:46:40 +00:00
Zedifus
460779e4ef Make staff titles bold 2021-11-19 17:10:47 +00:00
Iain Powrie
c40ce93ca5 Merge branch 'tweak/update-credits-json' into 'dev'
Update Credits

See merge request crafty-controller/crafty-commander!87
2021-11-19 16:58:12 +00:00
Andrew
df398718f1 Fixes bug for backup loops on shutil. 2021-11-19 01:07:53 -05:00
Zedifus
36d310b8f9 Add basic xithical to staff credits 2021-11-18 23:56:44 +00:00
Zedifus
acebf90326 Compress PT 2021-11-18 22:15:03 +00:00
Zedifus
b8081fec02 Add Zedi to credits
and fix some image rename mistakes
2021-11-18 21:54:41 +00:00
Zedifus
c33a550f2f Rename staff pictures 2021-11-18 21:38:58 +00:00
Zedifus
6eb4f313f9 Add last updated timestamp to patrons 2021-11-18 21:08:19 +00:00
Zedifus
134dcf00d3 Correct panel to read pat-gen levels properly 2021-11-18 20:02:29 +00:00
Zedifus
6744fe5409 Correct patreon to patron
Patreon is the platform, supporters are patrons
2021-11-18 20:01:30 +00:00
Silversthorn
671d362415 Merge branch 'server-role-creation' into server-role-creation-look 2021-11-17 22:10:22 +01:00
Silversthorn
bb3fa970d2 BetterLookingRolesSelect 2021-11-17 22:00:14 +01:00
Andrew
f033320bc4 Added translations for roles being added at server creation. 2021-11-17 13:25:19 -05:00
Andrew
327122348d Adds checkbox option for adding roles at server creation.
Fixes bug on Panel Config page where duplicate servers would be listed.
Changes the way "roles" are served to the page. Dictionary instead of model object.
2021-11-17 13:08:41 -05:00
Andrew
ce25a8fa4d initial commit for roles being added on server creation 2021-11-17 01:43:09 -05:00
Andrew
917bd5e32d Working single role selection on server creation. 2021-11-17 01:17:36 -05:00
Silversthorn
133e7cf291 Server Versions Ordered by Descending 2021-11-05 19:33:24 +01:00
Iain Powrie
126964dc30 Merge branch 'lukas-fixes-everywhere' into 'dev'
Lukas fixes

See merge request crafty-controller/crafty-commander!83
2021-11-05 16:41:09 +00:00
luukas
2e1a5c8895 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 2021-11-02 17:00:58 +02:00
luukas
ac2e763379 Add SVG logos and change everything to use them 2021-11-02 17:00:48 +02:00
Andrew
4b7088d103 Fixes status page bug where servers always report being online 2021-10-18 17:43:14 -04:00
Silversthorn
74912a8648 Fixing Style Issues 2021-10-09 11:10:24 +02:00
Silversthorn
1e954db3c4 Correction Missing Permissions when 0 servers 2021-10-04 17:48:19 +02:00
Silversthorn
a0b673a2d7 Minor Corrections 2021-10-04 17:06:57 +02:00
luukas
b9423f0233 Fix a couple of bugs on the add user/edit user pages 2021-09-30 22:32:33 +03:00
Andrew
72a85d7e64 Adds user based languages
changes server creation so that it adds it to roles instead of creating one
Changes server creation so you cannot create a server without a role.
2021-09-29 19:32:21 -04:00
Andrew
0ee8418ba5 Merge branch 'db-lang' into 'user-language'
Db lang

See merge request crafty-controller/crafty-commander!79
2021-09-29 21:50:17 +00:00
Andrew
56deaa0bcb Initial back end support for user based languages 2021-09-29 17:46:54 -04:00
Andrew
acedb0ad8a Added inital setup for user-based languages.
Waiting for DB changes to finish.
2021-09-28 22:25:47 -04:00
Andrew
97c74a873f Fixes show/hide for popovers on dash and on config 2021-09-28 20:15:29 -04:00
Andrew
cc6590257d Adds popover alerts to config page.
Adds a button to show API key so it's not just out there.
2021-09-28 17:02:15 -04:00
Andrew
e0529577fc Fixes formatting from removing backups stats 2021-09-27 13:17:29 -04:00
Andrew
a6e8ce4a45 Fixes issue where mobile message would show up all the time 2021-09-27 13:08:43 -04:00
Andrew
22e48bbfce Adds better support for the moblie can't see message.
Removes Backups counter from Dashboard.
2021-09-27 12:52:43 -04:00
Andrew
d17e17e38b Fixes issue where user would be disabled after changing password if no servers existed. 2021-09-25 15:41:25 -04:00
Andrew
74f4bf748e Adds support for a friendlier splashscreen when no servers are created.
Users can go to an empty dashboard instead of a wall of text.
2021-09-25 15:07:39 -04:00
Iain Powrie
e05803598a Add pyinstaller icon 2021-09-23 02:05:29 +00:00
Andrew
44478939db Merge branch 'wait_start' into 'dev-staging'
Wait start

See merge request crafty-controller/crafty-commander!72
2021-09-20 22:32:19 +00:00
Andrew
6e54089890 Adds delayed start status for auto-launching servers when crafty starts. 2021-09-20 18:30:17 -04:00
Andrew
f032f4054e Adds inital support for waiting to start. Need to test on more powerful machine. 2021-09-20 14:46:31 -04:00
Scott R
9813be70b0 Fix notify.html to properly check for superuser
notify.html wasn't properly checking for superuser so the whole site would crash and burn in a fiery blaze when a user logged in
2021-09-16 21:23:08 -05:00
Andrew
f18d74540a Fixes bug where player counts would cause crash if not super user.
Adds commands sent through terminal to audit log.
Makes it so regular users cannot see the audit log.
2021-09-13 22:02:57 -04:00
Andrew
333cd33be3 Fixes server port writing issue. 2021-09-13 17:04:46 -04:00
Andrew
7316cc7ea0 Adds kill process button to dashboard. 2021-09-13 15:03:47 -04:00
Andrew
2528c123f2 Adds port/internet connection checks.
Checks when crafty starts for internet and a port forward for Crafty's https port.
Checks on server launch for internet connection and for port forwarding for executed server.
2021-09-13 13:10:34 -04:00
Silversthorn
45739a2e5f Fixing errors messags in js 2021-08-29 00:51:34 +02:00
Silversthorn
3ff3d0ccf1 Adding MOTD on Status Page 2021-08-29 00:48:30 +02:00
Silversthorn
a05b3a8634 Status Improvements and Fix 2021-08-28 01:48:46 +02:00
Andrew
e4d94fbda5 Adds status page at /status 2021-08-26 21:06:22 -04:00
Andrew
86ad734f4d Changed coloring on files menu. Delete is now red 2021-08-24 22:20:03 -04:00
Andrew
d125ec76f2 Adds default value when renaming a file. 2021-08-24 22:05:30 -04:00
Andrew
b77aab954d Adds download options for files in file tree. This does not add ability to download directories. 2021-08-24 21:33:29 -04:00
Silversthorn
bb1f43bc81 Adding Support for Crafty Permissions with limits 2021-08-24 23:07:00 +02:00
Andrew
bd27e619b4 Merge branch 'dew-translation' into 'dev'
Added translations for files page (uploads/zips)

See merge request crafty-controller/crafty-commander!60
2021-08-24 00:29:38 +00:00
Andrew
d767dd066c Added translations for files page (uploads/zips) 2021-08-23 20:24:40 -04:00
Silversthorn
cf331a8bc3 Merge branch 'dev' into dev-Silversthorn 2021-08-24 00:25:07 +02:00
Silversthorn
261c8665c8 Pretty Server Version Choice 2021-08-24 00:24:40 +02:00
Andrew
ce4a7619a6 Fixes wait window closing after first upload is complete and not waiting for all uploads to complete. 2021-08-23 18:22:35 -04:00
Andrew
833cc55c5d Fixes upload indicator
Fixes max-body-size
2021-08-23 17:52:55 -04:00
Andrew
b24fd93487 Merge branch 'broken-uploads' into 'dev'
Fixed upload streams

See merge request crafty-controller/crafty-commander!53
2021-08-22 20:37:02 +00:00
Andrew
86c1b374bf Fixed upload streams
Lukas added a lot of pretty things to the upload waiting screen.
Current bug: progress bar is not 100% working.
2021-08-22 16:31:49 -04:00
Silversthorn
8eef9e094d Fixing UI after deletion of User_Servers 2021-08-22 22:18:39 +02:00
Andrew
734a576cb9 Still broken 2021-08-22 10:54:34 -04:00
Andrew
4ff0392292 Still broken 2021-08-22 10:42:06 -04:00
Andrew
7389b37198 Initial commit on this broken branch 2021-08-22 10:17:33 -04:00
Andrew
032da16a7b Somehow the delete function was broken. Fixed it 2021-08-21 20:20:33 -04:00
Silversthorn
2df9810ab4 Merge branch 'dev' into dev-Silversthorn 2021-08-22 01:42:43 +02:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02:00
Andrew
2ea4ff1214 Now I actually removed the scroll bars...I think 2021-08-21 18:52:46 -04:00
Andrew
0058b6c8cb Removed scroll bars from virt_console 2021-08-21 18:51:11 -04:00
Andrew
6ecf6285b9 Made it so vterm stops auto scrolling if user interrupts. 2021-08-21 16:17:35 -04:00
Andrew
35047e062a Fixed term buttons not changing on start/stop 2021-08-21 15:17:07 -04:00
Silversthorn
31436bdc62 Merge branch 'dev' into dev-Silversthorn 2021-08-21 16:44:02 +02:00
Andrew
89f6a98dc9 Took out ability to assign specific users to specific servers. All role based now. 2021-08-21 10:07:43 -04:00
Silversthorn
a68d24b890 Adding Working Permissions for roles on html pages 2021-08-21 10:44:03 +02:00
Andrew
1bc8acb1c5 FIxed scrollbars on overlay 2021-08-20 15:18:55 -04:00
Andrew
af3ab28ee8 Fixed context menu css dupe 2021-08-20 15:15:17 -04:00
Andrew
6e59bbd524 Fixed context menu. Added feature for off-clicking. 2021-08-20 14:58:52 -04:00
Andrew
bd51742b94 Added better context menu 2021-08-20 13:46:01 -04:00
Andrew
f539f9e095 I leaned on my keyboard just before the last commit. Fixed the things 2021-08-19 23:50:24 -04:00
Andrew
e08df4d369 Completed file uploading. Need to fix listing when right clicking. Unzip is shown at all times. Added unzip function to helpers and is called through ajax for unzipping files to current directory. 2021-08-19 23:36:25 -04:00
Florian RVT
8b66fc3fc4 Adding permissions on role_servers with edit 2021-08-20 00:18:50 +02:00
Andrew
90d59faf5b This is broken right now. Trying to add unzip function 2021-08-19 16:50:18 -04:00
Andrew
00422f24cd Moved delete server to ajax call instead of a task. 2021-08-18 18:50:53 -04:00
Andrew
0ab8f11a60 Merge branch 'dev' into 'pretzel'
# Conflicts:
#   app/classes/shared/server.py
#   app/classes/web/panel_handler.py
#   main.py
2021-08-18 16:34:41 +00:00
luukas
a54115bed9 Add pointer cursor to all file tree items 2021-08-12 17:54:52 +03:00
luukas
d1f582edfe Full release on stdout fix!
Basically I ditch the ANSI codes and use the old highlighting system.
2021-08-11 23:29:31 +03:00
Andrew
7d5a7658e2 Made failed server launch message more "in your face" to user. 2021-08-10 16:37:47 -04:00
luukas
4bac56e84a Use stdout for virtual terminal. WebSockets seem to be "laggy". 2021-08-10 23:17:56 +03:00
Andrew
a826e872eb Changed labels for server ip/port in html 2021-08-09 23:20:46 -04:00
Andrew
677d5e33d9 Removed ok button from server delete dialog 2021-08-09 22:16:13 -04:00
Andrew
c44a128f19 Added proper messages for deleting server. 2021-08-09 21:49:40 -04:00
Andrew
8db46d6ab6 Added option to remove server files on delete.
Added confirmation for server delete.
2021-08-09 20:48:22 -04:00
Andrew
488175cc2e Added users attached to roles on role edit page. 2021-08-09 17:11:45 -04:00
Andrew
0e5e2cd217 Added the ability for non super-users to change their own password. 2021-08-09 01:29:13 -04:00
Andrew
9ec10db762 Disabled checkboxes in user configs if servers were granted by role. 2021-08-08 18:26:28 -04:00
Andrew
debabfc045 Added server/role lists to panel config 2021-08-08 16:43:04 -04:00
Andrew
ad4b3b6075 Merge branch 'pretzel-unstable' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-unstable 2021-08-08 11:59:50 -04:00
Andrew
a4aee7e413 Fixed "other" page on role editor so it looks for role id and not role name 2021-08-08 11:59:18 -04:00
Andrew
ea57d62b1b Fixed reset buttons on role editor and user server edit page 2021-08-08 10:49:00 -04:00
Andrew
160e374c7a Update messages are working, but it's not clean and we should find a better way at some point. 2021-08-07 15:23:22 -04:00
Andrew
f50e80749c Still fighting with failed start message 2021-08-07 14:28:34 -04:00
Andrew
85fe2c9d21 Working through start error messages 2021-08-07 14:25:47 -04:00
Andrew
e86998e57d This is the unstable version of pretzel where he breaks things. 2021-08-07 13:15:53 -04:00
Andrew
b39e0e3a62 Added users to servers. Fixed some bugs with assigning users to role/servers. Fixed bug where user could not edit server config 2021-08-06 00:34:57 -04:00
luukas
7acf095463 Make HTTP handler functions not return anything else than None to remove an error in the log. Also make users not log out when visiting a page on the public handler 2021-07-30 19:20:01 +03:00
Andrew McManus
3d979ffed3 Merge branch 'pretzel_update' into 'pretzel'
Added update button and bug fixes

See merge request crafty-controller/crafty-commander!31
2021-07-30 14:59:16 +00:00
Andrew McManus
a661d33698 Fixing bugs with updates 2021-07-26 21:39:22 -04:00
Andrew McManus
a8449cc6f2 Cleanup update code 2021-07-26 21:08:46 -04:00
Andrew McManus
0643a68c74 Adding refresh on dash and term when update finishes to get the status to change. Could not do it dynamically. Buttons would no longer be clickable. Would like to figure that out at some point in the future. 2021-07-26 21:05:52 -04:00
Andrew McManus
fa9184c1ad Dumb bug I just fixed because I'm dumb. 2021-07-26 18:49:05 -04:00
Andrew McManus
a2f32ed324 Another commit because it seems like the first one didn't work. Added seamless hchanging on update status 2021-07-26 18:43:57 -04:00
Andrew McManus
b205c00c06 Fixed bug where update button still had start command attached. 2021-07-26 12:12:51 -04:00
Andrew McManus
979c67d064 Added db setter for stats field (updating) so we can disable start button when server is updating. 2021-07-25 17:04:10 -04:00
Andrew McManus
9cb46a86fb Added executable updater 2021-07-24 21:09:39 -04:00
luukas
55d63c1f7a Add translation file caching, show file read error (if any) and fix a typo in the Finnish translation. 2021-05-27 21:39:46 +03:00
luukas
736924c839 Fix uptime negative time error by saving it as UTC from the start. 2021-04-18 00:20:23 +03:00
luukas
500e537b18 Disable "Other" page button on new user page 2021-04-17 23:27:35 +03:00
luukas
b772bcb03e Fix "Server wizard has multiple elements with same ids" 2021-04-17 23:24:34 +03:00
computergeek125
5a6f09d38f Added patreons (WIP), fixed spelling error 2021-04-04 15:02:35 -05:00
Andrew
f3baedd41d Added term-nav-item class to all nav items in every server navigation in HTML files to fix CSS formatting issues. 2021-04-04 14:34:14 -04:00
computergeek125
54b0578e79 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2021-04-03 12:39:25 -05:00
computergeek125
bd6eed118a Resolves CRAFTY-CONTROLLER-T-81 - error when creating new user
Also cleans up the panel and server code to handle other states better
2021-04-03 12:36:01 -05:00
luukas
0b3d20ffbe One monster truck commit for
add translation API, add fi_FI and en_EN translations, add C and
.properties file support, check if file is binary before sending and
clean up ajax handler
2021-03-26 15:57:50 +02:00
computergeek125
5272756240 Merge logo swap 2021-03-21 23:50:38 -05:00
computergeek125
506c9bb3c3 Merge branch 'backups-and-stuff' into dev 2021-03-21 23:32:48 -05:00
computergeek125
81c60d6dac One monster truck commit for rework and backups 2021-03-21 23:02:18 -05:00
Silversthorn
cd617ad5f3 Users Access to Servers from Roles Working
Broke Users Servers Link
2021-03-13 23:12:42 +01:00
computergeek125
c65b4a267e Staff, patreon, and translations all proceedurally generate now 2021-03-13 11:07:04 -06:00
Phillip Tarrant
653a4d6bc7 Merge branch 'admin-controls' into 'dev'
Player controls

See merge request crafty-controller/crafty-commander!26
2021-03-07 21:30:19 +00:00
Phillip Tarrant
85403c61af Merge branch 'dev' into 'websocket'
# Conflicts:
#   app/classes/shared/models.py
#   app/classes/shared/tasks.py
2021-03-07 21:29:57 +00:00
luukas
932f3586eb Change wait message for when a server is importing 2021-03-05 11:10:13 +02:00
luukas
8eb89dc131 Delete file_edit.html as it is not needed 2021-03-05 11:07:00 +02:00
luukas
031cf8cf96 Change copyright from 2020 to 2021 2021-03-05 11:05:03 +02:00
luukas
1be41b8534 Player controls 2021-03-05 10:58:38 +02:00
luukas
9c62099f32 Add authentication to WS, notify user when an activity log gets logged, and more 2021-03-01 02:54:20 +02:00
luukas
a965af5491 Remove unnecessary websocket.html 2021-02-27 14:17:37 +02:00
luukas
7be57ecfc9 Oops, forgot one thing 2021-02-27 14:07:16 +02:00
luukas
7691dc566e Finish WebSockets 2021-02-27 14:05:04 +02:00
luukas
2595e6950d Host stats are now realtime(d) by websockets 2021-02-26 17:39:35 +02:00
luukas
c6555b53e4 Change comment type from HTML to JS 2021-02-26 10:59:25 +02:00
Phillip Tarrant
92bcefa8cc Merge branch 'clone_servers' into 'dev'
Create clone servers button/action

See merge request crafty-controller/crafty-commander!23
2021-02-21 17:17:34 +00:00
Phillip Tarrant
96dbaf3583 Merge branch 'file_manager_polishing' into 'dev'
File manager polishing

See merge request crafty-controller/crafty-commander!22
2021-02-21 17:14:43 +00:00
Phillip Tarrant
abcb097cdb Merge branch 'remove-old-logs' into 'dev'
"remove old logs" feature

See merge request crafty-controller/crafty-commander!21
2021-02-21 17:14:03 +00:00
oasis
e1fb653aa8 Changed logo-long to crafty controller image. Removed commander image. 2021-02-09 12:25:05 -05:00
LukasDoesDev
ed0208ab0e Create clone servers button/action
Can't copy while running
2021-01-28 20:46:13 +02:00
LukasDoesDev
1bf3b381ac Add icons to file tree 2021-01-23 00:50:56 +02:00
LukasDoesDev
521eac3a83 Change "Ace" button to "Default" 2021-01-23 00:18:48 +02:00
LukasDoesDev
bf200480ce Add buttons for choosing the keyboard handler thing (Ace, Vim, Emacs, Sublime) 2021-01-23 00:12:52 +02:00
LukasDoesDev
6b2ef2c451 Remove unnecessary logs, update logs to have more information, add resizing to file editor 2021-01-20 23:10:25 +02:00
LukasDoesDev
bcaac8b9eb I think that the "remove old logs" feature is done 2021-01-20 17:20:42 +02:00
Phillip Tarrant
307d14ab77 Merge branch 'macgeek_role_manager' into 'dev'
Basic role manager

See merge request crafty-controller/crafty-commander!18
2021-01-19 12:29:26 +00:00
Phillip Tarrant
c154f316b7 Merge branch 'lukas-development' into 'dev'
File Manager

See merge request crafty-controller/crafty-commander!19
2021-01-19 12:28:58 +00:00
LukasDoesDev
e3a359bbc6 File Manager: DONE 2021-01-17 19:20:28 +02:00
LukasDoesDev
eb06f1b33b Now can edit files. Also fixed a bunch of bugs. 2021-01-15 21:59:58 +02:00
LukasDoesDev
eba7bff050 Now can see a tree view of the directory the server is in. Will do file editing now. 2021-01-15 14:13:06 +02:00
LukasDoesDev
c08751c7f8 FILES: Got everything working except Tornado seems to escape my HTML output, works if you set the output to the DOM and run the script below it. 2021-01-15 00:55:14 +02:00
Phillip Tarrant
0c5d11c780 Merge branch 'issue_8' into 'dev'
Time improvements, Issue 8

See merge request crafty-controller/crafty-commander!16
2021-01-14 14:56:15 +00:00
LukasDoesDev
9e66f46c2e 2 bug fixes
1st: Footer had padding in credits.html, caused by missing closing div tag.
2nd: Java VM errors when memory is a float. Server wizard should convert from gigabytes to megabytes (Trello card)
2021-01-13 16:48:04 +02:00
LukasDoesDev
6a253971e7 Add error when JavaScript isn't enabled 2021-01-11 21:51:38 +02:00
LukasDoesDev
2523e2e198 Fix error when server is offline, change "Not calculated yet" to "Error Calculating", remove unnecessary logging, make a loop, and fix durationToHumanizedString output number types having s's even though the number is 1 or -1. 2020-12-31 19:41:02 +02:00
computergeek125
8131cfd396 Added skeleton role manager 2020-12-27 11:00:26 -05:00
computergeek125
d91361efa5 Updated user manager to support server selection 2020-12-25 22:00:28 -05:00
computergeek125
cf61c3c931 Skeleton user manager added 2020-12-24 17:55:15 -05:00
LukasDoesDev
8ce4491a01 Add ThatOneLukas to credits.html 2020-12-23 17:16:42 +02:00
computergeek125
7ddcdd4e0e Removed execute bit on a few files 2020-12-20 11:40:25 -05:00