ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,592 Commits 84 Branches 293 Tags
592cb2b3ecfdc164933e5dddb45d922ec4ff1212
Commit Graph

5751 Commits

Author SHA1 Message Date
snipe 592cb2b3ec Merge remote-tracking branch 'origin/develop' 2025-06-14 17:08:11 +01:00
snipe ace4a5d614 Add logic around menu options 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 17:02:09 +01:00
snipe f5a7871a2e Merge remote-tracking branch 'origin/develop' 2025-06-14 16:44:48 +01:00
snipe 47afb15970 Updated HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 16:24:05 +01:00
snipe 0801d1473c Use forem group div 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 14:57:55 +01:00
snipe b264fde165 Show title if it’s an edit 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 14:30:43 +01:00
snipe 970ff25e5e Added model and company to manufacturer view 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 14:30:27 +01:00
snipe 957faa6651 Fixed datepicker prepopulating with start_date 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 14:03:52 +01:00
snipe cc7dcc6e81 Disallow multiple on editing a maintenance 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-14 13:39:18 +01:00
snipe ec411fa0db Merge remote-tracking branch 'origin/develop' 2025-06-14 12:17:43 +01:00
snipe 9b8524ba27 Merge pull request #17109 from akemidx/bug/sc-28718-2 
FIXED: Adding Total to Consumable View Page
 2025-06-12 21:44:08 +01:00
snipe a850a9bb83 Merge remote-tracking branch 'origin/develop' 2025-06-12 21:34:59 +01:00
snipe ba7db8f7b3 Merge pull request #17092 from Godmartinz/fix-bulk_checkout_undeployable 
Adds `hasUndeplyableStatus` check to bulk checkout
 2025-06-12 21:29:26 +01:00
snipe 479b7a3f94 Merge remote-tracking branch 'origin/develop' 2025-06-11 10:32:49 +01:00
snipe 59db38524b Merge pull request #17094 from spencerrlongg/snipe-it-17051 
Fixes #17051 - Nulling Custom Fields In Bulk Asset Updates
 2025-06-11 10:31:28 +01:00
snipe 3f5cfc3a4b Merge pull request #17142 from marcusmoore/fixes/present-on-null-in-expected-checkins-notification 
Fixed Expected checkin notification erroring on unknown users
 2025-06-11 10:27:49 +01:00
snipe 9a012ca01e Merge pull request #17154 from Robert-Azelis/patch-10 
Update user print assigned assets
 2025-06-11 10:24:50 +01:00
snipe f7cfee77c9 Merge remote-tracking branch 'origin/develop' 2025-06-11 10:20:22 +01:00
Robert-Azelis 79dbcb10c9 Update location print assigned assets 
Lets allow user to select print layout: portrait or landscape
Use dedicated logo for PDF documents: acceptance_pdf_logo
 2025-06-11 09:22:13 +02:00
Robert-Azelis 7c80fdea58 Update user print assigned assets 
Lets allow user to select print layout: portrait or landscape
Use dedicated logo for PDF documents: acceptance_pdf_logo
 2025-06-11 09:19:51 +02:00
Godfrey M 3cfed72af4 removes undeployables from asset_id array 2025-06-10 10:11:00 -07:00
Marcus Moore 6c1adff5c8 Extract translation string 2025-06-09 15:33:39 -07:00
Marcus Moore 9293bdca06 Don't render link for Unknown User 2025-06-09 15:32:07 -07:00
Marcus Moore beeccbfb44 Handle unknown users gracefully 2025-06-09 15:30:03 -07:00
snipe 976cc1c86f Fixed second incorrect string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-09 14:00:47 +01:00
snipe 65a8126a13 Merge remote-tracking branch 'origin/develop' 2025-06-09 13:40:44 +01:00
snipe cbbf3aa6c8 Fixed incorrect translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-09 13:40:34 +01:00
snipe 81d930c4d2 Merge remote-tracking branch 'origin/develop' 2025-06-08 15:19:19 +01:00
snipe d756670c56 Check for supplier before trying to show 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-08 15:17:24 +01:00
snipe 9ef7b0e64a Fixed missing translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 20:41:36 +01:00
snipe ec8ddc197f Merge branch 'develop' into fix_action_date 2025-06-06 17:18:27 +01:00
snipe b48e56bd46 Merge pull request #17110 from Godmartinz/allow-users-to-dl-eula-from-account 
Fixed #17084 - Adds Eula table to User account area with download option
 2025-06-06 17:07:19 +01:00
snipe 6839623061 Merge remote-tracking branch 'origin/develop' 2025-06-06 17:03:37 +01:00
snipe 5d129dd420 Small form fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 16:56:45 +01:00
snipe 482723f3bc Updated blade to use multiple 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 15:47:07 +01:00
snipe 0ded40c037 Add multiselect to maintenance form 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 15:41:30 +01:00
snipe 6f486a37ff Added maintenance option to bulk menu 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 15:41:02 +01:00
snipe 7de2809d42 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2025-06-06 14:05:47 +01:00
snipe ea66629e98 Fixed #17117 - use translation for “site default” 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 14:03:17 +01:00
snipe 867a992183 Added print button to tables 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 13:51:12 +01:00
snipe 98ec6b6886 Merge remote-tracking branch 'origin/develop' 2025-06-06 12:48:54 +01:00
snipe fc250e228d Added highlighting on table search 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 12:43:47 +01:00
snipe 04827f00cc Merge remote-tracking branch 'origin/develop' 2025-06-06 11:54:10 +01:00
snipe 048d910d5b Use partial 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 11:33:17 +01:00
snipe b162aba445 Added localization for datepicker 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 11:33:02 +01:00
snipe 974627849b Added datepicker partial 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 11:32:47 +01:00
snipe e18e9f699e Use blade component in datepicker partial 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 11:32:37 +01:00
snipe cc9209d2de Removed EOL date and purchase date partials 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-06 11:32:13 +01:00
snipe 660bfc6578 Merge remote-tracking branch 'origin/develop' 2025-06-06 08:31:09 +01:00
snipe dd3d264e63 Merge pull request #16675 from Godmartinz/null_location_id_fix 
Adds a check for assigned target not being null when creating an asset
 2025-06-06 08:30:31 +01:00