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
3,992 Commits 12 Branches 45 Tags 104 MiB
feature/jinja2-for-webhooks
Commit Graph

1007 Commits

Author SHA1 Message Date
amcmanu3
3714d2393d Fix logical issue with uploading dynamic files 2023-02-10 16:07:59 -05:00
amcmanu3
6d0ec12a6f Fix typos in server-config form. Fix whitespace 2023-02-10 14:48:19 -05:00
amcmanu3
87fdb1627c Add feature - ignore exit codes on crash detection 2023-02-10 14:02:26 -05:00
amcmanu3
dd69ad066c Trunkate sidebar servers to a max of 10 2023-02-10 13:35:22 -05:00
amcmanu3
d0e8148282 Fix tooltip update 2023-02-07 17:51:13 -05:00
Silversthorn
5b4639b839 Truncate the too long lines and add Tooltip 2023-02-07 23:20:24 +01:00
Silversthorn
8b48d73a85 Inprove Storage Display 2023-02-07 19:56:13 +01:00
amcmanu3
5d5f0eaaa5 Create table for display 
Add translations
 2023-02-05 20:11:21 -05:00
amcmanu3
f381562b3b Make monitored mount points user configurable 2023-02-05 19:05:20 -05:00
amcmanu3
f824ca2959 Dynamically update storage on host stats 2023-02-05 18:03:36 -05:00
amcmanu3
f00182e8e9 Remove extra </li> 2023-02-05 17:06:29 -05:00
amcmanu3
b224103778 Add storage to the dashboard 2023-02-05 16:47:12 -05:00
Silversthorn
d9abf0ef4d Adding icones 2023-02-04 15:59:09 +01:00
Silversthorn
08e600b69c Adding Mobile Display for config menu 2023-02-04 10:50:44 +01:00
amcmanu3
edddfca8bc Fix spacing on moble server controls 2023-02-03 18:24:42 -05:00
amcmanu3
ca0a53b326 Add translations to Crafty Config Page and wizard 2023-02-03 16:00:13 -05:00
amcmanu3
6b5ec51887 Upgrade to fontawesome6 2023-02-03 15:59:52 -05:00
Silversthorn
15fee87709 Improving display for hidden parts 2023-02-02 23:48:12 +01:00
Silversthorn
137ae3041f Improving Forms Displays for upload files and server creation 2023-02-02 23:47:54 +01:00
amcmanu3
c22a073f2f Add space after gear 2023-02-01 17:34:07 -05:00
amcmanu3
bb482b8381 Use response text for errors on uploads. 
Overhaul
 2023-02-01 17:09:39 -05:00
amcmanu3
20ce8996d7 Add better upload feedback for users 2023-02-01 15:43:17 -05:00
amcmanu3
238b8da4d9 Add upload progress bar for file uploads 2023-02-01 15:31:43 -05:00
Silversthorn
7949db65ac Improving Switches on Config Server Page 2023-01-31 20:20:08 +01:00
amcmanu3
d160054bb3 Add translations 2023-01-30 23:32:45 -05:00
amcmanu3
819e84ec4c Translate additions to backups page 2023-01-30 23:27:40 -05:00
amcmanu3
e43c63a8b7 Fix db not found issue 
Add page feedback.
 2023-01-30 18:31:46 -05:00
amcmanu3
d273589f2e Fix front end 2023-01-30 17:23:25 -05:00
amcmanu3
73233181be Fix typo on front end 2023-01-30 15:39:09 -05:00
amcmanu3
552ed8a5a6 Append /servers/ on the input field 2023-01-30 15:30:11 -05:00
amcmanu3
863ded782a Add move servers dir functionality 2023-01-30 15:23:10 -05:00
Iain Powrie
4300cab1b9 Merge branch 'refactor/config-json' into 'dev' 
Managed config.json refactor

See merge request crafty-controller/crafty-4!485
 2023-01-29 23:33:55 +00:00
amcmanu3
af654bc89f Make the color look nicer 2023-01-29 17:25:44 -05:00
amcmanu3
d24c3c5ba0 Add red color to reset values 2023-01-29 17:05:17 -05:00
amcmanu3
040536f320 Merge branch 'dev' into bugfix/file-tree-reload 2023-01-29 15:13:02 -05:00
amcmanu3
3c2b2e8a87 Add better feedback for files that finish upload 2023-01-28 21:50:45 -05:00
amcmanu3
d31a0a0512 Fix root directory uploads 2023-01-28 20:35:58 -05:00
amcmanu3
e0541b1ec0 Change file tree doesn't reload on upload/delete 2023-01-28 19:10:27 -05:00
Silversthorn
d01dfe40db Merge branch 'dev' into enhancement/config-json 2023-01-28 01:37:41 +01:00
Zedifus
e217c63fdf Merge branch 'dev' into bug/ReworkDefautPublicHandler 2023-01-27 19:59:12 +00:00
Zedifus
b5d259bce7 Merge branch 'dev' into feature/backup-echo 2023-01-27 19:39:05 +00:00
Zedifus
84592c178e Merge branch 'dev' into refactor/scheduled-task-queue 2023-01-27 19:30:03 +00:00
Silversthorn
d97a792987 Remove public page to use direct login as status one 
Rework HTTP Handler as we redirect all trafic to HTTPS
 2023-01-25 23:26:04 +01:00
Andrew
248a5a63a9 Include option for after command 2023-01-21 13:13:02 -05:00
Silversthorn
0a418363b0 Improving Display of Panel Config Pages 2023-01-21 12:29:08 +01:00
Silversthorn
03d236f1a0 Enhance Visual for the selectpicker 2023-01-21 09:53:46 +01:00
Andrew
cf9ad77879 Add option to run command before backup 2023-01-20 17:35:30 -05:00
amcmanu3
2e810b1544 Fix button covers 2023-01-19 16:20:23 -05:00
amcmanu3
04f7876e9f Add selectpicker. Make select look nicer 2023-01-19 14:09:21 -05:00
amcmanu3
dfa2f5fb1e Remove antequeted code after moving from db 2023-01-19 11:28:00 -05:00
Andrew
868b324547 Black config_json. Add feedback on submit 2023-01-18 18:00:50 -05:00
Silversthorn
ba415c1168 Fixing display of dropdown select 2023-01-18 22:44:26 +01:00
Silversthorn
caf7dd2fac Improving enable of all languages 2023-01-18 22:42:17 +01:00
Silversthorn
4573feaa9a Merge branch 'dev-transparent-login' of gitlab.com:crafty-controller/crafty-4 into dev-transparent-login 2023-01-18 22:17:03 +01:00
Silversthorn
c0fff12f39 Fix center position for login background to center 2023-01-18 22:16:51 +01:00
Silversthorn
35d33ef51c Improving config_json form and Fixing disabled languages 2023-01-18 22:01:23 +01:00
Andrew
33b9026e8e Fix delete. Remove secondary selection box 2023-01-18 14:40:01 -05:00
Andrew
0d85b55c06 Allow file paths with symbols for background 2023-01-18 14:35:35 -05:00
Silversthorn
71c5d46296 Improving Login Display in Panel Config 2023-01-17 22:02:37 +01:00
Silversthorn
9fc7a0523e Improve display of the login form on settings 2023-01-17 21:48:17 +01:00
Silversthorn
7984ca8157 Add Personalized Transparency for Login Page's Form 2023-01-17 20:40:16 +01:00
Andrew
dc7b682ce6 Fix merge conflict issues 2023-01-15 19:09:29 -05:00
Andrew
07220f68bf Merge branch 'enhancement/config-json' of gitlab.com:crafty-controller/crafty-4 into enhancement/config-json 2023-01-15 18:58:28 -05:00
Andrew
8d8b065e41 Working config.json from page 2023-01-15 18:57:22 -05:00
amcmanu3
99ccfb2228 Remove submit function 2023-01-14 22:24:20 -05:00
amcmanu3
f9064eb15f Turn it into a list for a fresh start at this 2023-01-14 22:22:37 -05:00
Andrew
bea48d9059 Add better formatting for lists. 2023-01-10 14:12:33 -05:00
Silversthorn
3c11f0120d Rework panel config for login page 2023-01-10 00:53:47 +01:00
Andrew
4f4ec16a9b Make config editable from Crafty 2023-01-09 18:52:45 -05:00
Andrew
1daaecc790 Remove un-needed log messages 2022-12-29 19:05:55 -05:00
amcmanu3
60e393d7cf Make qol changes to startup warning 2022-12-28 00:20:06 -05:00
Andrew
47e2635b20 Set a timeout on server launch to display warn 2022-12-27 09:45:39 -05:00
Zedifus
2889c060e6 Merge branch 'dev' into tweak/server-port-explained 2022-12-21 16:11:13 +00:00
Andrew
ec50a80e1f Add warning icon 2022-12-19 19:48:15 -05:00
Andrew
7f629d21e9 Update translation 
Make it so warning appears all the time
 2022-12-19 19:42:40 -05:00
Andrew
0bd4dd7e69 Add popover to server port to explain it's purpose 2022-12-19 18:42:05 -05:00
Andrew
a1e8b7afe7 Make server directories non-configurable 2022-12-17 12:21:15 -05:00
Andrew
c74aeb5dde Fix id mismatch zip upload import 2022-12-15 18:48:15 -05:00
Zedifus
c2f086554c Merge branch 'dev' into bug/status-page-colors 2022-12-07 13:44:53 +00:00
Zedifus
d127fc6e3d Merge branch 'dev' into bug/plus-sign-path 2022-12-07 13:33:19 +00:00
Andrew
4baaec8752 Fix colors on public pages. 2022-12-02 13:06:10 -05:00
Andrew
48a6f98cb5 Fix port not showing on dash while server online 2022-11-30 21:50:55 -05:00
Andrew
0c9ee0e0e0 Fix plus sign in path bug with downloads & uploads 2022-11-30 20:28:24 -05:00
Andrew
206dc956cf Make background available to all public pages 
Move background to top of html for better loading
 2022-11-30 19:53:10 -05:00
Andrew
6a693fd2ca Merge branch 'feature/custom-login-background' of gitlab.com:crafty-controller/crafty-4 into feature/custom-login-background 2022-11-30 18:14:42 -05:00
Andrew
9bd0bd2f7e Make the zedifus changes. 2022-11-30 18:14:37 -05:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Zedifus
58d32ca4de Merge branch 'dev' into enhancement/dashboard-port 2022-11-30 20:51:52 +00:00
Andrew
2782e927d7 Add port tooltip over status on dash 2022-11-28 19:45:53 -05:00
Andrew
4e17c1ea5e Add installing status 2022-11-19 15:45:29 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Zedifus
5a2dc555f8 Merge branch 'dev' into feature/log-filter 2022-10-22 20:45:24 +01:00
Zedifus
1f2ff2345d Rename functions for readability 2022-10-22 19:43:59 +01:00
Zedifus
2599658321 Fix word list display on page load 
Whoopsie
 2022-10-22 19:37:16 +01:00
Zedifus
cb6e034f30 Guard against duplicate filters 
This protects against adding multiple filters of the same thing
 2022-10-22 19:28:13 +01:00
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