Commit Graph

1701 Commits

Author SHA1 Message Date
amcmanu3
17ef71046c Merge branch 'master' into dev 2022-06-14 15:49:32 -04:00
amcmanu3
0f43dd627a Fix uppercase usernames imported from 3.
Uppercase usernames will break logic on three.
They need to be lowered before they are imported.
2022-06-14 15:43:29 -04:00
amcmanu3
50438c485b Fix support log delete order.
Fix username uppercase.
2022-06-14 15:42:13 -04:00
Iain Powrie
2ab06a9dec Merge branch 'newCoolUnraidXmlUpdate' into 'dev'
Update unRAID xml readability.

See merge request crafty-controller/crafty-4!337
2022-06-14 13:11:53 +00:00
hofq
d16e83686e Update unRAID xml readability. 2022-06-14 13:11:53 +00:00
Iain Powrie
76af9b654d Merge branch 'tweak/remove-no-else-excemptions-pylint' into 'dev'
Remove no-else pylint excemptions

See merge request crafty-controller/crafty-4!342
2022-06-14 13:08:39 +00:00
luukas
e73dd682c8
Fix no-else-* QA warnings 2022-06-14 15:40:57 +03:00
Zedifus
034af1b10c Remove no-else pylint excemptions 2022-06-14 12:08:34 +01:00
Zedifus
32427c3684 Merge branch 'master' into dev 2022-06-14 12:05:58 +01:00
Iain Powrie
249e540991 Merge branch 'dutch-translator-updates' into 'dev'
Update dutch translation for spacing issue

See merge request crafty-controller/crafty-4!340
2022-06-13 21:47:57 +00:00
Iain Powrie
10474ffe9d Merge branch 'tweak/remove-pylint-deprecations' into 'master'
Remove deprecated pylint rules

See merge request crafty-controller/crafty-4!339
2022-06-13 21:41:39 +00:00
Analicia A
2b0900d95b Correct translation - Dutch - added a space between two words 2022-06-13 21:40:45 +00:00
Iain Powrie
ecb7dd6177 Merge branch 'bugfix/useless-sessionlog-warning' into 'dev'
Remove a useless session.log warning

See merge request crafty-controller/crafty-4!338
2022-06-13 21:36:41 +00:00
Zedifus
f1340f4f45 Appease black 2022-06-13 22:35:33 +01:00
luukas
73a6d1cd78
Fix the error message while deleting session.log 2022-06-14 00:30:28 +03:00
Iain Powrie
75d3baccbd Remove deprecated pylint rules
https://github.com/PyCQA/pylint/pull/3571
https://github.com/PyCQA/pylint/pull/3577
2022-06-13 21:30:24 +00:00
luukas
0d664cfae5
Remove a useless session.log warning
This fixes an error being sent when session.log doesn't exist.
This usually occurs when the logs directory is deleted.
2022-06-14 00:16:49 +03:00
Andrew
5022723895 Merge branch 'dev' into 'master'
Fix user reset password. Fix NL language

See merge request crafty-controller/crafty-4!335
2022-06-13 21:06:37 +00:00
amcmanu3
55f7ab1d35 Fix traceback on crash detection startup 2022-06-13 16:13:18 -04:00
amcmanu3
e644380b64 Allow users with capital letter to reset password 2022-06-13 16:06:36 -04:00
Andrew
80b125071c Merge branch 'dev' into 'master'
Fix User Imports on Import3. Fix TZ stack

See merge request crafty-controller/crafty-4!334
2022-06-13 19:35:15 +00:00
xithical
c4ce592cdc Merge branch 'freddy-0-dev-patch-40848' into 'dev'
borked icon location

See merge request crafty-controller/crafty-4!333
2022-06-13 19:27:55 +00:00
Iain Powrie
6fea0dfc50 Merge branch 'bug/tz-fallback' into 'dev'
Add fallback for tz not being found

See merge request crafty-controller/crafty-4!331
2022-06-13 19:24:03 +00:00
Freddy 0
a94e3f8a36 borked icon location 2022-06-13 19:22:53 +00:00
Andrew
7e7557f530 Merge branch 'bug/import-user-error' into 'bug/tz-fallback'
Bug/import user error

See merge request crafty-controller/crafty-4!332
2022-06-13 19:21:07 +00:00
amcmanu3
074e9f33a8 Fix import3 2022-06-13 15:14:41 -04:00
amcmanu3
8f5cdbb0c5 Fix crafty3 -4 import users 2022-06-13 15:07:12 -04:00
amcmanu3
4019f0365e Fix user import issues 2022-06-13 14:45:01 -04:00
Zedifus
6962662ce5 Fix black 2022-06-13 19:41:25 +01:00
amcmanu3
033bf05279 Appease black 2022-06-13 14:31:53 -04:00
amcmanu3
b3f167ab62 Add fallback for tz not being found 2022-06-13 14:29:25 -04:00
Iain Powrie
2ef3df4725 Merge branch 'dev' into 'master'
Fix  unRaid xml & user imports on import3

See merge request crafty-controller/crafty-4!330
2022-06-13 16:53:42 +00:00
amcmanu3
0ffe6801d8 Fix user email bug on import3 2022-06-13 12:47:42 -04:00
Iain Powrie
de4e65448c Merge branch 'freddy-0-dev-patch-39341' into 'dev'
Docker image regristy fixed

See merge request crafty-controller/crafty-4!329
2022-06-13 16:43:25 +00:00
Freddy 0
0ed5bb416f no one notice this 2022-06-13 16:21:21 +00:00
Iain Powrie
a044727d0d Merge branch 'dev' into 'master'
Update unraid xml template

See merge request crafty-controller/crafty-4!328
2022-06-13 16:16:51 +00:00
Iain Powrie
f97f16fbe5 Merge branch 'freddy-0-Unraid-Beta' into 'dev'
final changes 4 unraid beta

See merge request crafty-controller/crafty-4!327
2022-06-13 16:11:10 +00:00
Freddy 0
f7436f8a74 final changes 4 unraid beta 2022-06-13 16:05:28 +00:00
Iain Powrie
ecab107102 Merge branch 'dev' into 'master'
Add Repository Templates

See merge request crafty-controller/crafty-4!326
2022-06-13 13:02:02 +00:00
Iain Powrie
6c42e17e94 Merge branch 'gitlab/templates' into 'dev'
Add Templates

See merge request crafty-controller/crafty-4!325
2022-06-13 12:56:06 +00:00
Iain Powrie
307e97deda Fix minor format 2022-06-13 12:53:13 +00:00
Iain Powrie
37f2c8d622 Merge branch 'dev' into 'master'
Fix Startup Prompt

See merge request crafty-controller/crafty-4!324
2022-06-13 12:47:21 +00:00
Zedifus
91d7eceb27 Add Templates 2022-06-13 13:44:32 +01:00
Andrew
6436604150 Merge branch 'bug/startup-text' into 'dev'
Define the prompt after the init is complete

See merge request crafty-controller/crafty-4!323
2022-06-13 01:39:16 +00:00
amcmanu3
f1f5f820b7 Add print for ordering purposes 2022-06-12 20:13:05 -04:00
amcmanu3
ef02b5a450 Change ordering 2022-06-12 20:11:56 -04:00
amcmanu3
1655818afc Define the prompt after the init is complete 2022-06-12 20:09:46 -04:00
Iain Powrie
794e0c0699 Merge branch 'dev' into 'master'
Add form after first login

See merge request crafty-controller/crafty-4!322
2022-06-12 21:34:02 +00:00
Iain Powrie
0dc513297c Merge branch 'tweak/first-log-survey' into 'dev'
Tweak/first log survey

See merge request crafty-controller/crafty-4!321
2022-06-12 21:27:31 +00:00
Andrew
c389e755ad Merge branch 'dev' into 'master'
Bug Fixes 20220612

See merge request crafty-controller/crafty-4!320
2022-06-12 21:23:21 +00:00