lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17546 commits 1 branch 0 tags 220 MiB
Commit graph

523 commits

Author SHA1 Message Date
snipe
2b85ddeb74 Use correct date 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 19:10:06 +01:00
snipe
d0359a42fb Added signature to licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 18:56:34 +01:00
36864
dfdbc95b5c
Fix empty signatures in print page 
Fixes snipe#16661 

Assuming that whatever happens between the user accepting and signing for the asset and the print page being accessed isn't another user somehow signing for the same asset and it not being assigned to that second user.
 2025-04-08 15:50:59 +00:00
snipe
c46a9a773d Fixed admin string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 05:08:08 +01:00
snipe
b7c011dd2d Use new one line code style 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 15:03:31 +01:00
snipe
c7890f4c3b Use id as copy key 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 13:52:55 +01:00
snipe
45d3c0444b Added copy to license keys 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-03 12:29:30 +01:00
Marcus Moore
2a156776a4
Merge branch 'develop' into chore/migrate-select-helper 
# Conflicts:
#	resources/views/settings/branding.blade.php
#	resources/views/settings/general.blade.php
 2025-03-04 11:19:38 -08:00
snipe
ea0f105180
Merge pull request #16347 from marcusmoore/chore/migrate-checkbox-helpers-pt4 
Replace calls to Form::checkbox pt4
 2025-02-26 07:05:38 +00:00
Marcus Moore
15f842e2dc
Replace Form::checkbox on bulk user edit page 2025-02-25 16:00:46 -08:00
Marcus Moore
46b31dfe14
Replace Form::checkbox on user create and edit page 2025-02-25 14:32:39 -08:00
snipe
76e3c00d2d Removed footer on tables that didn’t need it 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:41:49 +00:00
snipe
ba49fc554d Moved warning to be consistent with other FCOs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:47 +00:00
snipe
32b89e937c Fixed routes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:04:56 +00:00
Marcus Moore
60d7232569
Remove unneeded Form::close from users index 2025-02-12 13:50:38 -08:00
Marcus Moore
00e7795414
Merge branch 'develop' into chore/migrate-select-helper 
# Conflicts:
#	resources/views/partials/forms/edit/company.blade.php
 2025-02-10 15:44:02 -08:00
Marcus Moore
295875c45e
Fix and replace remaining radios on bulk user edit page 2025-02-04 11:02:40 -08:00
Marcus Moore
ac925af3d0
Replace a few radio inputs on bulk user edit page 2025-01-27 13:50:22 -08:00
snipe
02eeb7f916 Added extrab option in bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 19:04:23 +00:00
Marcus Moore
3fadeebd82
Convert additional Form::select to blade component 2025-01-13 16:20:02 -08:00
snipe
1246ab1de7 Fixed bulk user form in user detail view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:14:36 +00:00
Godfrey M
15c9df0ab1 fix mobile view for asset and user 2024-11-26 10:59:31 -08:00
snipe
30a6a678d4 Indicate requiredness on status select on bulk user checkin+delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-19 13:50:18 +00:00
Marcus Moore
ad99b8b456
Use generic ID translation 2024-11-06 10:37:31 -08:00
Marcus Moore
e7cb4a75eb
Show accessory checkout id in user accessory table 2024-11-04 15:56:53 -08:00
snipe
d1149730be Apply blade component to files views 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 16:31:17 +01:00
snipe
0e9b3c9119 Check for existence before trying to get the icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:27:39 +01:00
snipe
d67addc69e Removed filetype column - it’s dumb 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:21:43 +01:00
snipe
017884f843 Added checks and filetype display 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-17 00:09:09 +01:00
akemidx
c2663ea1e0 withouttrashed 2024-10-08 16:38:33 -04:00
Marcus Moore
8c9132aff9
Hide EULA text and button when nothing will be displayed 2024-10-07 14:22:49 -07:00
snipe
3f36d5f9b3 Removed duplicate CSS and removed line break before user section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-07 11:08:02 +01:00
snipe
f483cd448f Smarter work-wrapping on long text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 17:27:37 +01:00
snipe
722d5a58e7 Added isset on users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:38 +01:00
snipe
0dd6f41f66 Simplified 2fa if/else 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 11:04:55 +01:00
snipe
684c20ae39 Fixed parenthasis 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-02 11:00:49 +01:00
snipe
1b041af862 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-09-29 11:25:01 +01:00
snipe
dc85588d7f Don’t show password as required if editing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-28 15:31:44 +01:00
snipe
585f998cae Fixes for requiredness display 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-28 15:28:06 +01:00
snipe
d120585f94 Check for valid eula for license, consumable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-27 14:07:30 +01:00
snipe
36b27fcda3 Check for valid category before getting the eula 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-27 13:37:14 +01:00
snipe
9aada2ec70
Merge pull request #15498 from Godmartinz/Modal_fix 
Refactoring modals with partials and fixing misalignments
 2024-09-26 09:09:35 +01:00
Godfrey M
926a319552 Merge branch 'develop' into Modal_fix_p2 2024-09-25 11:10:24 -07:00
Marcus Moore
a12c9d053f
Hide label when printing 2024-09-23 16:44:25 -07:00
Marcus Moore
8b3b68b308
Show or hide all eulas at once when printing multiple users 2024-09-23 16:43:14 -07:00
Marcus Moore
3870095a28
Fix Cannot read properties of undefined error by removing snipe-table class from eula table 2024-09-23 15:50:24 -07:00
Marcus Moore
a02e250b22
Add page breaks for each user 2024-09-23 15:26:15 -07:00
Marcus Moore
8ac5c0e471
Re-combine layout and view 2024-09-23 14:05:47 -07:00
Marcus Moore
2d2d5bdc7e
Pass user in array 2024-09-19 17:23:47 -07:00
Marcus Moore
8364d26c9b
Extract parent layout 2024-09-19 17:18:26 -07:00