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

142 Commits

Author SHA1 Message Date
Zedifus
77269f5c8f Fix black formatting issues 2024-08-06 22:14:25 +01:00
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
Zedifus
8b80d7e853 Merge branch 'dev' into bugfix/docker-audit-log 2024-06-23 16:30:44 +01:00
amcmanu3
b904430069 Ensure audit log exists 2024-06-20 17:29:35 -04:00
amcmanu3
f845f54654 Add info note to default creds file 2024-05-18 20:32:27 -04:00
--unset
030ae69327 Merge branch 'refactor/big-bucket' of gitlab.com:crafty-controller/crafty-4 into refactor/big-bucket 2024-05-09 17:36:59 -04:00
--unset
47a1e33030 Add startup message 2024-05-09 17:36:56 -04:00
Zedifus
718e76a01d Merge branch 'dev' into refactor/big-bucket 2024-05-09 21:23:07 +01:00
--unset
7967962e3a Refactor backend for big bucket 2024-05-04 15:15:43 -04:00
--unset
227d642546 Set audit logging to logfile instead of DB 2024-04-17 18:03:10 -04:00
Zedifus
8863377cdc Merge branch 'dev' into feature/steamcmd 2024-02-15 00:04:09 +00:00
amcmanu3
3d4153f941 Add lockout user for forgot password 
Hide lockout user from users list
 2024-01-16 15:36:14 -05:00
Zedifus
78d7934e29 Merge branch 'dev' into feature/steamcmd 2023-12-07 17:15:48 +00:00
Andrew
73e2de6c9c Fix fresh install 
Refactor app_path
 2023-12-07 10:56:36 -05:00
Zedifus
130dc3db02 Fix logging config path 
Update the logging configuration path to use the correct application
path.
 2023-12-07 15:14:50 +00:00
Zedifus
53b12e245f Merge branch 'dev' into sec/admin-creation 2023-12-07 15:09:11 +00:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
7a2647c348 Black codebase 2023-11-30 01:06:33 -05:00
amcmanu3
999460f95e Del redundant statements (webserver not started) 
appease the linter
 2023-11-30 00:55:19 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
amcmanu3
c13ebeaf51 Use constant variables for run mode and app path 2023-11-29 21:04:02 -05:00
amcmanu3
151f77589b Restructure main.py to be more comprehensive 2023-11-29 18:15:11 -05:00
Zedifus
ae41ef1ef9 Fix pathing issue, hoist env check and flip args to correct malformed app path 2023-11-28 02:21:05 +00:00
Zedifus
a00f418fcf Fix password case lint warning 2023-11-28 01:54:55 +00:00
Zedifus
06c18169f1 Merge branch 'dev' into sec/admin-creation 2023-11-25 20:59:26 +00:00
amcmanu3
131337c7d0 Appease the linter 2023-11-13 18:16:08 -05:00
amcmanu3
7ef461489a Set perms to 600 2023-11-13 17:22:54 -05:00
amcmanu3
91e62c647e Create text file in config folder with init creds 2023-11-13 14:14:13 -05:00
amcmanu3
0dc075d147 Setup auth_tracker file 2023-11-05 13:25:52 -05:00
amcmanu3
547872eda6 Set starting to false before sending refresh 2023-11-05 11:23:54 -05:00
amcmanu3
4152e2be69 Only show server inits to admins 2023-11-03 16:55:41 -04:00
amcmanu3
61c1621cbb Add messages for loading screen 2023-11-03 16:41:37 -04:00
Andrew
8a2012929e Merge branch 'dev' into feature/steamcmd 2023-09-07 20:51:09 -04:00
Silversthorn
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
amcmanu3
27f6c4c926 Add unzip/dir request handler to api v2 2023-08-31 21:35:30 -04:00
Silversthorn
eccac2508d Fix Issue #255 
Rework how the websockets are managed
 2023-08-09 23:47:53 +02:00
amcmanu3
7c2ce9dcc5 Merge branch 'dev' into feature/steamcmd 2023-08-04 15:34:11 -04:00
amcmanu3
1855368e06 Fix logic and messaging 2023-04-20 16:29:13 -04:00
amcmanu3
ea9fec9971 Check for python version so we don't just fail out 2023-04-20 16:22:23 -04:00
Zedifus
8142c61a10 Merge branch 'dev' into feature/steamcmd 2023-03-18 19:37:37 +00:00
Zedifus
69480c8ff7 Merge branch 'dev' into bug/verbose-console 2023-02-17 00:47:54 +00:00
amcmanu3
46effe1fe6 Only use verbose console if user add -v flag 2023-02-14 14:44:53 -05:00
amcmanu3
33ff921b45 Silently log no server dir setting 2023-02-13 14:08:02 -05:00
amcmanu3
3a763178d7 Merge branch 'dev' into tweak/master-server-dir-config 2023-01-30 12:14:58 -05:00
amcmanu3
c8b8468030 Move resets before controller is instanciated. 2023-01-29 18:21:53 -05:00
amcmanu3
8707a1470c Fix naming 2023-01-29 17:58:47 -05:00
amcmanu3
e04fee0ea1 Fix key reset 2023-01-29 17:58:24 -05:00
amcmanu3
2d9529ba0c Add cookie secret to DB 
Allow users to reset cookie and api secret
Add Crafty row to table on fresh install
Change inserts to updates for crafty settings table.
 2023-01-29 16:54:02 -05:00