snipe
|
7ec44e46ce
|
Added ability check for restoring users at all
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 20:35:28 +01:00 |
|
snipe
|
c2e649e2bf
|
Fixed small permissions issue
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 20:07:37 +01:00 |
|
snipe
|
196db9718e
|
Use class name instead
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:55:58 +01:00 |
|
snipe
|
e60dbc883c
|
Removed test code
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:42:34 +01:00 |
|
snipe
|
bbbfa91db9
|
Fixed wonky rule
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:40:26 +01:00 |
|
snipe
|
9e59bd5687
|
Cleaned up controller code a bit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:33:36 +01:00 |
|
snipe
|
1d26ccac4e
|
Check for the additional auth for that user
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:33:06 +01:00 |
|
snipe
|
0e2526f627
|
Removed comment
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:32:49 +01:00 |
|
snipe
|
dd9e9c7a6d
|
Fixed return types
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 18:49:49 +01:00 |
|
snipe
|
e19922abd0
|
Cleaned up UI controller
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 18:49:35 +01:00 |
|
snipe
|
c6a0212384
|
Merge remote-tracking branch 'origin/master' into develop
|
2024-06-22 17:33:12 +01:00 |
|
snipe
|
e03614d91b
|
Added withtrashed back in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 16:40:32 +01:00 |
|
snipe
|
b82770d0a8
|
One more small fix
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 16:38:29 +01:00 |
|
snipe
|
55e1326164
|
Fixed #14935 - user does not exist
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 16:24:18 +01:00 |
|
snipe
|
665aa6eb23
|
Merge pull request #14924 from snipe/fixes/possible_nicer_handling_for_defaultStatusLabel
Possible fix for #14915 - error on import when status label is not provided and no deployable statuses can be found
|
2024-06-21 21:37:22 +01:00 |
|
snipe
|
3531256c3f
|
Fixed deprecations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-21 21:06:43 +01:00 |
|
snipe
|
9a0db72eb4
|
More strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:40:38 +01:00 |
|
snipe
|
e11a42cf68
|
Re-use login string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:32:00 +01:00 |
|
snipe
|
9594596b8a
|
Fixed another hard-coded string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:22:27 +01:00 |
|
snipe
|
69cf697aa3
|
Added 2fa translation string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:20:52 +01:00 |
|
snipe
|
45dbe5cb77
|
Return the id, not the entire status label
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 15:05:38 +01:00 |
|
snipe
|
a1ff35f6ce
|
Possible fix for #14915
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 14:47:46 +01:00 |
|
snipe
|
30c1e1e86a
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 14:32:46 +01:00 |
|
snipe
|
8f8a5c639b
|
Updated profile translation string path
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 14:09:25 +01:00 |
|
snipe
|
c8835bf5db
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 13:40:37 +01:00 |
|
snipe
|
6dfedac7a7
|
Merge pull request #14912 from bryanlopezinc/addIsWritableTest
Add storage path permissions test
|
2024-06-20 13:38:56 +01:00 |
|
snipe
|
bd1f43f9ee
|
Added lastname.firstname as email format
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 13:36:48 +01:00 |
|
bryanlopezinc
|
203b60383f
|
Added storage path permissions test for SettingsController@getSetupIndex
|
2024-06-19 17:46:59 +01:00 |
|
snipe
|
61ced0b221
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 11:41:11 +01:00 |
|
snipe
|
ae7675fee0
|
Added audit date validation back in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:37:15 +01:00 |
|
snipe
|
66ed26fbf9
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 11:13:47 +01:00 |
|
snipe
|
7099358985
|
Added accessor/mutator
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:11:50 +01:00 |
|
snipe
|
9a706b3e3e
|
Removed datetime validation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:05:31 +01:00 |
|
snipe
|
71c9b03779
|
Fixed incorrect field name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 11:05:22 +01:00 |
|
snipe
|
dc7b9315b5
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 10:35:54 +01:00 |
|
snipe
|
6c17b141db
|
Removed duplicate locations_id search
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 10:35:21 +01:00 |
|
snipe
|
20d5587851
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 10:23:18 +01:00 |
|
Marcus Moore
|
f0a11be0b8
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# composer.lock
|
2024-06-18 15:10:46 -07:00 |
|
snipe
|
d9f70c16f7
|
Possible fix proxy/reverse proxy
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 14:44:35 +01:00 |
|
snipe
|
d0299de898
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-18 11:25:55 +01:00 |
|
snipe
|
941582ac2a
|
Properly scope archived based on settings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 10:27:11 +01:00 |
|
snipe
|
cb6ea2c6fb
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-18 09:59:43 +01:00 |
|
snipe
|
2f59bb74cd
|
Prefaced fields with “users” for clarity
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-18 09:52:41 +01:00 |
|
snipe
|
05b97db747
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-06-18 09:32:30 +01:00 |
|
Marcus Moore
|
796d6909d5
|
Add missing }
|
2024-06-17 14:40:06 -07:00 |
|
Marcus Moore
|
d9164281ab
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# resources/views/livewire/oauth-clients.blade.php
|
2024-06-17 12:57:04 -07:00 |
|
snipe
|
233e4af7f8
|
Added base asset models test
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 11:57:30 +01:00 |
|
snipe
|
dc1b808a28
|
Fixed static request
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 11:47:21 +01:00 |
|
snipe
|
d87da78eb5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-06-17 11:18:33 +01:00 |
|
Marcus Moore
|
c3e6e1144f
|
Merge branch 'develop' into chore/sc-23725/livewire3
|
2024-06-12 15:12:40 -07:00 |
|