Commit Graph

218 Commits

Author SHA1 Message Date
Zedifus
45c3f73eca Revert "Revert "Merge branch 'dev' into 'master'""
This reverts the 4.4.1 release revert commit 29ce7a2cde.
2024-08-06 20:45:00 +01:00
Iain Powrie
29ce7a2cde Revert "Merge branch 'dev' into 'master'"
This reverts merge request !783
2024-07-29 21:49:44 +00:00
Zedifus
c9b2b49e5f Merge branch 'dev' into refactor/backups 2024-07-09 02:31:30 +01:00
amcmanu3
e5d18e5f2c Add type hints. Return backup ID on creation 2024-06-14 19:30:43 -04:00
Analicia Abernathy
6e7b250292 Merge branch 'refactor/backups' of gitlab.com:crafty-controller/crafty-4 into refactor/backups 2024-06-14 14:17:00 -05:00
amcmanu3
f5874d701a Add password error to not display password in plain text 2024-06-13 17:09:00 -04:00
amcmanu3
217435283b Restore backup/clone 2024-05-26 17:10:20 -04:00
amcmanu3
5d82d79afd Add backup configs/remove backup configs 2024-05-25 22:10:35 -04:00
amcmanu3
60d3ee1aa8 Working default backup 2024-05-25 14:40:14 -04:00
amcmanu3
f8626633cf Add action ID option to schedules 2024-05-25 13:51:40 -04:00
--unset
6ca396854d Merge branch 'dev' into refactor/backups 2024-05-15 21:01:16 -04:00
Zedifus
39a98f2b5e Merge branch 'dev' into tweak/json-audit-log 2024-05-09 21:03:26 +01:00
amcmanu3
eebf68a376 Front end loading of backup edit page 2024-04-21 11:26:16 -04:00
amcmanu3
b898595371 Refactor backup config methods to add/update 2024-04-20 17:30:37 -04:00
amcmanu3
3fac1a39a8 Setup drop table migrations 2024-04-20 16:21:06 -04:00
amcmanu3
5fe696e269 Merge branch 'dev' into refactor/backups 2024-04-19 16:09:31 -04:00
amcmanu3
400f42ba26 Merge branch 'dev' into refactor/api-key-su 2024-04-08 13:42:16 -04:00
amcmanu3
9bed7092d6 Check for API permission as well as user permission 2024-04-06 13:42:41 -04:00
amcmanu3
25b64e353c Fix backup restores after uuid server IDs 2024-03-24 17:55:58 -04:00
amcmanu3
eec9432118 Update migration
Add backup return function
2024-03-08 23:22:54 -05:00
amcmanu3
0c517868b4 Merge branch 'dev' into refactor/backups 2024-03-08 16:23:45 -05:00
Zedifus
e0bb2eaaa0 Merge branch 'dev' into refactor/server_ids 2024-03-03 01:32:44 +00:00
amcmanu3
842e576b5c Refactor minimum password length 2024-02-19 21:14:15 -05:00
amcmanu3
e59b624025 Move backup path from servers to backup
Add uuid field to backups
2024-02-08 20:25:32 -05:00
Silversthorn
0a3512a18e Merge branch 'dev' into refactor/server_ids 2024-02-02 20:50:08 +01:00
Andrew
ecee8b494c Raise exception for anti-lockout-username 2024-01-31 22:15:40 -05:00
Andrew
aec14a6713 Do not allow user to create anti-lockout-user 2024-01-31 22:01:04 -05:00
Andrew
dc5490cdcb Merge branch 'dev' into feature/anti-lockout 2024-01-31 19:18:55 -05:00
Silversthorn
56d37989e5 Merge branch 'dev' into refactor/server_ids 2024-01-30 21:19:07 +01:00
Andrew
a112bc3e57 Set time to UTC for schedule
remove prints
2024-01-28 16:51:54 -05:00
amcmanu3
bb18400b90 Fix schedule firing too early 2024-01-26 15:29:25 -05:00
amcmanu3
665997c34c Print to terminal not file 2024-01-22 19:51:57 -05:00
amcmanu3
d82ee0fa31 start schedule 2024-01-16 18:01:22 -05:00
amcmanu3
3d4153f941 Add lockout user for forgot password
Hide lockout user from users list
2024-01-16 15:36:14 -05:00
amcmanu3
5f2236563b Fix bug where invalid server Id leads to stack 2024-01-11 19:53:22 -05:00
Zedifus
a564fac8cd Merge branch 'dev' into refactor/server_ids 2023-12-13 02:52:02 +00:00
amcmanu3
09241bdc54 Appease the linter 2023-11-30 12:22:40 -05:00
amcmanu3
ca02c9d575 Add user-based translation to startup 2023-11-30 12:14:09 -05:00
amcmanu3
90ed32738f Add translations 2023-11-30 00:55:26 -05:00
amcmanu3
9e98c97eb8 Merge branch 'dev' into enhancement/crafty-loading 2023-11-29 21:24:05 -05:00
Zedifus
911f373474 Merge branch 'dev' into critical/security 2023-11-25 19:29:46 +00:00
amcmanu3
5546118517 Remove password max length 2023-11-05 13:25:39 -05:00
amcmanu3
ecb40ee2ec Retain tab when navigating back to server_details 2023-11-05 11:09:57 -05:00
amcmanu3
4152e2be69 Only show server inits to admins 2023-11-03 16:55:41 -04:00
amcmanu3
28b3a4f8f3 Add loading screen while servers init 2023-11-03 16:41:23 -04:00
Silversthorn
aa7f47a4f4 Reworking id to use uuid 2023-11-01 18:44:56 +01:00
amcmanu3
6bc45b86e5 Merge branch 'dev' into tweak/user-edit 2023-10-08 22:44:53 -04:00
amcmanu3
2d32e3ad2a Fix user edits | retain crafty perms
Move password/username edit to bootbox
2023-10-08 22:13:55 -04:00
Silversthorn
72a5f1661c Resolve Conflicts from Merge branch 'dev' into feature/openmetrics-implementation 2023-10-07 23:55:58 +02:00
Silversthorn
49914c7f14 Improve OpenMetrics Registries Work 2023-10-07 23:50:56 +02:00