Commit Graph

148 Commits

Author SHA1 Message Date
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
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