Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,156 Commits 12 Branches 45 Tags 104 MiB
d6e00edf4a
Commit Graph

1061 Commits

Author SHA1 Message Date
Zedifus
f3e41861d2 Remove guard on whitspace 
We can just trim instead
 2022-10-22 19:24:06 +01:00
Zedifus
a2a8b6449f Tidy comments and declaration order 
Declare functions before the function that uses it
 2022-10-22 19:04:57 +01:00
Zedifus
eaf5ae3664 Tidy turbo long lines for scroll-less readability 2022-10-22 18:50:48 +01:00
Zedifus
fd906d56e8 Clear input field after we've grabbed the value 
Reduce repetition of code
 2022-10-22 18:18:00 +01:00
Zedifus
1217f93c05 Hoist sanatise declaration 
Function should be declared before trhe functions that use it, not after
 2022-10-22 18:11:54 +01:00
Zedifus
6437f4fbd5 Break up if/else into guard clauses 2022-10-22 18:08:35 +01:00
amcmanu3
34cda5a081 Fix backups refresh causing issues on firefox 2022-10-21 16:48:51 -04:00
Andrew
4707489310 More regex 2022-10-20 14:12:51 -04:00
Andrew
241a33542b Fix JS breaking symbols 2022-10-20 13:52:16 -04:00
Andrew
e576a69d39 Merge branch 'feature/log-filter' of gitlab.com:crafty-controller/crafty-4 into feature/log-filter 2022-10-20 10:04:45 -07:00
Andrew
cbe7ad9a39 Change variable naming to make more sense 2022-10-20 10:01:20 -07:00
Iain Powrie
b21d0d82f2 Apply 5 suggestion(s) to 1 file(s) 2022-10-18 04:22:06 +00:00
Andrew
3b813a6849 Fix splice error 2022-10-13 00:01:53 -04:00
Andrew
ec746d2131 Fix duplicate word bug 
Fix delete bug
 2022-10-12 23:55:25 -04:00
Andrew
3f4d232910 Add log filtering 
known bug: when adding more than 4 items to js array
 2022-10-12 23:29:20 -04:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
Zedifus
21d119d58e Merge branch 'dev' into dev-fixed-sidebar-V2 2022-10-06 18:48:57 +01:00
Silversthorn
905be275ed Add Collapse Memory for sidebar on LargeBreakpoint 2022-10-06 07:52:24 +02:00
Silversthorn
002d89934e I hope this time it's ok, the sidebar works as intended 2022-10-04 23:58:31 +02:00
Silversthorn
425cb3869b Fixing scrolling sidebar even when collapsed 2022-10-04 23:10:03 +02:00
Silversthorn
d87a2c4c17 Revert "Fix scrolling of sidebar" 
This reverts commit 99693324dc.
 2022-10-04 23:03:42 +02:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Andrew
f558388a0f Update themes to include all colors 2022-10-04 13:31:37 -04:00
Zedifus
4d74a1e3c0 Merge branch 'dev' into bug/zip-import-conditional 2022-10-03 22:26:22 +01:00
amcmanu3
03320c375a Fix conditional issue with zip imports/uploads 2022-10-03 15:38:45 -04:00
Silversthorn
99693324dc Fix scrolling of sidebar 2022-10-03 18:48:49 +02:00
Andrew
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import' 
# Conflicts:
#   app/frontend/templates/server/wizard.html
 2022-10-02 19:10:05 +00:00
Andrew
dc218eb9d5 Remove java specific settings from bedrock upload 2022-09-28 18:23:12 -04:00
Andrew
ab344cbff4 Add zip upload to bedrock servers 2022-09-27 22:49:52 -04:00
Andrew
b9bd654e58 Add upload import functionality. 
Update gitignore
 2022-09-27 22:06:22 -04:00
Andrew
31a8366186 Fix tooltip colors 2022-09-26 21:41:22 -04:00
Andrew
3d82b61007 Add comments to CSS file. 
Update ronald theme
 2022-09-26 21:34:54 -04:00
Andrew
3eb87209de Fix color issues with dropdown 2022-09-26 21:24:00 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
95188a053d Fix navigation colors 2022-09-25 22:36:17 -04:00
Andrew
c7a292a662 Fix notification color 2022-09-25 22:23:37 -04:00
Andrew
baa441d427 Add light. Fix login 2022-09-25 22:18:36 -04:00
Andrew
ca91debea1 Set base.html origin back to default 2022-09-25 17:52:24 -04:00
Andrew
e6121b06a6 Add dark mode. Refactor code to accept themes 2022-09-25 17:52:01 -04:00
Andrew
d7de340807 Initial commit for themes/black 2022-09-25 12:45:22 -04:00
amcmanu3
084cb8b71c Fix scrollable term issue on startup 2022-09-19 20:17:02 -04:00
Zedifus
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
Zedifus
53be81dc08 Merge branch 'dev' into tweak/terminal-scroll 2022-09-19 21:47:52 +01:00
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
amcmanu3
17b6ec9fe3 Cleanup JS errors 2022-09-09 13:16:26 -04:00
Andrew
84838aae4d Fix vterm scroll logic when user is on bottom 2022-09-07 18:16:18 -04:00
Andrew
a0d921ffe3 Cleanup virtual term scroll 
Add scroll to bottom button when scrolled
 2022-09-07 18:02:49 -04:00
Andrew
1a9dd53ebe Remove roles url from href 
Fixes trace when clicking "roles config" tab while on roles config page.
 2022-09-07 13:48:18 -04:00
amcmanu3
83834286fb Fix creation aesthetic 2022-09-04 18:27:45 -04:00
amcmanu3
e3cf2765f0 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-04 18:01:03 -04:00
amcmanu3
ab2e8cde0f Fix formatting on server creation page. 2022-09-04 18:01:00 -04:00
amcmanu3
76a499f5a4 Fix start server after updates 
Fix update notifs
 2022-09-04 17:50:08 -04:00
Zedifus
0bce6f432a Merge branch 'dev' into enhancement/metrics-range 2022-09-04 21:25:45 +01:00
amcmanu3
e9c74be057 Add ability to change metrics scale 2022-09-04 16:21:33 -04:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00
amcmanu3
d568b7c664 Fix EULA message for legal reasons 
Make EULA message look prettier
 2022-09-01 14:18:04 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
amcmanu3
b274f0d3b0 Remove update url from config 2022-08-31 19:36:43 -04:00
Andrew
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
b0b04a6495 Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout 2022-08-27 17:50:50 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Andrew
9831705677 Fix height on different viewports 2022-08-22 22:39:39 -04:00
Andrew
1e569300fc Add translations 2022-08-22 20:23:09 -04:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
amcmanu3
6ad9863cbf Still kinda broken, but this is cool 2022-08-22 01:15:18 -04:00
amcmanu3
eec9f0fc95 Remove zooming 2022-08-21 21:53:24 -04:00
amcmanu3
7e5d6fddda Add zoom to chart 2022-08-21 21:47:05 -04:00
Andrew
4225de55e8 Add server metrics graph 2022-08-21 17:04:23 -04:00
Andrew
d06db6e028 Fix formatting for general users 2022-08-21 12:46:07 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
Andrew
0672b9378a Add more secure logic to add/edit users 2022-08-20 18:51:35 -04:00
Andrew
7a68e08a64 Working role manger super user 
TODO: Remove maanger after user is deleted
 2022-08-20 09:31:33 -04:00
Andrew
552a2e26c2 Working role managers. 
TODO: Add super user select option
 2022-08-20 08:49:38 -04:00
Andrew
bd64f0d2ae Initial commit for role managers 2022-08-20 08:32:39 -04:00
amcmanu3
7a98331b1f Add translations. Tweak frontend 2022-08-19 15:08:35 -04:00
amcmanu3
c1d16522d0 Add manager field to users 2022-08-19 13:09:59 -04:00
amcmanu3
eea5e329af Refactor and add import_helpers. 
Working jar imports
 2022-08-17 17:22:03 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
Zedifus
e2a4e096a2 Merge branch 'dev' into bug/backup-reload 2022-08-14 18:36:27 +01:00
Zedifus
b452d06b8e Merge branch 'dev' into tweak/pretzel-users-title 2022-08-14 18:16:11 +01:00
Zedifus
1b9445bde0 Merge branch 'dev' into tweak/pretzel-logout 2022-08-14 17:37:32 +01:00
Andrew
1545c1415c Reload backup page on front end 2022-08-12 20:24:11 -04:00
Andrew
893d166c72 More testing 2022-08-08 13:04:36 -04:00
amcmanu3
8e934528c4 Fix users title 2022-08-07 14:45:13 -04:00
Andrew
8adcfbaf45 Updates 2022-08-07 13:23:45 -04:00
Andrew
3f4e9ac0c2 Merge branch 'dev' into enhancement/mobile-app 2022-08-07 12:59:14 -04:00
amcmanu3
3b5e3a30cd Log users out when browser tab is closed. 2022-08-07 11:04:56 -04:00
Andrew
be7a816f78 Fix reaction tasks not firing 
Fix delay not being accurate
 2022-08-07 01:30:59 -04:00
amcmanu3
8897856aef Remove Update button when unloaded 
Fix duplicate list issue
 2022-08-05 20:24:42 -04:00
Zedifus
c5d049830e Merge branch 'dev' into bug/unloaded-servers 2022-08-06 01:10:16 +01:00
amcmanu3
5cbb8f7018 Fix broken unloaded servers 2022-08-05 20:04:34 -04:00
Zedifus
3e3c0ff946 Merge branch 'dev' into enhancement/pretzel-schedules 2022-08-06 00:20:31 +01:00
Zedifus
0af2def7b0 Update credits panel to handle v2 schema 2022-08-05 23:39:31 +01:00
amcmanu3
b039eec857 First commit for unloaded server. Working Frontend 2022-08-05 17:56:44 -04:00
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
amcmanu3
e0377d4b2f Add translations to schedules page 2022-08-05 11:56:41 -04:00
Zedifus
4f1026c42f Change href to open new tab 2022-08-05 03:09:57 +01:00
Zedifus
390d995f53 Add flashing frontend notification 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:56:26 +01:00
Zedifus
a0b599bbd2 Merge branch 'dev' into enhancement/pretzel-next-run 2022-08-05 01:27:18 +01:00
Zedifus
e306bc449c Merge branch 'dev' into bug/pretzel-api-key-delete 2022-08-05 01:12:52 +01:00
amcmanu3
3974b7e8c7 poorly attempt to add "add to home" feature 2022-08-04 19:45:44 -04:00
amcmanu3
6c0cd54e7e Add next run to schedule info 2022-08-04 18:15:59 -04:00
amcmanu3
719896e4b2 Fix api key delete confirm 2022-08-04 15:47:52 -04:00
Andrew
4f4798d44a Add serverjars cache refresh 2022-08-03 15:38:44 -04:00
Andrew
b4213a438b Clean up javascript. Add Translations 2022-08-03 12:26:59 -04:00
Andrew
d1bdb6198b Fix server creation with serverjars API 
By accident this adds some modded support.

TODO: Cleanup javascript in wizard.
Fix naming on selects in wizard
 2022-08-02 21:08:53 -04:00
Zedifus
ec2094d378 Merge branch 'dev' into dev-FixStatusPage-JS_errors 2022-07-18 21:23:35 +01:00
Zedifus
523e51a0ae Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:51 +01:00
Silversthorn
b6d6b9c0a4 Remove unused elements and move get_players to py file instead of html file 2022-07-17 10:57:25 +02:00
Silversthorn
b6fc8c059d Fixing motd not displaying properly one mobiles 2022-07-16 19:58:58 +02:00
Andrew
11260a34d6 Toggle Visible servers on status page 2022-07-14 18:26:42 -04:00
Andrew
1438ce1c36 Add handle. 
Change text color in "on" position
 2022-07-14 14:46:23 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
luukas
c88ef5e9d6
Add a title to the schedule toggle on mobile 2022-07-13 13:42:43 +03:00
amcmanu3
11b13fbcd6 Add page alert for wrong password 2022-07-05 20:27:10 -04:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
amcmanu3
964b3bc4c3 Remove auto complete on edit user 2022-07-05 19:21:06 -04:00
amcmanu3
c909d01596 Fix file unzip on Firefox 2022-07-05 17:50:51 -04:00
Zedifus
3b9f72beee Merge branch 'dev' into tweak/clone-confirmation 2022-06-24 03:02:48 +01:00
Zedifus
e4140748cf Merge branch 'dev' into dev-BetterMobileDisplayStatusPage 2022-06-24 02:56:52 +01:00
Silversthorn
db839252ac Better Display 2022-06-23 18:07:25 +02:00
Silversthorn
ae73165423 smaller Server icon 2022-06-23 18:02:54 +02:00
luukas
f951b49e2f
AJAX schedule enabled status 
This is buggy in its current state
 2022-06-23 01:58:06 +03:00
Silversthorn
b3993d1072 First try to add a better display for Status Page 2022-06-22 21:36:05 +02:00
Andrew
b359685392 Add clone server confirmation. 2022-06-22 14:51:10 -04:00
amcmanu3
b1b04e536e Fix cannot delete backup on page 2 2022-06-21 23:18:17 -04:00
Zedifus
7107713666 Merge branch 'dev' into enhancement/file-editor-large 2022-06-21 22:01:36 +01:00
amcmanu3
d1af950c46 Update translation 2022-06-21 16:55:42 -04:00
amcmanu3
c2bcc82cc0 Fix save button bug 2022-06-21 16:44:30 -04:00
amcmanu3
6e1eaf595c Allow file-editor increase size 2022-06-21 16:41:06 -04:00
amcmanu3
177d99e002 Add mobile menu to pages without it 2022-06-21 15:59:34 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
70e9290627 Merge branch 'dev' into dev-ImprovingMobileDisplay 2022-06-21 20:23:48 +01:00
Zedifus
a6d9b81775 Add execution cmd -display only- for non supers 2022-06-21 20:11:01 +01:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
6fe5d16ded Remove java selection from bedrock 2022-06-21 19:05:56 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
amcmanu3
569d21f295 Fix java override for general user 2022-06-20 20:50:34 -04:00
amcmanu3
41532f97ef Change translation from None to javaNoChange 2022-06-20 18:53:19 -04:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
Silversthorn
eb37faac08 Better Mobile Display for Dashboard 2022-06-20 23:41:52 +02:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Silversthorn
2d3377b497 Fixing Resizing of the table 2022-06-20 22:39:03 +02:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening 
See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
Silversthorn
ce21ed6171 Fixing Mobile Display on Server Wizard 2022-06-20 19:24:09 +02:00
Andrew
4f5b52bbdf remove sticky from main menu 2022-06-18 18:19:32 -04:00
Andrew
e9bf2af83b Add wiki iframe as requested. 2022-06-18 15:57:37 -04:00
Andrew
4a35e09fbd Remove commander naming scheme from public 2022-06-18 15:53:47 -04:00
Andrew
fff186e547 Merge branch 'bugfix/reconnecting-websocket' into 'dev' 
Make the WebSocket automatically reconnect.

See merge request crafty-controller/crafty-4!345
 2022-06-16 13:39:25 +00:00
luukas
f39e75616c
Use an exponential backoff algorhithm. 
https://stackoverflow.com/a/37038217/15388424
 2022-06-16 02:37:53 +03:00
Iain Powrie
c22d07d832 Merge branch 'bugfix/getelementbyid-first-dashboard' into 'dev' 
Fix an error when there are no servers

See merge request crafty-controller/crafty-4!346
 2022-06-15 23:30:12 +00:00
luukas
d9c03caa9b
Fix an error when there are no servers 2022-06-16 00:19:48 +03:00
luukas
cd8ebfdcbe
Make the WebSocket automatically reconnect. 
The WebSocket reconnects 5 seconds after the connection's closure.
If the connection reconnection fails it will try to reconnect after
another 5 seconds.
 2022-06-16 00:10:48 +03:00
luukas
c9744554d4
Improve the code for save status 2022-06-14 03:07:26 +03:00
luukas
a67f069709
Fix Ace editor saving keybinds and ex-commands 
* Remove our manual keydown handler and use an Ace builtin function
* Define Vim's :write aka :w ex-command
 2022-06-14 02:45:17 +03:00
luukas
392cf3d4e7
Make the file editor stick to the top of the page 2022-06-14 01:35:43 +03:00
Andrew
474597d16c Add survery to admin first log 2022-06-12 17:03:42 -04:00
Andrew
52d53aafe4 Delay wss error message for slower systems 2022-06-12 10:47:12 -04:00
amcmanu3
d5be8d1531 Update contribution page 2022-06-11 16:36:07 -04:00
Silversthorn
538b78db47 Fixing Translations issues loaded in with js 2022-06-09 00:11:21 +02:00
Silversthorn
f23bdd14a2 Fixing an issue with single quotes and translations 2022-06-08 23:56:22 +02:00
Silversthorn
757959e89d Fixing the last one 2022-06-04 02:20:45 +02:00
Silversthorn
61806b6050 Correction of unused import 2022-06-04 02:13:11 +02:00
Silversthorn
2e5299e521 Improving MOTD 2022-06-04 02:13:00 +02:00
Iain Powrie
ebf00a1900 Merge branch 'secops/pre-beta-security-fixes' into 'dev' 
Pass 2 sec advisory fixes

See merge request crafty-controller/crafty-4!294
 2022-06-03 20:10:17 +00:00
amcmanu3
0200f1caec Remove useless console logs 2022-06-03 15:53:12 -04:00
amcmanu3
6eb3e541bf Fix player counts on dashboard 2022-06-03 15:21:57 -04:00
Zedifus
4cdd2bf776 Remove unused code 2022-06-03 19:50:58 +01:00
Zedifus
62bdf22618 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 19:49:51 +01:00
Zedifus
04ffe0eb65 Remove unused function 2022-06-03 18:41:05 +01:00
Zedifus
df86897108 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 18:33:21 +01:00
Andrew
293ae5dbd1 Remove link to non-used jquery item 2022-06-02 13:41:16 -04:00
Andrew
e561e112d4 Refactor jquery-ui to vendors 2022-06-02 13:27:38 -04:00
DarthLeo1000YT
d486fdd4c8 add jquery back to the main base.html template. 2022-05-30 20:57:19 -04:00
Andrew
26b3b8a869 Merge branch 'cleanup/remove-unused-dependencies' into 'dev' 
Remove unused dependencies

See merge request crafty-controller/crafty-4!279
 2022-05-30 13:18:42 +00:00
Zedifus
ca793807cb Add kofi widget 
Not sure how to remove the background behind the widget :(
 2022-05-29 07:09:39 +01:00
luukas
f2890fa31d
Remove unused dependencies 2022-05-28 18:31:11 +03:00
Andrew
7ca7232829 Add question to warning message 2022-05-24 19:11:14 -04:00
Andrew
5104c34513 Add link to documentation to WSS error 2022-05-23 21:23:29 -04:00
Zedifus
2a4295d9b3 Add subscription source parsing & format html 2022-05-23 22:21:32 +01:00
Iain Powrie
1e96e7a6c9 Merge branch 'merge/api-v2' into 'dev' 
New API v2 PR

See merge request crafty-controller/crafty-4!254
 2022-05-18 23:27:19 +00:00
Iain Powrie
11b7817a11 Merge branch 'dev-BetterDisplayMobile' into 'dev' 
Better display on mobile

See merge request crafty-controller/crafty-4!229
 2022-05-18 23:13:05 +00:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2' 
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
 2022-05-18 21:56:39 +00:00
Andrew
ca73a5f60b Merge branch 'dev' into 'experimental/feature/permission-matrix' 
# Conflicts:
#   app/classes/web/panel_handler.py
 2022-05-18 20:47:43 +00:00
amcmanu3
0f661d5400 Disable checkboxes until server access 2022-05-18 16:37:38 -04:00
Silversthorn
bef099a5a8 Merge branch 'dev' into dev-BetterDisplayMobile 2022-05-18 22:13:44 +02:00
Silversthorn
8c21eddf2b Fixed Table occupation 2022-05-18 22:00:20 +02:00
amcmanu3
12390306fd Add permissions checks for quantity for users/role 
Remove the ability to add quantities for general users.
 2022-05-18 14:33:22 -04:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
luukas
8737c15fcf Add a permission matrix to the role add and edit 2022-05-18 01:09:58 +03:00
Andrew
984f4cc4d6 Change Files Aesthetic 2022-05-15 12:38:48 -05:00
Andrew
5fa209bf52 Add date to uptime calc. 
Big assist from Zedifus
 2022-05-14 18:51:05 -05:00
luukas
1aa0d65cf7 Merge branch feature/external-frontend to feature/api-v2 without the frontend 2022-04-14 15:33:53 +03:00
Iain Powrie
5d209b0827 Merge branch 'macgeek.db' into 'dev' 
Macgeek database refactor

See merge request crafty-controller/crafty-commander!246
 2022-04-13 19:26:11 +00:00
Andrew
ec6421b62c Disable Backups when no path 2022-04-12 17:37:20 -04:00
Andrew
12b0f8326d Fix bug where no backup dir would exist on clone 2022-04-12 17:17:12 -04:00
Andrew
cbd99f2ccc Fix bug where users could not drag files 2022-04-12 15:27:03 -04:00
amcmanu3
9a6152abdd Add end quote 2022-04-02 23:34:58 -04:00
amcmanu3
f921f777eb Enhance file save feedback 2022-04-02 23:21:21 -04:00
amcmanu3
82df93c700 Fix bug where server id was hard coded on cmd send 2022-04-02 22:44:40 -04:00
amcmanu3
71fd416fd0 Appease Zedifus 2022-04-02 21:47:32 -04:00
amcmanu3
c7394ab77e Add ability for users to disable hints 2022-04-02 21:25:26 -04:00
amcmanu3
4166d99885 Change password name 2022-04-02 20:37:22 -04:00
amcmanu3
03ce4ec517 Add ability to use ctrl + s 
Add save status indicator
 2022-04-02 15:57:11 -04:00
amcmanu3
657d3e92f2 Add max stream size to config.json 
Add ability to translate error message
 2022-04-02 13:50:40 -04:00
amcmanu3
dc69a8a9f2 Add better feedback on upload max size failure 2022-04-02 13:06:20 -04:00
Andrew
f78d59fd34 Server jars/gravatar would stack with no internet 2022-03-27 18:09:49 -04:00
Andrew
c93824de7c Add quotes to fix formatting 2022-03-27 17:26:48 -04:00
Silversthorn
c7fab827d9 Adding Dropdown menus for small screens 2022-03-26 23:37:08 +01:00
Silversthorn
3797d5430f Merge branch 'dev' into dev-BetterDisplayMobile 2022-03-23 19:33:43 +01:00
Andrew
ecc87a6137 Add context menu for iOS + Bug fix 2022-03-22 14:24:15 +00:00
Silversthorn
0933c5750d Trying to do table dropdown for Dashboard page 2022-03-20 14:41:27 +01:00
Randy Carranza
6d6699638a Resolves an issue on mobile where the table cant be scrolled to the side 2022-03-20 08:03:56 -04:00
Randy Carranza
c303a866b6 Added code to disabled sorting when the user is a mobile user 2022-03-20 06:04:06 -04:00
Iain Powrie
f280da8c52 Better dashboard re-ordering 2022-03-19 01:48:24 +00:00
amcmanu3
1253d60ad8 Remove scroll bars from motd 2022-03-14 19:48:53 -04:00
Andrew
6659466427 Merge branch 'bug/cannot-create-server' into 'dev' 
Fix error where user could not create server

See merge request crafty-controller/crafty-commander!211
 2022-03-14 23:11:01 +00:00
amcmanu3
0f27b2df91 Fix error where user could not create server 
Fix error where user could not create support files
 2022-03-14 17:39:19 -04:00
Silversthorn
5900033134 Fixing Cookies deletion 
Adding redirection at Login
 2022-03-14 22:26:09 +01:00
Andrew
1f980484ae Adjust max size of motd 2022-03-13 17:12:33 -04:00
Andrew
f889dc1dad Fix bug could not drag servers after searching 2022-03-13 16:41:27 -04:00
Andrew
c111f7b69e Add === to check in dash 2022-03-13 16:14:50 -04:00
Andrew
6b42735444 Add search to dashboard 
Fix MOTD formatting
 2022-03-13 16:02:55 -04:00
Andrew
fdce9e2539 Add websocket warning/error 2022-03-13 08:44:19 -04:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Andrew
33cad6afa8 Add percentage to backups page 
Helper designed to be used for support logs as well.
 2022-03-11 00:19:05 -05:00
Andrew
eda9f44b5f Merge branch 'bug/backups-restore/download' into 'dev' 
Bug/backups restore/download

See merge request crafty-controller/crafty-commander!197
 2022-03-08 02:56:52 +00:00
amcmanu3
7302737005 Fix 'server_id' not defined bug in download file 2022-03-07 21:48:37 -05:00
amcmanu3
244beed1e4 Fix restore message not showing up immediately 2022-03-07 21:46:42 -05:00
Iain Powrie
9c99346bbe 3.5 Translations (Squashed) 
Thank you translators <3 you're all amazing!
 2022-03-08 01:22:30 +00:00
Andrew
344348fafc Merge branch 'sync-symbol' into 'dev' 
Add sync symbol to status page

See merge request crafty-controller/crafty-commander!196
 2022-03-08 01:08:28 +00:00
amcmanu3
f2cc0e89fb Add sync symbol to status page 2022-03-07 19:57:52 -05:00
Silversthorn
6effc85d82 Removing trad for patreon supporter 2022-03-05 18:46:52 +01:00
Silversthorn
671a8ce369 Fixing Display on Smartphone Translators 2022-03-05 14:22:35 +01:00
Silversthorn
1297eb3fbb Format File 2022-03-05 14:10:23 +01:00
Silversthorn
29f8fb391e Fixing Diplay for Credits 
Adding Profile Pic for empty ones
 2022-03-05 13:59:19 +01:00
Silversthorn
506129729e Update Translation 
- Adding Translation for Credits Page
 - Adding detection support for webpage
 2022-03-05 12:01:36 +01:00
Iain Powrie
7f8960aed3 Merge branch 'staff/credits-update-leo' into 'dev' 
Staff/credits update leo

See merge request crafty-controller/crafty-commander!184
 2022-03-04 23:53:14 +00:00
Zedifus
5e4eaab54f Correct leo's credit file 2022-03-04 23:40:58 +00:00
Silversthorn
319361bd3a Fixing Icon error on GET 2022-03-04 21:30:45 +00:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly 
Add sync indicator to dashboard
 2022-03-03 19:41:30 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
52297829df Putting Jar versions from most recent to oldest 2022-03-03 23:20:55 +01:00
Silversthorn
cb1679806e Seperate refresh statistics for each server 
Fixing Broken Things
 2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a Broke Things 2022-03-03 22:01:12 +01:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00
Andrew
18283cf2b3 Fix front end for removing world 2022-03-01 21:56:12 -05:00
Andrew
c8c1f301c0 Fix server importing for bedrock that's not a zip 2022-03-01 18:31:38 -05:00
xithical
c4f706d415 Rework of files handling and added exclusions selection for backups. 2022-03-01 01:02:30 +00:00
xithical
26014d0e86 Revert "Merge branch 'xithical-fixes' into 'dev'" 
This reverts merge request !173
 2022-02-28 04:40:33 +00:00
Andrew
10bf19bdf1 QOL changes for markup 2022-02-27 23:02:07 -05:00
Andrew
f563ceb8ad Fix delete backup 2022-02-27 22:45:22 -05:00
xithical
5758d64e96 Merge branch 'dev' into 'xithical-fixes' 
# Conflicts:
#   app/classes/web/ajax_handler.py
#   app/frontend/templates/panel/server_backup.html
 2022-02-28 03:04:23 +00:00
Andrew
70ba8cceec Add fully working backups 2022-02-27 21:49:26 -05:00
Andrew
2bf2902754 Working backup exclusions 2022-02-27 21:40:05 -05:00
Andrew
097d5689fc Fix typo in server_backup.html 2022-02-27 16:41:08 -05:00
Andrew
e7d78cadd4 Initial frontend for backup omissions 2022-02-27 16:15:40 -05:00
Andrew
652a4a28a3 Santize inputs to the best of our ability. Could not find full solutions for server_schedule_edit.hmtl 2022-02-27 14:36:33 -05:00
luukas
775c4d5c9f Fix this one little stupid bug 2022-02-27 20:14:14 +02:00
luukas
92c2af926a Reduced the amount of injection in JavaScript. 
* Moved file endpoints to file_handler.py
* Added a global `serverId` for some pages
* Fixed fi_FI translations
* Some other stuff I don't remember
 2022-02-27 19:26:54 +02:00
Andrew
3b0fbc7e36 English translation for edit scheudles 2022-02-26 20:40:17 -05:00
Andrew
5fa04d5ccc Refactor tasks.html to schedules.html to match naming scheme 2022-02-26 20:23:20 -05:00
Andrew
f82241c96e Add check so you cannot drag and drop anchor tag in dashboard row 2022-02-26 20:02:10 -05:00
Andrew
76b243d695 Remove codeblock that would cause js to vomit 2022-02-26 18:24:03 -05:00
Andrew
09335fc3d9 Add ability to reorder servers based on user 2022-02-26 18:00:54 -05:00
Andrew
18e2ac8328 Change zip import execution string to the correct one 
Fix front end for bedrock imports
Add server type to details
 2022-02-26 12:29:07 -05:00
Andrew
45ae49e84e Add features to child tasks 2022-02-25 19:53:38 -05:00
Andrew
a54a4780b3 fix typo in front end 2022-02-23 23:43:50 -05:00
Andrew
c1020ff3d1 Working chain reaction tasks 2022-02-23 22:58:48 -05:00
Andrew
540584990e Inital bedrock support 2022-02-10 18:20:36 -05:00
Andrew
5adc48c524 Merge branch 'pretzel-bedrock' into 'pretzel-fixes' 
# Conflicts:
#   app/frontend/templates/server/bedrock_wizard.html
#   app/frontend/templates/server/wizard.html
 2022-02-10 20:57:31 +00:00
Andrew
b025899aee Inital bedrock support 2022-02-10 15:54:00 -05:00
Andrew
260c3b0059 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-02-10 15:27:51 -05:00
Andrew
c89609ae61 Inital bedrock support 2022-02-10 15:27:40 -05:00
Andrew
a084b95426 Merge branch 'dev' into 'pretzel-fixes' 
Merge Dev to pretzel

See merge request crafty-controller/crafty-commander!165
 2022-02-10 19:32:59 +00:00
Iain Powrie
d3b601b29c Merge branch 'lukas-easier-navigation' into 'dev' 
Added better navigation.

See merge request crafty-controller/crafty-commander!162
 2022-02-10 13:42:21 +00:00
Zedifus
78224a9a55 Update wiki link to wiki 
It's back from holiday
 2022-02-10 06:49:35 +00:00
luukas
c25bc72315 Added better navigation. 
* Double chevrons on the top right to expand/collapse the sidebar
* Save sidebar preference on extra large (>= 1200px) viewports
* Auto collapse sidebar on large (>= 992px) viewports
* (Old behavior) Medium (>= 768px) and smaller viewports are mobile
Check app/frontend/templates/main_menu.html line 45 onwards for more
 2022-02-10 00:26:16 +02:00
Andrew
e2930232cd Fix spacing with values in websocket stats update 2022-02-08 01:57:19 -05:00
Andrew
ce2e53a962 Remove (UTC Time) from server start in details. Server start time is localtime. 2022-02-08 01:08:58 -05:00
Andrew
5a290da11d Fix typo in edit_user 2022-02-07 23:36:32 -05:00
Zedifus
624f755fd4 Better format of titles for Support & Retired 2022-02-06 05:37:19 +00:00
Zedifus
0c6bcaa097 Add if for is no img is provided for credit file 
This fixes broken image symbol if no img provided in json
 2022-02-06 05:34:45 +00:00
Andrew
45ab07eb77 Revert migrations 2022-01-27 21:53:07 -05:00
Andrew
4a2a1ab451 Remove motd dynamic update as it breaks json loading 2022-01-27 18:19:11 -05:00
Andrew
85eef71b9e Add max player/total player to stats keeping on dashboard 2022-01-27 18:16:27 -05:00
Iain Powrie
e0ce1d118c Create pylintrc, code review pipeline & correct codebase errors 
Fix uploads,
Only send server stats to user page when they have access to servers
 2022-01-26 01:45:30 +00:00
Andrew
0812d9ca02 Add fatal to logging 2022-01-21 21:36:19 -05:00
Silversthorn
bae08d05d9 Merge branch 'dev' into dev_websocket_server_status 2022-01-21 23:54:59 +01:00
Silversthorn
92a65ad7f1 Adding Websocket for server details 
Adding Starting status on languages files
Removing all useless refresh things
 2022-01-21 23:50:04 +01:00
Andrew
dc838d097f Add translations for panel config/users config/api keys/ role config 2022-01-20 00:05:14 -05:00
Silversthorn
b385d1add3 Add Update Dashboard by websocket 2022-01-19 22:45:52 +01:00
Silversthorn
97cad998e8 Using Wabsocket for refreshing Status Page 2022-01-19 21:34:59 +01:00
Andrew
cebb25b5e9 add try execpt around task scheduling. Fix edit task bug. Fix permission issue after JWT merge 2022-01-19 13:07:26 -05:00
Andrew
f37e1e04a4 Fix gravatar not loading after being removed from cookie. Improve gravatar loading so it changes without relogging 2022-01-18 16:44:36 -05:00
Lukas ‎‎‎‎
09bd01a634 Merge branch 'dev' into 'lukas-jwts' 
# Conflicts:
#   app/classes/web/panel_handler.py
#   app/frontend/templates/notify.html
#   app/translations/en_EN.json
#   requirements.txt
 2022-01-16 10:54:55 +00:00
luukas
a20f7c4acf Fix translation stuff 
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
 2022-01-15 17:38:08 +02:00
Andrew
0d3fc43931 Remove schedules from DB when deleting a server. 
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
 2022-01-14 23:53:44 -05:00
luukas
93857f90db JWT login and multi API keys! 2022-01-15 02:23:50 +02:00
luukas
73ed194283 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 
:P I had some really old changes
 2022-01-14 23:07:06 +02:00
Andrew
ef4a31d1e8 Attempt fix for delayed start issues - was finally able to reproduce 
Port feature from 3.4 added by Trevor (@uplusion23) for terminal history.
Add datatable to mobile version of tasks.
 2022-01-14 02:35:26 -05:00
Andrew
8424fc3149 Put support logs into a thread. 2022-01-13 20:42:53 -05:00
Andrew
362f16fec4 Fix sorting on schedules 
Fix deleting scheduled tasks that are disabled.
 2022-01-13 00:30:35 -05:00
Andrew
77b65de09b add sorting to tasks table 2022-01-12 23:58:16 -05:00
Andrew
5e59705251 Update sorting on activity log. 2022-01-12 23:52:47 -05:00
Andrew
6ad2075b5a change date formatting on audit log for better date sorting 2022-01-12 23:34:52 -05:00
Andrew
20a69b1e0d fix max size of audit table 2022-01-12 22:56:44 -05:00
Andrew
d4359da6b1 fix front end for tasks and activity logs 2022-01-12 22:54:22 -05:00
Andrew
9f798ff291 Add popover for tasks mobile 
Add support logs download feature
 2022-01-12 21:12:28 -05:00
Andrew
6fd5db3429 Add popover for mobile schedules 2022-01-12 18:52:44 -05:00
Silversthorn
fe7df99c19 Improve Tasks View for Mobile 2022-01-12 19:48:22 +01:00
Andrew
799b563e5f Fix runtime error with recalling stop command while editing tasks 2022-01-12 00:03:24 -05:00
Andrew
3acc89c0eb Remove depreciated scheduler from tasks 2022-01-11 21:56:37 -05:00
Andrew
79e33cd295 remove scroll bar 2022-01-11 20:26:39 -05:00
Andrew
751fffe4a3 Fix formatting for long commands on scheduled tasks 2022-01-11 20:16:39 -05:00
Andrew
f681e5d69d fix true/false flip on edit task enable/disable 2022-01-11 19:12:54 -05:00
Andrew
68e22de069 Fix bug where you could not select Shutdown from tasks 2022-01-11 19:09:46 -05:00
Andrew
4a4ff16d75 Add classname to delete task button 2022-01-11 18:53:41 -05:00
Andrew
47b48c3ee4 Fix translations in schedules 2022-01-11 18:51:07 -05:00
Andrew
04952737ed I'm dumb. More front end issues 2022-01-11 18:40:02 -05:00
Andrew
fc06c743bc fix bug where 'command' line was always shown 2022-01-11 18:37:31 -05:00
Andrew
51fcb2adc3 Add working schedules. 
Add ability to edit schedules.
Add new pages for task creation/edit.
 2022-01-11 17:24:05 -05:00
Andrew
5e7d0d64bd Cron tasks working. 
Starting to rearrange front end for better UX
 2022-01-11 12:17:57 -05:00
Andrew
c220c6d3d3 Remove schedule logic from backups. 2022-01-11 01:45:54 -05:00
Andrew
14ae7c9a46 Add working schedules. 
Do not use advanced cron scheduling yet.
Ability to add/delete scheduled jobs.
 2022-01-11 00:26:33 -05:00
Andrew
139b506554 Inital APScheduler code for integration with our SQLite DB in progress. Adding commands works with start/stop/restart 2022-01-10 20:11:52 -05:00
Andrew
73c6c1b871 Fix port reminder 
Add Server time zone to details
 2022-01-10 14:58:38 -05:00
Andrew
2cd15ba738 Fix tree-caret on zip imports 2022-01-09 23:47:10 -05:00
Andrew
70cc90549d Minor fixes to user deletion. 
Allow users with user permissions to delete users...wow. How many times can I say user?
 2022-01-09 23:34:11 -05:00
Andrew
db6a886e0f Fix minor bugs in super user activation. Add 'are you sure' to delete user 2022-01-09 23:16:11 -05:00
Andrew
3546d50142 add english translation for zip imports 2022-01-09 22:58:13 -05:00
Andrew
4d636cce1b add working zip import selection functionality 2022-01-09 22:49:03 -05:00
Andrew
b815cf38a8 Zip import semi broken. 
Need to figure out why temp dir is not being passed correctly
Need to make sure tempdir gets deleted.
 2022-01-09 22:21:28 -05:00
Andrew
369ac7ad15 initial changes for zip imports selection 2022-01-09 18:04:54 -05:00
Andrew
935ee66560 fix formatting on cron input 2022-01-09 01:24:04 -05:00
Andrew
83db2bc3e4 Fix naming for basic/cron schedules 2022-01-09 01:16:09 -05:00
Andrew
592121ef78 Fix bug where files tooltip showed up for dirs and tooltip didn't show up for files. 2022-01-09 00:15:18 -05:00
Andrew
9a3d7601e2 Fix file dir tooltip 2022-01-08 23:57:31 -05:00
Andrew
5eb953f2a0 Fix footer 2022-01-08 19:07:50 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
abb7b8af08 Update copyright again 2022-01-01 00:16:43 -05:00
Andrew
1e54f2e3af Update copyright 2022-01-01 00:15:33 -05:00
Andrew
e53da60b4f Make files tree show up on page load 2021-12-20 12:51:27 -05:00
Andrew
a48078ac1a Take edit button out of if statement in server_tasks. 2021-12-09 17:46:07 -05:00
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