Andrew
491415c7fa
Re-black codebase with new standard
2023-02-15 18:01:21 -05:00
amcmanu3
cefa6e8084
Add a helper to better detect if java is installed
2023-02-14 13:59:24 -05:00
amcmanu3
fdf7bd7621
Add helper to check docker environment
2023-02-12 12:28:37 -05:00
Andrew
1e7d035119
Appease the linter
2023-02-11 15:42:18 -08:00
Andrew
72a2ff4c40
Merge branch 'dev' into
...
enhancement/add-storage-to-dash
2023-02-11 15:36:33 -08:00
Zedifus
cafb10f7c0
Merge branch 'dev' into bugfix/world-size-calc
2023-02-11 19:48:08 +00:00
Zedifus
c151e5f3a7
Merge branch 'dev' into tweak/master-server-dir-config
2023-02-11 19:47:01 +00:00
amcmanu3
1b1c960cb6
Add helper to get all mounts.
...
Default storage monitoring to all mounts
2023-02-10 15:17:36 -05:00
amcmanu3
f381562b3b
Make monitored mount points user configurable
2023-02-05 19:05:20 -05:00
amcmanu3
a70d531ae1
Refactor naming of keys
2023-02-05 13:06:52 -05:00
amcmanu3
5bccfab7b6
add ignored names in conditional
2023-01-31 13:53:27 -05:00
amcmanu3
43c11f80b8
Appease the linter
2023-01-30 19:11:37 -05:00
amcmanu3
aaefcb913b
Append to subdir function for windows mapping
2023-01-30 15:22:40 -05:00
Iain Powrie
4300cab1b9
Merge branch 'refactor/config-json' into 'dev'
...
Managed config.json refactor
See merge request crafty-controller/crafty-4!485
2023-01-29 23:33:55 +00:00
amcmanu3
3f3595acb4
Sort config.json in alphabetical order
2023-01-29 18:21:04 -05:00
amcmanu3
bd8e12f884
Fix wording in reset
2023-01-29 17:00:28 -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
amcmanu3
02273580f6
Appease the linter AGAIN
2023-01-29 15:20:27 -05:00
amcmanu3
5ab224d17e
Appease the linter
2023-01-29 15:18:10 -05:00
amcmanu3
040536f320
Merge branch 'dev' into bugfix/file-tree-reload
2023-01-29 15:13: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
amcmanu3
e0541b1ec0
Change file tree doesn't reload on upload/delete
2023-01-28 19:10:27 -05:00
amcmanu3
afdb9d9386
Use ignored_names as class variable in helpers
2023-01-27 17:36:23 -05:00
Andrew
4031b74e00
Hide server stats db from users
2023-01-09 16:34:12 -05:00
Andrew
52ef76e15b
Replace google ping for ntp for usability in china
2023-01-03 10:14:10 -08:00
amcmanu3
fbc506f2fd
Fix issues after merge conflicts
2022-12-19 17:15:26 -05:00
Andrew
3ab57f116c
Merge branch 'dev' into 'refactor/config-json'
...
# Conflicts:
# app/classes/shared/helpers.py
2022-12-19 22:13:10 +00:00
Andrew
6572dc5e10
Appease the linter
2022-12-16 18:47:36 -05:00
Andrew
551020f738
Create our own check function
2022-12-14 14:54:52 -05:00
Andrew
3f2e50a5dd
Add config compare to not overwrite user changes
2022-10-13 12:17:31 -07:00
Zedifus
0721c0d7d4
Strip meta from sem version
2022-10-08 18:34:38 +01:00
Andrew
f558388a0f
Update themes to include all colors
2022-10-04 13:31:37 -04:00
Andrew
a5a81aa22a
Add themes to users page/base
2022-09-26 21:23:47 -04:00
amcmanu3
63347f956b
Fix logical issues surrounding Gravatar fetch
2022-09-19 20:00:15 -04:00
Andrew
67d465b94c
Add debug logging
2022-09-12 15:36:13 -04:00
Andrew
82c0452f55
Add pfp caching for users
2022-09-12 15:34:47 -04:00
Zedifus
9350ed07d7
Add bedrock remote url helper
2022-08-31 19:04:04 +01:00
Zedifus
ff0faffc08
Add update check to 12hr schedule
...
Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>
2022-08-05 02:37:21 +01:00
Zedifus
99ae7e01a1
Tidy import naming
...
This will allow for previous variable naming
2022-07-21 00:39:29 +01:00
Zedifus
ebe5d6815c
Add helper for remote version check
2022-07-20 23:53:31 +01:00
Zedifus
48cd5916ed
Revert internal comment
...
Must've changed this accidentally
2022-06-24 03:56:31 +01:00
Zedifus
cf25249a9d
Fix path issue with update-alternatives
...
Sometimes it can be in /sbin,
if it is we return `None` which broke upstream frontend.
Returning an empty list to resolve this.
2022-06-24 02:28:05 +01:00
Zedifus
610b94dd59
Merge branch 'dev' into tweak/file-enhancements
2022-06-21 20:41:09 +01:00
Zedifus
bad7a8d625
Merge branch 'dev' into feature/java-selection
2022-06-21 04:29:37 +01:00
Zedifus
8e646df58c
Add Java detect for win, and hook up to front end
2022-06-20 23:44:33 +01: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
e820ba058a
Add prototype helper (linux only)
2022-06-20 18:05:39 +01:00
luukas
b4770bc9a0
Use indent=4 instead of indent=True
...
`indent=True` is equivalent to `indent=1`
You can test this by executing `'foo' * True`, `'foo' * 1` and
`'foo' * 4` in a Python REPL.
2022-06-18 01:30:50 +03:00
luukas
5bfd564ef4
Use with-blocks when opening files
2022-06-18 01:27:55 +03:00
amcmanu3
8611c7e5e4
Fix win reg import on not windows.
...
Replace WindowsError with OSError
2022-06-15 00:42:29 -04:00
Zedifus
00466719ea
Exempt R1717 consideration
2022-06-15 04:52:19 +01:00
Zedifus
0f82ba3084
Line exempt E0602
...
It's not an undefined var it's the Base class for I/O related errors.
False positive.
2022-06-15 04:44:19 +01:00
Zedifus
9ed5cc3c5a
Fix pylint R1724
2022-06-15 04:15:46 +01:00
Zedifus
1cfc926b16
Fix line length CQ
2022-06-15 04:11:40 +01:00
amcmanu3
cda2120579
Fix window java issue causing no stats
2022-06-14 22:33:02 -04:00
luukas
e73dd682c8
Fix no-else-* QA warnings
2022-06-14 15:40:57 +03:00
luukas
73a6d1cd78
Fix the error message while deleting session.log
2022-06-14 00:30:28 +03:00
luukas
0d664cfae5
Remove a useless session.log warning
...
This fixes an error being sent when session.log doesn't exist.
This usually occurs when the logs directory is deleted.
2022-06-14 00:16:49 +03:00
amcmanu3
ace79cad2f
Remove useless print statements
2022-06-03 15:53:20 -04:00
Zedifus
eaecb2f09b
Replace standard pseudo-random generators
...
Resolves: `Bandit ID B311`
[Standard pseudo-random generators are not suitable for security/cryptographic purposes.]
2022-06-03 14:05:26 +01:00
Andrew
9864cecff1
Merge branch 'experimental/lukas-codebase-improvements' into 'dev'
...
Lukas's codebase improvements
See merge request crafty-controller/crafty-4!277
2022-06-01 20:22:47 +00:00
Andrew
28ffbe4627
Remove unnecessary pass
2022-06-01 15:20:16 -04:00
Andrew
fdc88451b9
Add exception for permissions in helpers check
2022-06-01 15:11:37 -04:00
luukas
d1beb2f125
Redirect stderr to null during psutil's import.
...
On some systems /proc might be unavailable and psutil would freak out
printing several exceptions to stderr but strangely not raising the
exceptions for upper scope to handle
2022-05-28 19:00:25 +03:00
luukas
8e13b4e11d
Simplify helpers setting methods
2022-05-25 16:21:34 +03:00
luukas
87085cec3c
Fix an IndexError in get_lang_page
2022-05-19 01:10:06 +03:00
luukas
559a345f25
Merge branch 'dev' into merge/api-v2
2022-05-18 01:49:19 +03:00
Andrew
984f4cc4d6
Change Files Aesthetic
2022-05-15 12:38:48 -05:00
luukas
721c9cfe12
Add the server creation endpoint
2022-05-05 14:02:23 +03:00
luukas
53459d83dc
Merge branch 'feature/api-v2' into merge/api-v2
2022-05-05 03:32:09 +03:00
Andrew
fc1304d729
Fix file size bug when destination does not exist
2022-04-17 13:00:05 -04:00
Andrew
704ffc2742
Fix file unzip
2022-04-14 20:03:19 -04: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
Andrew
b1ed9ba2bd
Add API routes from 3.x
...
Enhance security for permissions on API requests
Fix bug where server permissions and crafty permissions were flipped upon making a new token
Fix bug where new secret key would be created every time Crafty was started.
Fix bug where DB locks will occur with concurrent writes to the DB.
2022-04-10 19:39:31 +00:00
Zedifus
2a512d7273
Fix files to conform with new ⚫ 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:06:13 +00:00
Zedifus
e06fe8a52a
⬛ Black codebase
...
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
Zedifus
a6e99347af
Format the cert gen helper
...
Use black to format this function and appease lint.
We should really use black on the full project
2022-03-15 18:47:49 +00:00
Silversthorn
83c692beb5
pylint happy !!
2022-03-15 19:17:20 +01:00
Silversthorn
2f89c3a93d
It was a comma !!!
2022-03-15 18:12:56 +00:00
Silversthorn
7e6d34de0f
2nd Try
2022-03-15 07:43:36 +00:00
Silversthorn
466d71db36
Try to be cool with pylint (resolving Major issue ?)
2022-03-15 07:32:08 +00:00
Silversthorn
62244637bb
Adding Subject Alt Names in certificate
2022-03-14 20:30:24 +01:00
Andrew
d4a1efba78
Appease the linter
2022-03-13 09:26:38 -04:00
Andrew
6e4435c86f
Add Full support for backup status
2022-03-13 06:36:44 -04:00
Andrew
33cad6afa8
Add percentage to backups page
...
Helper designed to be used for support logs as well.
2022-03-11 00:19:05 -05:00
Andrew
319e06cd10
Add backend percentage to backups
2022-03-09 23:45:49 -05:00
Zedifus
affcc14245
Fix circular imports
...
I'm a silly
2022-03-08 05:44:26 +00:00
Zedifus
b306d1f313
Tidy imports & dep auto-installer
2022-03-08 04:40:44 +00:00
Silversthorn
506129729e
Update Translation
...
- Adding Translation for Credits Page
- Adding detection support for webpage
2022-03-05 12:01:36 +01:00
Andrew
55852de3d9
Fix cursor showing as text highlight not hand
2022-03-04 17:58:18 -05:00
Andrew
61ac97c02e
Add unexecuted clear. Add option to compress backups
2022-03-02 12:55:49 -05:00
Andrew
826d4d081f
Improve session.lock checking.
2022-03-02 09:48:03 -05:00
Andrew
5d6ada23a4
Fix visual file loading order. Fix zip imports where directories were not being copied
2022-03-01 16:54:06 -05:00
xithical
c4f706d415
Rework of files handling and added exclusions selection for backups.
2022-03-01 01:02:30 +00:00
xithical
26014d0e86
Revert "Merge branch 'xithical-fixes' into 'dev'"
...
This reverts merge request !173
2022-02-28 04:40:33 +00:00
Andrew
008b7f4ade
Run file tree serving thorugh ajax handler alone
2022-02-27 19:29:30 -05:00
