482 Commits

Author	SHA1	Message	Date
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
Andrew	25a1c67c26	Fix black formatting	2022-06-12 17:17:58 -04:00
Andrew	474597d16c	Add survery to admin first log	2022-06-12 17:03:42 -04: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
amcmanu3	ddcd3dc5c3	Appease the linter	2022-06-11 17:46:36 -04:00
amcmanu3	e99cacfc53	Make call to controller and not stale object	2022-06-11 17:34:31 -04:00
Andrew	b793016c03	Redefine how servers are served to panel_handler	2022-06-02 07:34:17 -04:00
Andrew	273e2f465d	Only show authorized servers on role creation	2022-06-01 19:26:57 -04:00
Andrew	ec730a1694	Merge branch 'bug/pretzel-support-log-temp-cleanup' into 'dev' ... Cleanup temp dirs on support log creation See merge request crafty-controller/crafty-4!286	2022-06-01 22:33:52 +00:00
Andrew	8e0ccd4f94	Fix indexing for updates made on branch	2022-06-01 18:25:27 -04:00
Andrew	5d3badef2c	Cleanup temp dirs on support log creation	2022-06-01 17:54:58 -04: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	99b28efd33	Merge branch 'dev' into dev-StatsDBImprovement	2022-05-26 15:39:52 +02:00
Silversthorn	8423cc24c1	I'm breaking/fixing stuff	2022-05-26 14:50:20 +02:00
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