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

85 commits

Author SHA1 Message Date
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
722d5a58e7 Added isset on users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-03 16:19:38 +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
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
Marcus Moore
efd6d7625f
Remove bad closing tag 2024-09-19 17:16:05 -07:00
Marcus Moore
bdf5708bfc
Remove accidental line 2024-09-19 17:10:43 -07:00
Marcus Moore
e95703cb18
Use eager load 2024-09-19 17:10:07 -07:00
snipe
856c57cb12 Corrected some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 12:39:59 +01:00
MrM
e49c96a35e
Added EULAs in print user's assets 
Added EULAs when we want to print all assets assigned to a users and ask him/her to sign.
 2024-07-14 19:10:33 +02:00
Florent Bervas
d9a53460ff Fix design inconsistency between assets and assigned assets in Print All Assigned report 2024-07-11 09:41:58 +00:00
Godfrey M
624632d0ca removed push and endpush 2024-07-09 11:41:31 -07:00
Marcus Moore
c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
Marcus Moore
60c7efae3c
Remove commented code 2024-06-05 11:48:10 -07:00
snipe
832ceeba56 Fixed missing endpush 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 09:57:10 +01:00
Marcus Moore
43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00
Godfrey M
84cc88831d adds signature for components 2024-03-26 12:18:10 -07:00
Godfrey M
f4f9b165a7 moves signature check inside of td 2024-03-26 11:24:34 -07:00
Godfrey M
3222d4c8df adds signature check 2024-03-26 09:18:34 -07:00
Godfrey M
3173ead2e7 adds accessory signature to user print report 2024-03-26 09:11:54 -07:00
snipe
a0a5480c97 Added default location to print all assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 18:55:47 +00:00
snipe
4b4d383509 Removed - it’s for another PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-19 15:00:26 +00:00
snipe
fcd130ae15 Layout improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 21:17:46 +00:00
snipe
002fd4ce30 Nicer formatting for signoff 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:44:51 +00:00
snipe
7b4ecb275f Use trans choice for language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:29:01 +00:00
snipe
2df5d3a8ff Fixed column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 13:06:08 +00:00
snipe
85123b3e66 Rework print page 
Still seeing a weird error tho, not done yet

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-13 12:36:17 +00:00
snipe
c5c6b3bbc6 Starting the revised print page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:23:25 +00:00
snipe
3f5cc2507d Used updated_at instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:39:49 +00:00
snipe
22996895d8 Check for valid model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 16:04:19 +00:00
snipe
28641493ca Check that the category exists 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:58:59 +00:00
snipe
161999fbca Fixed #12772 - use the APP_URL config more consistently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:05:40 -07:00
akemidx
f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00
akemidx
9c5ee060d3 WIP string/int error 2023-03-14 15:01:56 -04:00
akemidx
4533982345 added time of day 2023-03-09 15:11:07 -05:00
akemidx
2a4d30a748 forgot to add datestamp to title of page 2023-03-08 15:09:33 -05:00
akemidx
cd9f2f7fb7 datestamp for print all assigned form generation 2023-03-08 14:56:14 -05:00
snipe
e21d0729c1 Add jobh title to header in print assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:19:42 -08:00
snipe
8114d01799 Only show sig file if there is a value for accepted sig 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 14:46:45 -07:00
snipe
780222d372 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
 2022-05-10 17:26:26 -07:00
snipe
caef98d36d Patched #11025 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 02:06:12 -07:00
snipe
fba731ac1c Missed a few hard coded english strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 02:01:17 -07:00
snipe
784bf4d784 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
 2022-05-06 01:52:43 -07:00