luukas
0d62223982
Merge branch 'dev' into bugfix/api-v2-bugfixes
2022-05-23 20:20:49 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash
2022-05-20 22:04:41 +03:00
luukas
9ddcd13f2f
Fix W0611 & R1734 lint issues
2022-05-20 14:06:46 +03:00
luukas
bd4a35b418
Make role add and edit use API v2 internal APIs
2022-05-19 16:13:25 +03:00
amcmanu3
67e20302c9
Add get_perms_server back
2022-05-18 19:19:58 -04: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
amcmanu3
bc6309c91b
Appease the linter
2022-05-18 16:56:54 -04: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
luukas
8b0da5da4c
Remove unnecessary prints or use logger.debug
2022-05-18 22:06:33 +03:00
amcmanu3
a833a29fb7
Allow super users to add roles/users
2022-05-18 14:35:51 -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
amcmanu3
e3248e8657
Change cron validation to allow day abbreviations
2022-05-18 13:53:55 -04:00
luukas
8737c15fcf
Add a permission matrix to the role add and edit
2022-05-18 01:09:58 +03:00
luukas
5dfd1aae12
Make more places use the check_server_id function.
2022-05-17 20:52:32 +03:00
luukas
0115421243
Make queries narrower
2022-05-16 01:02:17 +03:00
luukas
27d310e2de
Declutter set()s
2022-05-16 00:55:22 +03:00
luukas
930c6936d9
Add more advanced role APIs
2022-05-10 02:08:49 +03:00
luukas
bf59e2de6c
Add and fix API v2 and db
...
* Add basic role routes
* Add API v2 404 handler
* Add API v2 home handler pointing to the wiki
* Add tons more todos
* Add get_*_columns and get_*_column functions for many db models
* Modify and add tons of model and controller functions
2022-05-08 00:07:55 +03:00
luukas
53459d83dc
Merge branch 'feature/api-v2' into merge/api-v2
2022-05-05 03:32:09 +03:00
luukas
1aa0d65cf7
Merge branch feature/external-frontend to feature/api-v2 without the frontend
2022-04-14 15:33:53 +03:00
Zedifus
92c8fc04f3
Refactor to standardize class/variable naming ✨
2022-04-14 03:10:25 +01:00
Andrew
bb2c1de418
Fix bug where general user could not create sch
2022-04-12 18:49:50 -04: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
amcmanu3
3b50130f40
Fix bug - non-super users could not create servers
2022-04-10 19:01:53 -04: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
amcmanu3
c7394ab77e
Add ability for users to disable hints
2022-04-02 21:25:26 -04:00
Andrew
f00830aeb5
Merge branch 'bug/general-user-gravatar' into 'dev'
...
Bug/general user gravatar
See merge request crafty-controller/crafty-commander!232
2022-04-02 01:11:01 +00:00
Andrew
8e704b61ca
Fix naming on super user variables
2022-04-01 18:09:55 -04:00
Andrew
1242b318c8
Fix bug - general user could not add gravatar
2022-04-01 18:04:42 -04:00
Andrew
f78d59fd34
Server jars/gravatar would stack with no internet
2022-03-27 18:09:49 -04: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
Andrew
ecc87a6137
Add context menu for iOS + Bug fix
2022-03-22 14:24:15 +00:00
Andrew
5682455bcc
Appease the linter
2022-03-20 12:39:57 -04:00
Andrew
d311ccbfa1
Remove print statement everytime a page loads
2022-03-20 07:05:11 -04:00
amcmanu3
0f27b2df91
Fix error where user could not create server
...
Fix error where user could not create support files
2022-03-14 17:39:19 -04:00
Andrew
b5dac31ad5
Fix bug where you cannot create user without stack
2022-03-13 22:31:48 -04:00
Andrew
3a8174cc22
Add status bar for support log archive
2022-03-13 08:29:26 -04:00
Andrew
8858780d41
Move backups to ajax request
2022-03-11 00:18:22 -05: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
Zedifus
a3656536b5
Remove '*' Prefix from joke languages
...
Co-authored-by: Andrew McManus <amcmanus@arcadiatech.org>
2022-03-04 23:38:36 +00:00
Andrew
a76833b409
Optimize looping for server list nav
2022-03-04 12:42:12 -05:00
amcmanu3
0a08324963
Fix server reordering
2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev
2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211
Fix indent causing server ordering to not work
2022-03-03 22:22:05 -05:00
amcmanu3
d5c623b928
Merge branch 'dev' into dev-RefreshStats_Threading
2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca
Appease the linter
2022-03-03 19:47:49 -05:00
