708 Commits

Author SHA1 Message Date
Andrew
6572dc5e10 Appease the linter 2022-12-16 18:47:36 -05:00
Andrew
551020f738 Create our own check function 2022-12-14 14:54:52 -05:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
b4dca8b27f Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install 2022-11-19 23:20:26 +01:00
Silversthorn
004049f6da Using Regex to Extract Infos from Forge Scripts 2022-11-19 23:20:21 +01:00
Andrew
32cdde0616 Fix failed imports 2022-11-19 16:13:44 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Zedifus
1f842574c4 Merge branch 'dev' into tweak/stats-clients 2022-10-22 20:26:18 +01:00
Andrew
23b3e642a0 Only collect server stats when clients 2022-10-20 15:33:51 -04:00
Andrew
c2f5daf8e9 Remove feature for modded servers 2022-10-20 15:05:58 -04:00
Andrew
2d5d263852 Automatically set update url for server creation 2022-10-20 14:58:43 -04:00
Zedifus
0721c0d7d4 Strip meta from sem version 2022-10-08 18:34:38 +01:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
Zedifus
c1374b5c7f Merge branch 'dev' into bug/port-constraint 2022-10-05 22:12:14 +01:00
Zedifus
522adb765c Appease lint
Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it
2022-10-05 22:02:17 +01:00
amcmanu3
3681f52856 Fix scheduled task disable 2022-10-04 16:07:08 -04: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
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
a21bb36f7c Make it so a user cannot upload anything but zip
TODO add better feedback than "error"
2022-09-27 23:07:44 -04:00
Andrew
f090bf8c6f Add task to check for old files every 12 hours 2022-09-27 22:57:24 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
amcmanu3
63347f956b Fix logical issues surrounding Gravatar fetch 2022-09-19 20:00:15 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
Zedifus
532409a08d Merge branch 'dev' into bug/start-nonetype 2022-09-19 22:57:42 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
67d465b94c Add debug logging 2022-09-12 15:36:13 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
Andrew
6a6376ea8a appease the linter 2022-09-07 16:52:27 -04:00
Andrew
d45e32013b Fix backup exclusion issue 2022-09-07 16:51:41 -04:00
Andrew
296a5a46de Add comments. Debug logging 2022-09-07 16:01:42 -04:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
76a499f5a4 Fix start server after updates
Fix update notifs
2022-09-04 17:50:08 -04:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01:00
Zedifus
7f95f7085d Merge branch 'dev' into feature/bedrock-creation 2022-09-04 21:12:47 +01:00
Zedifus
88d3facc80 Merge branch 'dev' into enhancement/bedrock-update-support 2022-09-04 21:03:31 +01:00
amcmanu3
ceab737667 Update requirement checking for password reset 2022-09-04 14:22:25 -04:00
amcmanu3
a6148a7d8a Make password username lowercase 2022-09-04 13:33:22 -04:00
Andrew
dd56b4be37 update updates 2022-09-03 13:42:30 -04:00
Andrew
1f95ad600c Add return 2022-09-03 13:26:51 -04:00
Andrew
5d688522bd Fix backup logic 2022-09-03 13:23:30 -04:00
Andrew
6559112e1b Fix update logic 2022-09-03 13:16:03 -04:00
Andrew
9a7a1cc5d8 Change elif to else 2022-09-03 12:46:35 -04:00
amcmanu3
99979f668b Fix black formatting 2022-09-01 12:51:54 -04:00
amcmanu3
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00