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
13761 commits 96 branches 267 tags 296 MiB
Commit graph

13761 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9fc1cbd7ae Change cast to include format 
https://laravel.com/docs/8.x/eloquent-mutators#date-casting - this doesn’t seem to work tho?
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:24:48 +00:00
snipe e3e887f02e Merge remote-tracking branch 'origin/develop' 2023-10-31 09:46:30 +00:00
snipe e405e27643
Merge pull request #13815 from snipe/feature/sc-23898 
Add additional fields to Download All in Activity Report
 2023-10-31 09:45:12 +00:00
snipe 96211cf73c Add additional fields to Download All in Activity Report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 09:43:47 +00:00
Nathan Butler 79f380cbe7 Added asset history tab to locations view 2023-10-31 10:28:54 +11:00
snipe 5236ca3332 Merge remote-tracking branch 'origin/develop' 2023-10-30 21:05:33 +00:00
snipe 518c43680d
Merge pull request #13812 from snipe/bug/sc-23897 
Handle redirect from after POST request from backup restore
 2023-10-30 20:21:29 +00:00
snipe e554a80589 Handle redirect from after POST request from backup restore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 20:01:01 +00:00
snipe f47a8664f9
Merge pull request #13811 from Godmartinz/missing_translation_string 
add missing translation string
 2023-10-30 19:40:51 +00:00
Godfrey M 97953ae082 add missing translation string 2023-10-30 12:17:55 -07:00
snipe 8e20071254
Merge pull request #13731 from snipe/improvements/trim_on_import 
Added trim to import values
 2023-10-30 14:17:37 +00:00
snipe 316c90c144
Update app/Importer/ItemImporter.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2023-10-30 14:17:27 +00:00
snipe a8e8fe7447 Merge remote-tracking branch 'origin/develop' 2023-10-30 14:12:54 +00:00
snipe 462d2d329a Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-10-30 14:12:38 +00:00
snipe a6b713ae21 Add @mmanjos as a contributor 2023-10-30 14:12:23 +00:00
snipe 0d67ae27c2
Merge pull request #13810 from mmanjos/develop 
Fixed #11179: APP_FORCE_TLS is missing from the example .env.docker
 2023-10-30 14:11:54 +00:00
Matthew Manjos bd894677ef add missing variable APP_FORCE_TLS to .env.docker 2023-10-30 10:09:44 -04:00
snipe 2fd2d9431e Merge remote-tracking branch 'origin/develop' 2023-10-30 13:21:19 +00:00
snipe d404452f5a
Merge pull request #13809 from snipe/bug/sc-23893 
Added min_amt value to model detail page
 2023-10-30 13:21:00 +00:00
snipe 8c46f4ef69 Added min_amt value to model detaul page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-30 13:19:59 +00:00
snipe 1da6b6a4d5 Merge remote-tracking branch 'origin/develop' 2023-10-30 13:06:50 +00:00
snipe 740569791f
Merge pull request #13803 from spencerrlongg/feature/13789-feature-request-add-user-phone-and-address-to-custom-asset-report 
Added User Phone & Address Fields to Custom Asset Report
 2023-10-30 12:43:20 +00:00
gitgrimbo d556f0d275 Use parseEscapedMarkedownInline for more views 2023-10-27 15:37:56 +01:00
spencerrlongg 90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05:00
snipe b58dea07a7 Merge remote-tracking branch 'origin/develop' 2023-10-26 21:46:45 +01:00
snipe 10abecc5a6
Merge pull request #13802 from spencerrlongg/bug/13531-custom-asset-report-does-not-correct-report-eol-date 
Fixes EOL on Custom Report
 2023-10-26 21:43:13 +01:00
spencerrlongg f12d44509e asset_eol_date should always be filled now 2023-10-26 14:39:02 -05:00
spencerrlongg 91b53bffa1 resolved 2023-10-26 14:23:31 -05:00
snipe 98423e4dd9 Merge remote-tracking branch 'origin/develop' 2023-10-26 17:57:17 +01:00
snipe a2ba39c837 Removed required custom field from seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 17:57:05 +01:00
snipe 38f10e0b21 Merge remote-tracking branch 'origin/develop' 2023-10-26 16:00:22 +01:00
snipe aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets 
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
 2023-10-26 15:56:47 +01:00
snipe 7b2f49644e Use nothing instead of null to make it consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:44:17 +01:00
snipe 305cd9b0b8 Use null instead of blank 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:42:49 +01:00
snipe 9bba0b764a Added clearer comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:38:39 +01:00
snipe 1ce95b6eac Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:27 +01:00
snipe 9c90f03142 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:34:18 +01:00
snipe b4d3f51414
Merge pull request #13776 from Robert-Azelis/Robert-Azelis-EOL_fix_improvements 
[FIX and improvements] EOL rate and EOL date
 2023-10-26 13:36:25 +01:00
snipe 64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements 2023-10-26 13:36:18 +01:00
snipe 7b9259274c
Merge pull request #13799 from inietov/fixes/unlogged_checkin_from_importer 
Fixed #13795 Unlogged checkin action post updating the username of an asset through the CSV import
 2023-10-26 13:33:51 +01:00
snipe d40a03b4c5 Merge remote-tracking branch 'origin/develop' 2023-10-26 13:09:38 +01:00
snipe c1213e0abc Nicer handling for empty custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:41:44 +01:00
snipe 05de8a5731 Re-added missing break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:21:27 +01:00
snipe ff72c4fbaa Added nicer formatting for fields in log meta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 09:17:28 +01:00
snipe 9d887484c8 Added encrypted custom field to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 07:41:25 +01:00
snipe c4c47f2e8d Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:51:14 +01:00
snipe 0cebccac95 Removed extra logging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:51:07 +01:00
snipe c3b3aa4de6 Set one field to encrypted in the seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 06:25:51 +01:00
snipe 3717d60170 Added two more custom fields/fieldsets to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 05:04:30 +01:00
snipe 6c996ac8fa Changed the seeder order to accomodate actionlog factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 05:03:59 +01:00