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,280 Commits 12 Branches 45 Tags 104 MiB
master
Commit Graph

218 Commits

Author SHA1 Message Date
Zedifus
65bea2a11a Merge branch 'dev' into feature/discord-webhooks 2023-09-21 23:42:04 +01:00
Silversthorn
e9439ca154 Changing history units to hours 2023-09-19 21:46:31 +02:00
Andrew
096de18c2c Merge branch 'dev' into feature/discord-webhooks 2023-09-05 20:39:20 -04:00
Andrew
a8894757cf Rename activity logs 2023-08-20 17:01:32 -04:00
amcmanu3
134b35b2dd Setup users for API handling 2023-08-16 18:00:00 -04:00
amcmanu3
eadb01d7c0 Add model option 2023-06-03 18:11:59 -04:00
amcmanu3
50c515b2aa Add database methods 2023-06-03 15:05:08 -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
Andrew
89307cecd5 Fix get server users 2023-03-09 11:06:55 -05:00
amcmanu3
d473a6ccf4 Add server order to api call 2023-03-01 15:25:28 -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
amcmanu3
3a763178d7 Merge branch 'dev' into tweak/master-server-dir-config 2023-01-30 12:14:58 -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
Zedifus
b5d259bce7 Merge branch 'dev' into feature/backup-echo 2023-01-27 19:39:05 +00:00
Zedifus
84592c178e Merge branch 'dev' into refactor/scheduled-task-queue 2023-01-27 19:30:03 +00:00
Zedifus
e8d2414815 Merge branch 'dev' into bugfix/schedule-restore 2023-01-27 19:05:50 +00:00
Andrew
8a5cc6d1e6 Set up back end for master server dir 2023-01-26 19:21:39 -05:00
Andrew
248a5a63a9 Include option for after command 2023-01-21 13:13:02 -05:00
Andrew
cf9ad77879 Add option to run command before backup 2023-01-20 17:35:30 -05:00
amcmanu3
60785500b9 Remove commands table 2023-01-19 11:47:07 -05:00
amcmanu3
efd3bef029 Use queues for scheduled task disapatch 2023-01-19 11:27:33 -05:00
Silversthorn
7984ca8157 Add Personalized Transparency for Login Page's Form 2023-01-17 20:40:16 +01:00
Andrew
ede865bf33 Appease the linter and fix stinky code 2023-01-16 15:16:43 -05:00
Andrew
944d01ab19 Fix schedule restores 2023-01-16 11:20:15 -05:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00: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
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
amcmanu3
c58e4e3ebf Clean up backup configs when deleting servers 2022-10-04 16:37:53 -04:00
Andrew
05f08773a3 Add themes to users DB 2022-09-26 21:23:16 -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
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04: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
amcmanu3
02b6c3b545 Fix logical issues with panel handler 2022-08-20 20:58:46 -04:00
Andrew
0672b9378a Add more secure logic to add/edit users 2022-08-20 18:51:35 -04:00
Andrew
0f43917083 Remove unused methods 2022-08-20 13:15:44 -04:00
Andrew
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
Andrew
245d64ca45 Refactor managed roles to users controller/model 2022-08-20 12:56:38 -04:00
Andrew
31b75b1c50 Remove manager from role when user deleted 2022-08-20 10:24:43 -04:00
Andrew
552a2e26c2 Working role managers. 
TODO: Add super user select option
 2022-08-20 08:49:38 -04:00
Andrew
bd64f0d2ae Initial commit for role managers 2022-08-20 08:32:39 -04:00
amcmanu3
c1d16522d0 Add manager field to users 2022-08-19 13:09:59 -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
Zedifus
c5d049830e Merge branch 'dev' into bug/unloaded-servers 2022-08-06 01:10:16 +01: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
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
Zedifus
31fe66776c Merge branch 'dev' into incident/log-file-issues 2022-07-18 22:03:03 +01:00
amcmanu3
f265b070c0 Fix log file path issue for support log/log delete 2022-07-18 14:55:12 -04:00
Andrew
2ddc1e7c96 Remove server.props requirement 2022-07-16 19:05:00 -04:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
amcmanu3
77c9d2613d Appease black 2022-06-20 17:33:36 -04:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening 
See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
luukas
e009ff9819
Use relative paths for the jarfile and logs 2022-06-16 02:10:26 +03:00
luukas
e73dd682c8
Fix no-else-* QA warnings 2022-06-14 15:40:57 +03:00
Silversthorn
e0d0965931 Fixing Pylint for good 2022-06-12 18:39:05 +02:00
Silversthorn
a9cdd33c77 Fixing Pylint Errors 2022-06-12 18:30:39 +02:00
Silversthorn
007218111f Should work now :) 2022-06-12 17:13:39 +02:00
Silversthorn
430f9f9fcf It might do the refresh after a server update 2022-06-12 08:37:24 +02:00
amcmanu3
e99cacfc53 Make call to controller and not stale object 2022-06-11 17:34:31 -04:00
Andrew
273e2f465d Only show authorized servers on role creation 2022-06-01 19:26:57 -04:00
Silversthorn
150e8e5794 Renaming Server in shared to ServerInstance 2022-05-30 22:40:34 +02:00
Silversthorn
f597a26e5b Trying to fix stuff 2022-05-30 22:05:36 +02:00
Silversthorn
b0ea943992 Fixing lasts pylint warning 2022-05-30 19:32:11 +02:00
Silversthorn
8f5c688b72 Fixing Pylint issues 2022-05-30 19:28:39 +02:00
Silversthorn
37bda32164 Fixing moved functions calls 2022-05-30 07:36:25 +02:00
Silversthorn
3b4253de9b Fixing get_authorized_server 2022-05-26 23:19:59 +02:00
Silversthorn
6fae395185 Fixing issues for latest stats 2022-05-26 15:43:24 +02:00
Silversthorn
99b28efd33 Merge branch 'dev' into dev-StatsDBImprovement 2022-05-26 15:39:52 +02:00
Silversthorn
2b484d5a07 fixing download jar 2022-05-26 15:20:21 +02:00
Silversthorn
056856cf98 Fixing Helpers issue 2022-05-26 15:02:47 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
Andrew
39915ef53c Fix critical bad stats push 2022-05-26 06:49:51 -04:00
luukas
54ff888002
Fix user modification via the API 2022-05-25 00:29:31 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2' 
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
 2022-05-18 21:56:39 +00:00
luukas
6407900609 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-19 00:52:59 +03:00
Andrew
505364d7d5 Merge branch 'feature/pretzel-password-reset' into 'dev' 
Add password reset to Crafty Console

See merge request crafty-controller/crafty-4!261
 2022-05-18 21:40:04 +00:00
Andrew
ca73a5f60b Merge branch 'dev' into 'experimental/feature/permission-matrix' 
# Conflicts:
#   app/classes/web/panel_handler.py
 2022-05-18 20:47:43 +00:00
amcmanu3
cfcc446d17 Remove TODO 2022-05-18 16:41:14 -04:00
amcmanu3
12390306fd Add permissions checks for quantity for users/role 
Remove the ability to add quantities for general users.
 2022-05-18 14:33:22 -04:00