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
2,522 Commits 12 Branches 45 Tags 104 MiB
aaffe69cb3
Commit Graph

1240 Commits

Author SHA1 Message Date
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
0721c0d7d4 Strip meta from sem version 2022-10-08 18:34:38 +01:00
Zedifus
68be3aac16 Merge branch 'dev' into bug/stats-timeout 2022-10-08 18:20:00 +01:00
Zedifus
fbb6dad524 Merge branch 'dev' into tweak/themes 2022-10-08 18:12:37 +01:00
amcmanu3
3ac77d05c7 Add timeout to socket 2022-10-07 19:42:28 -04:00
Zedifus
47a9210750 Merge branch 'dev' into bug/backup-config-persistance 2022-10-05 22:36:59 +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
c58e4e3ebf Clean up backup configs when deleting servers 2022-10-04 16:37:53 -04:00
amcmanu3
ad41960338 Appease the linter 2022-10-04 16:23:29 -04:00
Andrew
b8e0e2b0fb Add catch for those that have existing bad ports 2022-10-04 16:14:22 -04: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
Zedifus
0ab8a2d80e Merge branch 'dev' into bug/websocket-clients 2022-10-02 21:16:31 +01: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
Zedifus
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
Zedifus
f9a918e014 Merge branch 'dev' into bug/api-stdin 2022-10-02 19:40:13 +01:00
Andrew
cb064f95df Fix set size changed during iteration 2022-10-02 14:29:36 -04: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
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
8e1534e268 Add arguments to API routes 2022-09-26 21:31:44 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
05f08773a3 Add themes to users DB 2022-09-26 21:23:16 -04:00
Andrew
046943c250 Fix bug with API stdin 2022-09-25 12:14:01 -04:00
Andrew
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
Andrew
e2c846205b self.clients was already a set. cannot subscript 2022-09-22 21:42:58 -04:00
Zedifus
3209f69d14 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-20 23:22:00 +01:00
Zedifus
03a54d0249 Override 'unsubscriptable-object' pylint rule 
False positive from 'self' use
 2022-09-20 23:21:57 +01:00
amcmanu3
ff8ddb0f6e Fix cron edit traceback. 
Do not allow day to be greater than 30
 2022-09-20 17:52:11 -04:00
amcmanu3
ca2358ac0a Fix user creation traceback 2022-09-20 17:43:54 -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
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +01:00
Zedifus
48b3c26f42 Merge branch 'dev' into bug/websocket-client-list-size 2022-09-19 22:40:23 +01:00
Zedifus
d3cfdd4a78 Merge branch 'dev' into bug/unloaded-server-config 2022-09-19 22:33:30 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Zedifus
d2d812edb7 Merge branch 'dev' into tweak/backup-restore 2022-09-19 22:11:53 +01:00
Zedifus
be8b24975d Merge branch 'dev' into bug/bleach 2022-09-19 22:04:59 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
amcmanu3
187860056c Create set from list for client list size change 2022-09-16 13:09:10 -04:00
Andrew
a3c1d9e051 Fix typo in panel handler for unloaded config 2022-09-14 13:13:32 -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
amcmanu3
2b35da71fc Fix logic with gravatar email 2022-09-09 15:04:45 -04:00
amcmanu3
375df0c27d Only check for gravatar if internet 2022-09-09 15:00:08 -04:00
amcmanu3
e14e795b47 Add schedules to backup restore 
Persist execution command
 2022-09-09 14:49:31 -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
Andrew
7437944988 Fix & issues 2022-09-07 15:56:18 -04:00
Andrew
df7d10886e Fix & with bleach 2022-09-07 14:55:40 -04:00
amcmanu3
1b2fef06fb Fix critical bug with unloaded servers 2022-09-05 23:15:07 -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
b0403a0b1f Merge branch 'dev' into bug/mc-ping-traceback 2022-09-04 21:51:50 +01:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01: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
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
Iain Powrie
3bdaec7837 Apply 1 suggestion(s) to 1 file(s) 2022-09-03 16:40:59 +00:00
Zedifus
77a858f24e Merge branch 'dev' into bug/import3-servers 2022-09-02 13:27:00 +01: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
Iain Powrie
3e370c0ae4 Apply 1 suggestion(s) to 1 file(s) 2022-09-01 14:41:42 +00:00
Andrew
0bc7e584e0 Wrap sock.recv in try/execpt to stop failure 2022-09-01 10:29:47 -04:00
amcmanu3
2becb657ca Put try/except around creation 2022-08-31 20:01:38 -04:00
amcmanu3
bd38fcd6e4 Add try/except around download 2022-08-31 19:59:46 -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
amcmanu3
b445d085c8 Fix no id on import3 servers 2022-08-31 16:11:49 -04:00
Zedifus
96c4fa3bdd Validate bedrock url before download with urllib 
Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
 2022-08-31 20:04:39 +01:00
Zedifus
0c9e10f18a Fix sec overly permissive file permissions 
775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
 2022-08-31 19:50:35 +01:00
Zedifus
fdf1a5a41d Add url helper to bedrock update 2022-08-31 19:46:07 +01:00
Zedifus
9350ed07d7 Add bedrock remote url helper 2022-08-31 19:04:04 +01:00
Andrew
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04:00
Andrew
600de2be0c Fix executable backups 
Cleanup after ourselves
 2022-08-31 12:18:52 -04:00
Andrew
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
Andrew
7f412954d7 Fix metrics schedule lag 2022-08-30 17:27:19 -04:00
Zedifus
51d123e9eb Merge branch 'dev' into tweak/support-logs-zip-comment 2022-08-27 19:00:38 +01: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
Zedifus
6f66b77478 Add 'optional' comment to all archival methods 2022-08-27 17:05:13 +01:00
Andrew
b1769ba9a4 Remove manager parameter from add_raw_pass 2022-08-27 11:25:55 -04:00
Andrew
27ad78c14d Make admin manager none on fresh install 2022-08-27 11:17:31 -04:00
Andrew
3c14d0f2ee Appease the linter 2022-08-27 10:44:34 -04:00