Andrew
9036d7a073
Update nl_BE
...
jq is not working on this comp will sort later
2023-10-16 15:34:26 -05:00
Zedifus
bfdf31cbb5
Merge branch 'dev' into maintenance/update-translations
2023-10-16 21:25:25 +01:00
Iain Powrie
29da62b560
Merge branch 'translation/update-FR' into 'dev'
...
Update French translation file
See merge request crafty-controller/crafty-4!646
2023-10-16 19:59:52 +00:00
Zedifus
acb5cfac30
Update changelog !646
2023-10-16 20:54:10 +01:00
Zedifus
ec8928c821
Merge branch 'dev' into translation/update-FR
2023-10-16 20:49:22 +01:00
Iain Powrie
61d37fed85
Merge branch 'tweak/user-edit' into 'dev'
...
BugFix User permissions | Tweak Change Password/Username
See merge request crafty-controller/crafty-4!643
2023-10-16 19:46:54 +00:00
Zedifus
b80f318efa
Update changelog !643
2023-10-16 20:32:05 +01:00
Zedifus
82eeacf11a
Merge branch 'dev' into tweak/user-edit
2023-10-16 20:29:07 +01:00
Iain Powrie
5bcc952f05
Merge branch 'enhancement/notify-display' into 'dev'
...
Enhancement/notify display
See merge request crafty-controller/crafty-4!641
2023-10-16 19:26:18 +00:00
Zedifus
0dd9f98516
Update changelog !641
2023-10-16 20:17:18 +01:00
Zedifus
9fa53c2c1a
Merge branch 'dev' into enhancement/notify-display
2023-10-16 20:14:32 +01:00
Silversthorn
6eb16ed309
Update French translation file
2023-10-13 23:40:48 +02:00
amcmanu3
eac40ca6c8
Edit typo on english json
2023-10-11 16:44:49 -04:00
amcmanu3
c2ed57c880
Update Latvian translation.
...
Thank you Mednis!
2023-10-11 16:39:48 -04:00
Iain Powrie
5aeeeecbfd
Add lang sort log to ignore files
2023-10-09 21:27:38 +00:00
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
