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
4,324 Commits 12 Branches 45 Tags 104 MiB
77269f5c8f
Commit Graph

103 Commits

Author SHA1 Message Date
Iain Powrie
3dc1d90cf4 Merge branch 'dev' into 'feature/steamcmd' 
# Conflicts:
#   Dockerfile
#   app/classes/models/servers.py
#   app/classes/shared/helpers.py
#   app/classes/shared/main_controller.py
#   app/classes/shared/server.py
#   main.py
 2024-08-06 21:00:22 +00:00
Zedifus
45c3f73eca Revert "Revert "Merge branch 'dev' into 'master'"" 
This reverts the 4.4.1 release revert commit 29ce7a2cde.
 2024-08-06 20:45:00 +01:00
Iain Powrie
29ce7a2cde Revert "Merge branch 'dev' into 'master'" 
This reverts merge request !783
 2024-07-29 21:49:44 +00:00
amcmanu3
217435283b Restore backup/clone 2024-05-26 17:10:20 -04:00
amcmanu3
0c517868b4 Merge branch 'dev' into refactor/backups 2024-03-08 16:23:45 -05:00
Zedifus
8863377cdc Merge branch 'dev' into feature/steamcmd 2024-02-15 00:04:09 +00:00
amcmanu3
e59b624025 Move backup path from servers to backup 
Add uuid field to backups
 2024-02-08 20:25:32 -05:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
amcmanu3
5f2236563b Fix bug where invalid server Id leads to stack 2024-01-11 19:53:22 -05:00
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00:00
Zedifus
78d7934e29 Merge branch 'dev' into feature/steamcmd 2023-12-07 17:15:48 +00:00
amcmanu3
09241bdc54 Appease the linter 2023-11-30 12:22:40 -05:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
90ed32738f Add translations 2023-11-30 00:55:26 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
amcmanu3
ecb40ee2ec Retain tab when navigating back to server_details 2023-11-05 11:09:57 -05:00
amcmanu3
4152e2be69 Only show server inits to admins 2023-11-03 16:55:41 -04:00
amcmanu3
28b3a4f8f3 Add loading screen while servers init 2023-11-03 16:41:23 -04:00
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01:00
Silversthorn
e9439ca154 Changing history units to hours 2023-09-19 21:46:31 +02:00
amcmanu3
7c2ce9dcc5 Merge branch 'dev' into feature/steamcmd 2023-08-04 15:34:11 -04:00
Andrew
178aba63dd Send empty json for no banned/cached players 2023-05-23 18:21:04 -04:00
Silversthorn
e90d6e8091 Merge branch 'dev' into tweak/improve-display 2023-05-18 09:53:23 +02:00
Zedifus
061baadc0c Merge branch 'dev' into bugfix/server-order 2023-05-14 20:21:14 +01:00
Silversthorn
a911791737 Fixing Black 2023-04-15 20:58:29 +02:00
Silversthorn
84a09ad9be Improve player display 2023-04-15 20:47:35 +02:00
amcmanu3
5542f792c8 Fix role server calculation 2023-04-12 13:03:44 -04:00
amcmanu3
7c01ccd376 Add server creation process for steamcmd servers. 
TODO: Find out what the executables will be called or startup commands..
 2023-03-20 21:59:08 -04:00
Andrew
89307cecd5 Fix get server users 2023-03-09 11:06:55 -05:00
Zedifus
2b7f14ec3c Merge branch 'dev' into tweak/master-server-dir-config 2023-02-16 23:39:33 +00:00
Zedifus
34f1acd3e2 Appease black 2023-02-16 23:29:06 +00:00
Andrew
e52294dbb3 Appease the linter 2023-02-15 18:40:20 -05:00
Andrew
491415c7fa Re-black codebase with new standard 2023-02-15 18:01:21 -05:00
amcmanu3
82dc20e94a Remove print statements 2023-01-30 18:35:04 -05:00
amcmanu3
e43c63a8b7 Fix db not found issue 
Add page feedback.
 2023-01-30 18:31:46 -05:00
Andrew
b95d71bfbc Appease the linter 2022-11-19 14:45:24 -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
c58e4e3ebf Clean up backup configs when deleting servers 2022-10-04 16:37:53 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
amcmanu3
e9c74be057 Add ability to change metrics scale 2022-09-04 16:21:33 -04:00
Andrew
7f412954d7 Fix metrics schedule lag 2022-08-30 17:27:19 -04:00
Zedifus
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00
Zedifus
1b4777fbab Merge branch 'dev' into feature/pretzel-users-roles-manager 2022-08-27 17:25:49 +01:00
Andrew
4225de55e8 Add server metrics graph 2022-08-21 17:04:23 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
amcmanu3
65c8ca680b Add importing threading to jar servers. 
Refactor "downloading" status
 2022-08-17 14:48:05 -04:00
amcmanu3
8897856aef Remove Update button when unloaded 
Fix duplicate list issue
 2022-08-05 20:24:42 -04:00
amcmanu3
5cbb8f7018 Fix broken unloaded servers 2022-08-05 20:04:34 -04:00
amcmanu3
b039eec857 First commit for unloaded server. Working Frontend 2022-08-05 17:56:44 -04:00