Iain Powrie
71c421b6bd
Merge branch 'devops/lang-check-sort-script' into 'dev'
...
Add script to assist with lang file management
See merge request crafty-controller/crafty-4!644
2023-10-09 19:23:26 +00:00
Zedifus
c3fd3acb2c
Sort all lang files
2023-10-09 19:12:35 +01:00
Zedifus
647fe962ab
Add translations check & sort script
2023-10-09 19:10:11 +01:00
Silversthorn
2fe862f6a2
Fixing little issue when auto close
2023-10-09 18:57:11 +02:00
amcmanu3
6bc45b86e5
Merge branch 'dev' into tweak/user-edit
2023-10-08 22:44:53 -04:00
amcmanu3
cd04b87705
Appease the linter
2023-10-08 22:39:05 -04:00
amcmanu3
07db332f1c
Add translations
2023-10-08 22:30:40 -04:00
amcmanu3
2d32e3ad2a
Fix user edits | retain crafty perms
...
Move password/username edit to bootbox
2023-10-08 22:13:55 -04:00
Iain Powrie
99f17c1532
Merge branch 'feature/openmetrics-implementation' into 'dev'
...
Implementation of OpenMetrics
See merge request crafty-controller/crafty-4!624
2023-10-08 22:11:27 +00:00
Zedifus
eb9f6d8e6a
Update changelog !624
2023-10-08 23:05:39 +01:00
amcmanu3
5547720a8f
Fix js spacing
2023-10-08 17:02:31 -04:00
amcmanu3
b59262802c
Fix spacing on functions
2023-10-08 17:02:27 -04:00
amcmanu3
700194df9f
Merge branch 'dev' into tweak/user-edit
2023-10-08 16:40:30 -04:00
amcmanu3
6d9f930e71
Check for super user on user edit
2023-10-08 16:39:04 -04:00
Silversthorn
bcbafe2278
Fixed the last one ?
2023-10-08 22:19:36 +02:00
Silversthorn
814aaeb1d2
Appease the linter
2023-10-08 22:02:13 +02:00
Iain Powrie
6a42e07584
Merge branch 'bugfix/server-upload' into 'dev'
...
Move Crafty server upload to /import/upload
See merge request crafty-controller/crafty-4!642
2023-10-08 18:19:32 +00:00
Zedifus
6e39a0f729
Update changelog !642
2023-10-08 19:12:27 +01:00
Zedifus
9ddd21da82
Merge branch 'dev' into bugfix/server-upload
2023-10-08 19:07:51 +01:00
Iain Powrie
44b7824f20
Merge branch 'bugfix/use-controller' into 'dev'
...
Use controller on update user call
See merge request crafty-controller/crafty-4!640
2023-10-08 18:05:53 +00:00
Zedifus
707651621a
Update changelog !640
2023-10-08 18:55:34 +01:00
Zedifus
0255d17707
Replace echo with printf to account for environment inconsistencies.
...
Echo was being weird, some environments it was not escaping colour codes,
tried adding the '-e' flag, but this was printed weirdly in compose.
2023-10-08 18:29:28 +01:00
Zedifus
706c30775a
Fix xargs, and increase log verbosity
...
xargs would fail when no files were found, -r resolves this by continuing.
moved repair to function to reduce duplicated code
2023-10-08 18:11:00 +01:00
Zedifus
f39c9c5a28
Move repair operations to batches, and null terminate file names
...
This will allow chgrp and chmod to operate in batches of 100,
instead of starting a process per file
Also null-terminating filenames
to protect against spaces, newlines,
or other potentially problematic characters.
2023-10-08 16:23:56 +01:00
Zedifus
38855ae70f
Update echo's to correctly escape colour codes
2023-10-08 16:15:56 +01:00
Zedifus
9ac8400a90
Update permissions check gate on docker starter sh
...
This will ensure we fire on files only, not directories ie 'import/upload'
2023-10-08 16:13:38 +01:00
amcmanu3
89b0e1ed02
fix typo for upload dir
2023-10-08 10:57:59 -04:00
amcmanu3
0296b09547
Move Crafty server upload to /import/upload
2023-10-08 10:54:28 -04:00
Silversthorn
d31a83a783
prettying Toast
2023-10-08 11:55:11 +02:00
Silversthorn
05ea1baa77
Improve Notifications with Toasts
2023-10-08 11:40:25 +02:00
amcmanu3
612cac4ed2
Fix dashboard to not use ajax
2023-10-07 22:10:24 -04:00
amcmanu3
39d78b92e6
Set password from bootbox
2023-10-07 22:10:15 -04:00
Silversthorn
5947d4ebbf
Merge branch 'dev' into feature/openmetrics-implementation
2023-10-08 00:06:34 +02:00
Silversthorn
72a5f1661c
Resolve Conflicts from Merge branch 'dev' into feature/openmetrics-implementation
2023-10-07 23:55:58 +02:00
Silversthorn
f49475c15a
Removing unused imports
2023-10-07 23:52:06 +02:00
Silversthorn
49914c7f14
Improve OpenMetrics Registries Work
2023-10-07 23:50:56 +02:00
amcmanu3
4eb15db30f
Use controller on update user call
2023-10-07 15:21:33 -04:00
amcmanu3
b1c5836b9b
Create forms to username and password changes
2023-10-07 14:42:52 -04:00
Iain Powrie
2f65971261
Merge branch 'maintenance/bump-dependencies' into 'dev'
...
Bump multiple dep versions
See merge request crafty-controller/crafty-4!639
2023-10-07 18:25:21 +00:00
amcmanu3
7a6bb657fe
Add icons for user password and username
2023-10-07 14:14:46 -04:00
amcmanu3
529b3a159c
Appease the linter
2023-10-07 13:55:36 -04:00
Zedifus
77c7264f2b
Update changelog !639
2023-10-07 18:32:03 +01:00
amcmanu3
d5225fc6dd
Merge branch 'dev' into maintenance/bump-dependencies
2023-10-07 13:15:48 -04:00
amcmanu3
882f241181
Appease black
2023-10-07 13:13:35 -04:00
amcmanu3
42bdf2994d
Move callback to unbound
2023-10-07 13:06:26 -04:00
Iain Powrie
0d5b320838
Merge branch 'maintenance/bump-orjson' into 'dev'
...
Bump orjson to 3.9.7 for python 3.12 support
See merge request crafty-controller/crafty-4!638
2023-10-07 16:12:50 +00:00
Zedifus
c3c00dabc2
Update changelog !638
2023-10-07 17:05:59 +01:00
Zedifus
d48a0daa0a
Merge branch 'dev' into maintenance/bump-orjson
2023-10-07 17:03:24 +01:00
amcmanu3
60ae98ef97
Merge branch 'dev' into maintenance/bump-dependencies
2023-10-07 12:02:46 -04:00
Iain Powrie
9c62789d1d
Merge branch 'bugfix/gathering-files' into 'dev'
...
Gathering Files Dialogue
See merge request crafty-controller/crafty-4!637
2023-10-07 16:01:26 +00:00
