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,695 Commits 12 Branches 45 Tags 104 MiB
d92d06e4b1
Commit Graph

166 Commits

Author SHA1 Message Date
Silversthorn
d01dfe40db Merge branch 'dev' into enhancement/config-json 2023-01-28 01:37:41 +01:00
Silversthorn
0a418363b0 Improving Display of Panel Config Pages 2023-01-21 12:29:08 +01:00
Silversthorn
7984ca8157 Add Personalized Transparency for Login Page's Form 2023-01-17 20:40:16 +01:00
Silversthorn
3c11f0120d Rework panel config for login page 2023-01-10 00:53:47 +01: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
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
Andrew
4e17c1ea5e Add installing status 2022-11-19 15:45:29 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05: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
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
b9bd654e58 Add upload import functionality. 
Update gitignore
 2022-09-27 22:06:22 -04:00
Andrew
0cba81788e Add translation 2022-09-26 21:22:56 -04:00
Andrew
a0d921ffe3 Cleanup virtual term scroll 
Add scroll to bottom button when scrolled
 2022-09-07 18:02:49 -04:00
amcmanu3
d568b7c664 Fix EULA message for legal reasons 
Make EULA message look prettier
 2022-09-01 14:18:04 -04:00
amcmanu3
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -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
1e569300fc Add translations 2022-08-22 20:23:09 -04:00
Andrew
037758accb Working live graph 2022-08-22 20:04:40 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -04:00
Andrew
7a68e08a64 Working role manger super user 
TODO: Remove maanger after user is deleted
 2022-08-20 09:31:33 -04:00
amcmanu3
7a98331b1f Add translations. Tweak frontend 2022-08-19 15:08:35 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -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
3c8614f378 Fix traceback when editing schedule 2022-08-05 16:01:26 -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
Andrew
b4213a438b Clean up javascript. Add Translations 2022-08-03 12:26:59 -04:00
Zedifus
2775845da1 Sort lang en_EN 
Also fix java replace grammar
 2022-07-18 23:25:41 +01:00
Andrew
11260a34d6 Toggle Visible servers on status page 2022-07-14 18:26:42 -04:00
amcmanu3
11b13fbcd6 Add page alert for wrong password 2022-07-05 20:27:10 -04:00
Andrew
b359685392 Add clone server confirmation. 2022-06-22 14:51:10 -04:00
amcmanu3
d1af950c46 Update translation 2022-06-21 16:55:42 -04:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01: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
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
Zedifus
11335b58f3 Update Translations for kofi credit support 
More sane key naming as multiple sources, title & desc update too.
 2022-05-23 22:20:19 +01:00
amcmanu3
3432d660ef Expand Cron explain 2022-05-19 11:04:13 -04:00
amcmanu3
4166d99885 Change password name 2022-04-02 20:37:22 -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
Zedifus
cee590a867 Reencode utf-8 with BOM to utf-8 2022-03-08 06:32:29 +00:00
Iain Powrie
9c99346bbe 3.5 Translations (Squashed) 
Thank you translators <3 you're all amazing!
 2022-03-08 01:22:30 +00:00
Silversthorn
6effc85d82 Removing trad for patreon supporter 2022-03-05 18:46:52 +01:00
Silversthorn
506129729e Update Translation 
- Adding Translation for Credits Page
 - Adding detection support for webpage
 2022-03-05 12:01:36 +01:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00: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
322134506b Remove minecraft specific naming/stats 2022-03-01 21:43:36 -05:00
Andrew
11bf44b35e Add user feedback for wrong unzip path 2022-03-01 13:27:41 -05:00
Andrew
11278ebe5f Added translation for backup start/end messages. Finalize bedrock support. Removed confusion so server stats won't be shown if server isn't running. 2022-03-01 00:33:09 -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
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
fd22519ae1 Update english translation 2022-02-27 21:57:45 -05:00
Andrew
dfed1cbedc Add check to make sure server file is downloaded before attempting to start 2022-02-27 12:22:52 -05:00
Andrew
3b0fbc7e36 English translation for edit scheudles 2022-02-26 20:40:17 -05:00
Andrew
b025899aee Inital bedrock support 2022-02-10 15:54:00 -05:00
Andrew
42062004a2 Add extras for crash detection 2022-01-27 21:16:19 -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
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
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
Andrew
6fd5db3429 Add popover for mobile schedules 2022-01-12 18:52:44 -05:00
Andrew
47b48c3ee4 Fix translations in schedules 2022-01-11 18:51:07 -05:00
Andrew
73c6c1b871 Fix port reminder 
Add Server time zone to details
 2022-01-10 14:58:38 -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
369ac7ad15 initial changes for zip imports selection 2022-01-09 18:04:54 -05:00
Andrew
3e90210f3b Remove port checker for a port reminder on first run 
Add DB column to track a server's first run
Send port reminder for crafty on fresh install.
Remove http server message from startup/logs - don't want to promote that it's running.
 2022-01-09 13:14:59 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
bobsfriend12
8d81921e02 fix typo 2021-12-07 20:57:17 -06:00
Andrew
a19ba7dbb6 Backup Restore/Root Disable 2021-11-29 21:22:46 +00:00
Andrew
dc83dc8fc8 Add EULA confirm message on server startup if EULA is not found. 2021-11-23 16:11:23 -05:00
Silversthorn
0ddc8015e9 Fixing server select list + traductions 2021-11-19 22:08:36 +01:00
Andrew
df398718f1 Fixes bug for backup loops on shutil. 2021-11-19 01:07:53 -05:00
Silversthorn
671d362415 Merge branch 'server-role-creation' into server-role-creation-look 2021-11-17 22:10:22 +01:00
Andrew
f033320bc4 Added translations for roles being added at server creation. 2021-11-17 13:25:19 -05: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
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
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
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
Andrew
45d2bff57a Adds translations to start error messages. 2021-09-13 15:37:59 -04:00
Andrew
7316cc7ea0 Adds kill process button to dashboard. 2021-09-13 15:03:47 -04:00
Silversthorn
a05b3a8634 Status Improvements and Fix 2021-08-28 01:48:46 +02: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
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