Commit Graph

297 Commits

Author SHA1 Message Date
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
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
amcmanu3
17b6ec9fe3 Cleanup JS errors 2022-09-09 13:16:26 -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
462fbb021e Add lang pl_PL
Thanks Terrariadlc²
2022-07-26 21:15:19 +01:00
Zedifus
f448ae3c7a Update lang es_ES
Thanks JuliGame
2022-07-26 21:14:22 +01:00
Zedifus
2775845da1 Sort lang en_EN
Also fix java replace grammar
2022-07-18 23:25:41 +01:00
Zedifus
e25bd9c776 Update lol_EN 😺
Help me.
2022-07-18 23:20:48 +01:00
Zedifus
9ddae0adfb Add lang pt_BR
Thanks Morse
2022-07-18 23:02:18 +01:00
Zedifus
ca4e4ddf79 Update lang id_ID
Thanks GamingBrowser
2022-07-18 23:00:01 +01:00
Zedifus
b7a960f037 Update lang fr_FR
Thanks Silversthorn
2022-07-18 22:55:27 +01:00
Zedifus
b3bf19782a Update lang fi_FI
Thanks Lukas
2022-07-18 22:51:11 +01:00
Zedifus
0e96b1360c Update lang he_IL
Thanks thefourcraft
2022-07-18 22:46:01 +01:00
Zedifus
0e875c4137 Update lang lv_LV
Thanks Mednis
2022-07-18 22:38:28 +01:00
Zedifus
471eccc882 Update lang zh_CN
Thanks ThrRip
2022-07-18 22:34:31 +01:00
Zedifus
a5dd9a676d Update lang nl_BE
Thanks TurtleKing
2022-07-18 22:29:58 +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
Matze
b7941484f5 Add string "cloneConfirm" to german translation (related to !388 & !384) 2022-06-24 20:26:34 +02:00
Iain Powrie
bf446e869d Merge branch 'tweak/german-lang-spelling' into 'dev'
reviewed the german translation, fixed some spelling issues and added some missing strings

See merge request crafty-controller/crafty-4!385
2022-06-24 02:30:46 +00:00
Matze
d3164c564e corrected a misunderstood translation in string "javaversionDesc" 2022-06-22 23:24:07 +02:00
Matze
6328ef4a74 reviewed the german translation, fixed some spelling issues and added some missing strings 2022-06-22 22:54:57 +02: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
Matze
ae4def47a4 Updated spelling of "default" and "defaultPort" in german translation 2022-06-19 19:43:52 +02:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
Analicia A
2b0900d95b Correct translation - Dutch - added a space between two words 2022-06-13 21:40:45 +00:00
luukas
6474663a64
Fix Finnish translations 2022-06-01 23:25:53 +03:00
Zedifus
ccd09e9753 Fix missing escaped chars in submitted translation 2022-05-28 15:17:41 +01:00
Iain Powrie
cfe5f01d78 Update he_IL.json 3.5
Fix For RTL & Typo Mistakes and orientation & definition of a few words

Thanks thefourcraft
2022-05-28 14:10:55 +00:00
Zedifus
f69cf39c1d Add Hebrew lang file
Up to date to 3.5, altered credits trans keys amended,
Patreon will need amended to Patreon / Ko-fi like en lang,
this will be done on final beta translation update.

Thanks thefourcraft
2022-05-24 18:58:37 +01: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
Iain Powrie
1c15e6c0a9 Update it_IT lang to 3.5
Thanks Gallu
2022-05-16 20:38:49 +00: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
897a9b2280 Add Latvian lang file
Thanks Mednis
2022-03-15 00:48:41 +00: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
Silversthorn
9699bedf39 Update French Translation 2022-03-04 21:34:55 +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
Lukas ‎‎‎‎
67c76f1d1c Merge branch 'lukas-noinjection' into 'dev'
Reduced the amount of injection in JavaScript.

See merge request crafty-controller/crafty-commander!170
2022-02-27 18:17:06 +00: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
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
luukas
ba64681aa9 Merge branch 'lukas-jwts' of gitlab.com:crafty-controller/crafty-commander into lukas-jwts 2022-01-16 14:14:05 +02:00
luukas
9463560eb6 Add more translations for API keys. 2022-01-16 13:40:08 +02: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
luukas
b8e9efad76 Add zh_CN translation for API keys. 2022-01-15 14:12:09 +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
13b14bfaed Merge branch 'dev_betterMobileViewTasks' into 'dev'
Dev better mobile view tasks

See merge request crafty-controller/crafty-commander!132
2022-01-12 23:53:47 +00:00
Andrew
6fd5db3429 Add popover for mobile schedules 2022-01-12 18:52:44 -05:00
Freddy 0
549b5e7974 Edited German translation, added Unraid xml 2022-01-12 17:57:03 +00: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
Andrew
9351e77b28 Add new translations. 2021-12-18 19:10:32 -05:00
Andrew
e12f11f6d5 Add translations
Add style to language select.
2021-12-09 11:44:08 -05:00
bobsfriend12
8d81921e02 fix typo 2021-12-07 20:57:17 -06:00
Iain Powrie
da2bb41877 Lang fixes 2021-12-03 23:09:45 +00:00
Iain Powrie
e9ba371324 Lang/include new language pack 2021-12-03 21:59:38 +00: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
Andrew
be163e2a87 Fixed finish translation 2021-11-17 16:31:12 -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
Silversthorn
481180289d Improving French Translation 2021-09-29 17:34:41 +02:00
Andrew
9b089bc849 Fixes translations 2021-09-28 17:03:32 -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
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
c5bcf2f60d Updates translations. 2021-09-13 15:46:22 -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
Silversthorn
25a0cf3d1e Improving French Translation 2021-08-24 18:23:45 +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
261c8665c8 Pretty Server Version Choice 2021-08-24 00:24:40 +02:00
Silversthorn
f1fc2f7d49 Add update for French language 2021-08-22 01:41:55 +02:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02:00
Silversthorn
5f387106e2 Adding French Language File 2021-08-21 16:33:11 +02: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
Andrew
9a2212e94e Merge branch 'lukas-features' into 'dev'
Lukas features

See merge request crafty-controller/crafty-commander!45
2021-08-18 16:29:36 +00: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
c44a128f19 Added proper messages for deleting server. 2021-08-09 21:49:40 -04:00
xithical
d3539974d1 Fixed typo in WTF error
Changed from "What a Terrble Failure!" to "What a Terrible Failure!"
2021-08-09 20:25:02 -05: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 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
979c67d064 Added db setter for stats field (updating) so we can disable start button when server is updating. 2021-07-25 17:04:10 -04:00
Andrew McManus
474b397035 Typo 2021-07-24 21:37:55 -04:00
Andrew McManus
d5c6eb942a Added more detail to update message - alerting users download times will vary based on network connections. 2021-07-24 21:35:45 -04:00
Andrew McManus
9cb46a86fb Added executable updater 2021-07-24 21:09:39 -04:00
luukas
55d63c1f7a Add translation file caching, show file read error (if any) and fix a typo in the Finnish translation. 2021-05-27 21:39:46 +03:00
luukas
736924c839 Fix uptime negative time error by saving it as UTC from the start. 2021-04-18 00:20:23 +03:00
luukas
0b3d20ffbe One monster truck commit for
add translation API, add fi_FI and en_EN translations, add C and
.properties file support, check if file is binary before sending and
clean up ajax handler
2021-03-26 15:57:50 +02:00