DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11054 commits 96 branches 267 tags 296 MiB
Commit graph

11054 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d685335aea
Merge pull request #12975 from inietov/fixes/import_asset_notes 
Fixed Notes field doesn't get populate when creating/updating assets via Importer [sc-23222]
 2023-05-08 13:11:50 -07:00
snipe d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177 
Fixes user name missing in accessory acceptance notifications
 2023-05-08 13:04:37 -07:00
snipe 480ef23505 Merge remote-tracking branch 'origin/develop' 2023-05-08 12:44:01 -07:00
snipe 4503815ad7
Merge pull request #12984 from snipe/features/check_for_zip_in_backup_filename 
Check that the filename we pass ends in zip, add it if not
 2023-05-08 12:43:34 -07:00
snipe ba462d1e93 Check that the filename we pass ends in zip, add it if not 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 12:41:32 -07:00
snipe 3429d1f4b4 Merge remote-tracking branch 'origin/develop' 2023-05-08 12:22:22 -07:00
snipe 0f76eda4af
Merge pull request #12983 from snipe/features/add_optional_filename_to_backup_artisan 
Add optional filename to backup
 2023-05-08 12:21:55 -07:00
snipe 85243423cf Add optional filename to backup 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 12:20:43 -07:00
snipe a73205f228 Merge remote-tracking branch 'origin/develop' 2023-05-08 11:24:03 -07:00
snipe 06ffe64f62
Merge pull request #12981 from snipe/fixes/wonky_div_when_saml_disabled 
Fixed misplaced div when saml is disabled
 2023-05-08 11:22:54 -07:00
snipe 223ff5e97e Fixed misplaced div when saml is disabled 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 11:20:26 -07:00
snipe fe40902765 Merge remote-tracking branch 'origin/develop' 2023-05-06 06:37:29 -07:00
snipe 689ef433b3
Merge pull request #12979 from snipe/fixes/added_use_for_fieldsets_controller 
Added missing use statement
 2023-05-06 06:37:01 -07:00
snipe 8b73fa0053 Added missing use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-06 06:36:09 -07:00
snipe 3d345d15ac Merge remote-tracking branch 'origin/develop' 2023-05-04 11:01:15 -07:00
snipe 4efa84270a
Merge pull request #12974 from snipe/fixes/show_sig_column_regardless_of_sig_status 
Show signature column in asset history regardless of “require sig” state
 2023-05-04 11:00:51 -07:00
snipe 60515f1262 Show signature column regardless of “require sig” state 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-04 10:56:35 -07:00
Ivan Nieto Vivanco fbb7c55450 Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models 2023-05-04 03:12:36 -06:00
Ivan Nieto Vivanco 89fbd60d97 Restore the 'Asset Notes' and 'Model Notes' in the Map Asset Import Fields form 2023-05-04 02:00:04 -06:00
Marcus Moore 96c6d8896f
Add additional information to acceptance notifications for assets, accessories, and consumables 2023-05-03 17:04:01 -07:00
Marcus Moore 9efe13bb5e
Capitalize "declined" in acceptance in notification 2023-05-03 17:03:22 -07:00
Marcus Moore 4a0b3efd1f
Include user's name in Acceptance result notifications for accessories 2023-05-03 14:22:05 -07:00
Marcus Moore f96d8fe674
Add CheckoutAcceptance factory 2023-05-03 14:21:13 -07:00
snipe 5950ec27ab Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2023-05-03 13:49:36 -07:00
snipe cd6f6ee8ff Bumped version to 6.1.1-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 13:47:46 -07:00
akemidx 526c089424 Buttons on the accessory view page 2023-05-03 16:40:06 -04:00
akemidx 67105528d1 Buttons on the accessory view page 2023-05-03 16:31:56 -04:00
akemidx 12f0c42545 buttons added 2023-05-03 16:31:56 -04:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
snipe fc53b56481
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset 
Fixed Error 500 after sign and accept asset
 2023-05-03 11:43:14 -07:00
akemidx 889be83762 replacing route. sorry! 2023-05-03 14:14:18 -04:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import 
Location importer via Livewire Importer
 2023-05-03 11:02:06 -07:00
snipe f5cd58e9b7 Unmix return type variables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:57:02 -07:00
snipe da4841987e Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:55:30 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
snipe cdbd68012f
Merge pull request #12878 from joelpittet/patch-2 
Use environment variable and default to PHP's sendmail_path
 2023-05-03 10:48:39 -07:00
snipe 577fff7d65 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:45:36 -07:00
snipe 79a27085c9 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-05-03 10:43:45 -07:00
snipe 27600e1553 Snyk webpack upgrade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:43:05 -07:00
snipe 914b2658cc
Merge pull request #12943 from marcusmoore/fixes/avoid-loading-unused-models-for-report 
Remove the loading of asset maintenances that are not used by view
 2023-05-03 10:41:52 -07:00
snipe 6a12d5d9a0
Merge pull request #12964 from marcusmoore/fixes/restrict-php-version 
Restrict PHP version to <8.2
 2023-05-03 10:40:52 -07:00
snipe 31f1bce16b
Merge pull request #12958 from uberbrady/snipeit_v7_merge_develop_05_01_2022 
Snipeit v7 merge develop 05 01 2022
 2023-05-03 10:40:18 -07:00
snipe 466c2fd47c
Merge pull request #12966 from Godmartinz/bug/sc-23161 
fixed color differences in dark themes
 2023-05-03 10:38:54 -07:00
Godfrey M 87d1a82e35 moar changes to red 2023-05-02 15:15:02 -07:00
Godfrey M 1d494252ef corrections for dark red 2023-05-02 14:05:29 -07:00
Godfrey M 786e8deb91 removed dead space 2023-05-02 13:54:14 -07:00
Godfrey M 0a3cb5286d fixes dark red 2023-05-02 12:37:05 -07:00
Godfrey M f91e76e0f2 fixes dark blue and btn-warning bg 2023-05-02 12:33:40 -07:00
Godfrey M af2f288286 fixes dark orange theme 2023-05-02 12:17:22 -07:00