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,998 Commits 12 Branches 45 Tags 104 MiB
0a2b8694ac
Commit Graph

414 Commits

Author SHA1 Message Date
amcmanu3
262ec80db8 Remove print statement 2022-12-19 17:47:31 -05:00
amcmanu3
9004feff37 Fix windows slash escape java override 2022-12-19 17:44:04 -05:00
Andrew
a1e8b7afe7 Make server directories non-configurable 2022-12-17 12:21:15 -05:00
Zedifus
94d7b9901c Merge branch 'dev' into bug/public-backgrounds 2022-12-07 14:09:30 +00:00
Andrew
b133a7bdea Fix background key not on public pages 2022-12-03 20:48:22 -05:00
Andrew
0c9ee0e0e0 Fix plus sign in path bug with downloads & uploads 2022-11-30 20:28:24 -05:00
Andrew
9bd0bd2f7e Make the zedifus changes. 2022-11-30 18:14:37 -05:00
Andrew
b2182919ff Fix dir does not exist. 2022-11-30 15:51:12 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Andrew
2e212cc788 Add port constraint for all server creation & api 2022-10-04 15:55:52 -04:00
Zedifus
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
amcmanu3
ff8ddb0f6e Fix cron edit traceback. 
Do not allow day to be greater than 30
 2022-09-20 17:52:11 -04:00
Zedifus
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +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
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
Andrew
a3c1d9e051 Fix typo in panel handler for unloaded config 2022-09-14 13:13:32 -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
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
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
amcmanu3
b274f0d3b0 Remove update url from config 2022-08-31 19:36:43 -04:00
Andrew
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04: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
Andrew
4225de55e8 Add server metrics graph 2022-08-21 17:04:23 -04:00
Andrew
44afc72d3a Add variable shutdown timeouts 2022-08-21 12:41:28 -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
cafa720bba Fix server quotas. Removed un-used perms columns 2022-08-20 13:00:20 -04:00
Andrew
7a68e08a64 Working role manger super user 
TODO: Remove maanger after user is deleted
 2022-08-20 09:31:33 -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
f75286e112 Fix logical issue in panel_handler 2022-08-19 15:14:42 -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
Zedifus
e2a4e096a2 Merge branch 'dev' into bug/backup-reload 2022-08-14 18:36:27 +01:00
Andrew
1545c1415c Reload backup page on front end 2022-08-12 20:24:11 -04:00
Andrew
be7a816f78 Fix reaction tasks not firing 
Fix delay not being accurate
 2022-08-07 01:30:59 -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
Zedifus
3e3c0ff946 Merge branch 'dev' into enhancement/pretzel-schedules 2022-08-06 00:20:31 +01:00
Zedifus
13a0500e86 Switch to v2 credits schema 2022-08-05 23:38:32 +01:00
amcmanu3
b039eec857 First commit for unloaded server. Working Frontend 2022-08-05 17:56:44 -04:00
amcmanu3
3c8614f378 Fix traceback when editing schedule 2022-08-05 16:01:26 -04:00
amcmanu3
75c8cdef53 Add names to schedules 2022-08-05 13:52:50 -04:00
Zedifus
390d995f53 Add flashing frontend notification 
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-08-05 02:56:26 +01:00
Andrew
9616ffb0a1 Fix bug where SU status wouldn't stick on creation 
Clean up SU user edit logic
 2022-07-19 11:21:22 -04:00
amcmanu3
383194cf66 Fix servers being out of order on creation page. 2022-07-18 17:12:43 -04:00
Zedifus
523e51a0ae Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:51 +01:00
Silversthorn
b6d6b9c0a4 Remove unused elements and move get_players to py file instead of html file 2022-07-17 10:57:25 +02:00
Silversthorn
ee2c2f8bb1 Better use of functions and objects 2022-07-16 10:06:49 +02:00
Silversthorn
9f30ca3931 Fix pylint no-self-use 2022-07-16 09:52:30 +02:00
Andrew
11260a34d6 Toggle Visible servers on status page 2022-07-14 18:26:42 -04:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
amcmanu3
a498ef8986 Check if username exists 2022-07-05 19:49:51 -04:00
luukas
147f178c87
Add a basic API for modifying schedules. 
THIS IS VERY UNTESTED AND WILL BE EXPANDED TO FULL CRUD FOR SCHEDULES
 2022-06-23 01:57:29 +03:00
amcmanu3
205bbf356f Fix traceback on server schedule creation page 2022-06-21 18:40:16 -04:00
amcmanu3
d8d80bbb42 Remove bad check for backup path 2022-06-21 17:41:52 -04:00
amcmanu3
b725054dcd Appease the linter 2022-06-21 17:36:50 -04:00
amcmanu3
97900cd283 Fix issue on path transversal backups linux 2022-06-21 17:35:34 -04:00
amcmanu3
fdfec80a39 Fix bug with sec logic 2022-06-21 17:14:35 -04:00
amcmanu3
950cbce27c Fix java logic issue 2022-06-21 17:00:51 -04:00
Zedifus
ffba1fb438 Merge branch 'dev' into enhancement/backup-failure-alert 2022-06-21 21:34:51 +01:00
amcmanu3
d3b1095867 Disable backups directory from changing bad paths 2022-06-21 16:14:29 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
7379545186 Strip empty entry in update-alternatives output 
Catch ValueError on missing end quote in java execution command
 2022-06-21 19:28:53 +01:00
Zedifus
176f5a4004 Add java selection POST check 
Protect against tampered post requests to front end

Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
 2022-06-21 18:39:20 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
Zedifus
69d1aa6c87 Appease linter 2022-06-21 03:31:40 +01:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
amcmanu3
32b3551108 Add java selection code to panel handler 2022-06-20 17:56:26 -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
Zedifus
b9a9007b4f Merge branch 'dev' into tweak/front-end 2022-06-18 23:12:24 +01:00
Andrew
9569e760c9 Fix api key permission logic issue 2022-06-18 17:40:50 -04:00
xithical
464428ea7e Remove erroneous print statements 2022-06-18 16:29:36 -05:00
xithical
8b6d70ba9a Fix bug where non-superusers could not edit their own API keys 2022-06-18 16:27:06 -05:00
Andrew
31097da971 Fix type issue comparing 2022-06-18 17:06:44 -04:00
Andrew
a8cd982b96 Fix warning message 2022-06-18 17:03:44 -04:00
Andrew
37765dbebc Fix general user can view any api-key page 2022-06-18 17:02:10 -04:00
Andrew
72f97e4ff0 Fix issue where any user could add/remove api keys 2022-06-18 16:55:39 -04:00
Andrew
fd0da1ef20 Fix any user can recieve all api keys 2022-06-18 16:20:57 -04:00
Andrew
e9bf2af83b Add wiki iframe as requested. 2022-06-18 15:57:37 -04:00
Andrew
e435292a52 Fix blank server_detail page for general users 2022-06-17 00:58:18 -04:00
Iain Powrie
43906d531e Merge branch 'bug/support_logs' into 'dev' 
Bug/support logs

See merge request crafty-controller/crafty-4!354
 2022-06-16 16:56:56 +00:00
amcmanu3
e3d289e6fd Fix support logs download issues 2022-06-16 12:11:21 -04:00
amcmanu3
35518e960f Fix username capital issues once and for all 2022-06-16 09:52:21 -04:00
amcmanu3
17ef71046c Merge branch 'master' into dev 2022-06-14 15:49:32 -04:00
amcmanu3
50438c485b Fix support log delete order. 
Fix username uppercase.
 2022-06-14 15:42:13 -04:00
luukas
e73dd682c8
Fix no-else-* QA warnings 2022-06-14 15:40:57 +03:00
amcmanu3
b3f167ab62 Add fallback for tz not being found 2022-06-13 14:29:25 -04:00