DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
14806 commits 101 branches 268 tags 320 MiB
Commit graph

14806 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington 4c8bf9ae19 Dynamically iterate through the skin listing to build skins 2024-07-25 21:20:06 +01:00
snipe f77d300549
Merge pull request #15169 from uberbrady/create_directories_when_needed_on_restore 
Create intermediate directories on restore if needed - Fixes [SC-25950]
 2024-07-25 18:45:54 +01:00
snipe 62655be2d0 Fixed BYOD label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 18:41:37 +01:00
Brady Wetherington eb938bdba3 Create intermediate directories on restore if needed 2024-07-25 18:40:26 +01:00
snipe 129d3b35fb
Merge pull request #15168 from uberbrady/improve_restore_sanitization 
Improve restore sanitization - Fixes [sc-24840]
 2024-07-25 18:20:05 +01:00
Brady Wetherington 84df23e1f6 Better handle older SQL dumps that got created in Windows format 2024-07-25 18:07:25 +01:00
snipe a439d8abe8 Use fully qualified use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 16:08:46 +01:00
snipe 24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113 
Registered custom anonymous blade component directory
 2024-07-25 16:08:01 +01:00
Marcus Moore 44dbbeb608
Add accessory and consumable specific checkin methods 2024-07-24 14:17:49 -07:00
Marcus Moore 7161b6416e
Add failing test for accessories and consumables checkin 2024-07-24 14:16:42 -07:00
snipe 1331bffaca Merge remote-tracking branch 'origin/develop' 2024-07-24 21:42:41 +01:00
snipe 9b422e5c97 Baremetrics BMPay breaks with CSP turned [sc-25011] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 21:42:20 +01:00
snipe 0c86855392 Merge remote-tracking branch 'origin/develop' 2024-07-24 21:04:20 +01:00
snipe 962ae5231d
Merge pull request #15162 from snipe/fixes/added_location_assets_endpoint 
Added assets endpoint for locations
 2024-07-24 21:03:43 +01:00
snipe 590d13061a One more test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:57:26 +01:00
snipe c3a2cdeee9 Added assets endpoint for locations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:53:58 +01:00
snipe ef77fb91c0 Merge remote-tracking branch 'origin/develop' 2024-07-24 20:20:37 +01:00
snipe 02bd8d7ea1
Merge pull request #15161 from snipe/fixes/500_when_depreciation_is_active_but_no_purchase_date 
Fixes 500 when depreciation is active but no purchase date
 2024-07-24 20:20:10 +01:00
snipe da4ec145d7 Removed test no longer needed due to validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:17:30 +01:00
snipe ef145e47b4 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:15 +01:00
snipe adf58a06da Added check for purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:11 +01:00
snipe 63f0b5279d Added check for purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:01 +01:00
snipe 90d5a6d8ab Merge remote-tracking branch 'origin/develop' 2024-07-24 19:16:56 +01:00
snipe 5b8529bc83 Fixed pluralization 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 19:16:08 +01:00
snipe f76c68f0ed Merge remote-tracking branch 'origin/develop' 2024-07-24 18:10:23 +01:00
snipe 8368fb5c41
Merge pull request #15160 from snipe/fixes/allow_cloning_of_deleted_assets 
Allow cloning of deleted assets
 2024-07-24 18:09:55 +01:00
snipe d1c39a737f Fixed double semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 18:09:32 +01:00
snipe 425bfa4318 Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 18:06:21 +01:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe b64b774bd5 Use route model binding on clone, removed unneeded route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:21 +01:00
snipe 466ab1e3c0 Removed the banner since we already warn 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:40:24 +01:00
snipe daa9e7810e
Merge pull request #15158 from snipe/fixes/ui_cleanup_for_asset_view 
Cleaned up UI on asset view
 2024-07-24 17:34:17 +01:00
snipe 95a0f3dbe5 Cleaned up UI on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:26:55 +01:00
snipe e5ab12496f
Merge pull request #15151 from snipe/snyk-fix-067da5564c4d29b025cd356b125e6ad9 
[Snyk] Security upgrade alpine from 3.18.6 to 3.19
 2024-07-24 14:22:57 +01:00
snipe 4b906e39be
Merge pull request #15155 from snipe/fix_new_alpine 
Switch dockerfile to using php8.2 instead of 8.1 due to Alpine changes
 2024-07-24 14:00:21 +01:00
Brady Wetherington 0dc8f27240 Switch dockerfile to using php8.2 instead of 8.1 due to Alpine changes 2024-07-24 13:56:27 +01:00
snipe c4135c71d4 Merge remote-tracking branch 'origin/develop' 2024-07-24 13:05:16 +01:00
snipe 172da4d655
Merge pull request #15154 from snipe/fixes/15103_show_eol_to_users 
Fixes #15103 - Added EOL and audit into to user profile assets
 2024-07-24 13:03:50 +01:00
snipe 6f8ccd4e10 Fixes #15103 - Added EOL and audit into to user profile assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:54:33 +01:00
snipe 8d36a75342 Merge remote-tracking branch 'origin/develop' 2024-07-24 12:41:20 +01:00
snipe 9457e5b890
Merge pull request #15153 from snipe/fixes/mail_backup_config 
Fixed env var for backup config - related to #14964
 2024-07-24 12:40:46 +01:00
snipe bce7a278ae Fixed env var for backup config - related to #14964 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:38:58 +01:00
snipe a6041ae525 Merge remote-tracking branch 'origin/develop' 2024-07-24 10:41:36 +01:00
snipe ab1e097b7c Early return for requiredness 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 10:41:14 +01:00
snipe a781f84aea Merge remote-tracking branch 'origin/develop' 2024-07-24 10:36:23 +01:00
snipe 90a2a808d6
Merge pull request #15149 from spencerrlongg/bug/check_requiredness 
Fixed: Requiredness Check Bug
 2024-07-24 10:33:45 +01:00
snipe 73e2d8e305 Merge remote-tracking branch 'origin/develop' 2024-07-24 10:32:54 +01:00
snyk-bot 0e1e13f54a
fix: Dockerfile.alpine to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-6913411
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249236
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249265
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249419
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249419
 2024-07-24 09:11:01 +00:00
Marcus Moore 869c06f454
Register anonymous blade component namespace 2024-07-23 15:41:58 -07:00
spencerrlongg b61ab423ca ok NOW it should be fine 2024-07-23 17:35:48 -05:00