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
3,266 Commits 12 Branches 45 Tags 104 MiB
4f37d5a7f4
Commit Graph

103 Commits

Author SHA1 Message Date
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
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
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
Zedifus
aa2ba4f8cf Merge branch 'dev' into refactor/config-json 2023-01-29 20:00:09 +00:00
amcmanu3
8ee274a927 Remove config.json from repo. 
Remove version checking.
Move master config to helpers.
Add config.json when not found on start.
 2023-01-29 14:54:25 -05:00
Andrew
8a5cc6d1e6 Set up back end for master server dir 2023-01-26 19:21:39 -05:00
amcmanu3
dfa2f5fb1e Remove antequeted code after moving from db 2023-01-19 11:28:00 -05:00
Zedifus
48b8b9d084 Merge branch 'dev' into refactor/config-json 2022-10-23 21:30:41 +01:00
Zedifus
1cbfb6eb10 Update changelog with commit a6aa0f8 
Also change console colour for path display
 2022-10-23 19:02:24 +01:00
Zedifus
a6aa0f8679 Fix pyinstaller pathing 2022-10-23 18:48:23 +01:00
Andrew
ea11863e35 Change the way we declare root by pyinstaller docs 2022-10-22 15:12:02 -04:00
Andrew
3f2e50a5dd Add config compare to not overwrite user changes 2022-10-13 12:17:31 -07:00
amcmanu3
eea5e329af Refactor and add import_helpers. 
Working jar imports
 2022-08-17 17:22:03 -04:00
Zedifus
99ae7e01a1 Tidy import naming 
This will allow for previous variable naming
 2022-07-21 00:39:29 +01:00
Zedifus
e01a0d5f65 Add update available notice to crafty startup 
I tried displaying just under do_intro(),
but looked visually better just before user prompt
 2022-07-20 23:56:09 +01:00
amcmanu3
f1d11bfb0d Remove tempdir from packaging logs. 2022-07-05 21:35:43 -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
amcmanu3
f1f5f820b7 Add print for ordering purposes 2022-06-12 20:13:05 -04:00
amcmanu3
ef02b5a450 Change ordering 2022-06-12 20:11:56 -04:00
amcmanu3
1655818afc Define the prompt after the init is complete 2022-06-12 20:09:46 -04:00
Zedifus
417a62884c Tweak class import order 
>Sorry I'm particular 😭
 2022-06-05 21:17:23 +01:00
amcmanu3
3c39d421fc Appease the liner 2022-06-05 16:08:58 -04:00
amcmanu3
e0fb4c6442 Fix version3 imports 2022-06-05 16:02:52 -04:00
Silversthorn
f597a26e5b Trying to fix stuff 2022-05-30 22:05:36 +02:00
Silversthorn
8423cc24c1 I'm breaking/fixing stuff 2022-05-26 14:50:20 +02:00
luukas
b724fc500d
Improve the startup process 2022-05-21 01:53:17 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
luukas
42af86b6f7 Merge branch 'dev' into experimental/lukas-cleanup 2022-05-17 21:21:47 +03:00
amcmanu3
a2b711b5ac Add password reset to Crafty Console 2022-05-16 15:39:10 -04:00
luukas
4a2396f45a Make improvements to main.py 
* Make propmpt appear earlier (threads)
* Make SIGTERM handler start earlier
* Put task manager on a thread
* Put internet check on a thread
 2022-05-16 01:33:31 +03:00
Silversthorn
16bbac7fd6 Moving Server Stats DB to Server Folder 2022-04-28 22:40:15 +02:00
Zedifus
92c8fc04f3 Refactor to standardize class/variable naming ✨ 2022-04-14 03:10:25 +01:00
computergeek125
d417950eae fix fstrings, refactored console to static 2022-04-11 20:34:46 -05:00
Zedifus
19f2429a4c Fix formatting to comply with ⬛Black 2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973 Refactored the yes to not pass objects in import 
Merge Conflicts ᴙ Us
 2022-04-11 00:23:55 -05:00
Zedifus
09bba7fdb0 Further fix files to conform with ⚫Black pylintrc 
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
 2022-03-23 06:16:22 +00:00
Zedifus
e06fe8a52a ⬛Black codebase 
Apply black formatting to codebase
 2022-03-23 02:50:12 +00:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Zedifus
cb3379a316 Fix signal logging 2022-03-08 05:26:13 +00:00
Iain Powrie
8da2bcae17 Merge branch 'devops/userns-rootless-container' into 'dev' 
Convert container to run as non-root

See merge request crafty-controller/crafty-commander!172
 2022-03-02 19:47:41 +00:00