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

11909 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
4d65d09306 Removed trim on manager ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-02 14:50:40 +00:00
snipe
c5e1cdbcee
Merge pull request #13828 from Godmartinz/ldap_location_sync 
fixed ldap location sync
 2023-11-02 12:20:01 +00:00
spencerrlongg
75532d9662 adds permission test 2023-11-01 16:49:59 -05:00
Godfrey M
13d3f85c62 fixes ldap location sync 2023-11-01 12:26:58 -07:00
spencerrlongg
938ec75aa7 clarifying note 2023-11-01 14:09:03 -05:00
spencerrlongg
c9604b896a nevermind 2023-11-01 13:46:32 -05:00
spencerrlongg
d167ec6dc0 unique undeleted recreated with laravel rule 2023-11-01 13:36:35 -05:00
spencerrlongg
e05af5216e formatting 2023-11-01 12:14:46 -05:00
spencerrlongg
3f834cb88f authorization tested in request 2023-11-01 11:43:53 -05:00
spencerrlongg
d971172cf3 rm unnecessary import 2023-11-01 11:34:15 -05:00
spencerrlongg
53bd5626c9 this works, need to write up pr 2023-11-01 11:33:29 -05:00
spencerrlongg
8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
spencerrlongg
b67b00dd82 this is a start, something up with asset_tag unique rule 2023-10-31 21:06:44 -05:00
spencerrlongg
d4b9f6a2a4 add not_array (not ready, doesn't catch for specific exception) 2023-10-31 21:00:22 -05:00
snipe
5073c3389f
Merge pull request #13821 from snipe/bug/rb-17462 
More graceful failure if ldap_results JSON decode isn’t set
 2023-10-31 17:11:14 +00:00
snipe
f822f8b186 More graceful failure if ldap_results JSON decode isn’t set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 17:09:18 +00:00
snipe
e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900 
Fixed datetime displayed on license edit for fields that should be date
 2023-10-31 16:59:12 +00:00
snipe
95e9002cd0
Merge pull request #13820 from inietov/fixes/attempt_to_read_property_fields 
Fixed Attempt to read property fields on null [sc-23903]
 2023-10-31 16:30:07 +00:00
snipe
22996895d8 Check for valid model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 16:04:19 +00:00
Ivan Nieto Vivanco
9f9f8c173b Add condition to only run trough custom fields if a custom fieldset exist 2023-10-31 10:00:36 -06:00
snipe
e6810e8db9
Merge pull request #13819 from snipe/bug/check_for_valid_category_on_print 
Check that the category exists on user print page
 2023-10-31 15:59:54 +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
9a7e7bddcc
Merge pull request #13818 from snipe/bug/sc-23902 
Fixed validation handling on backup uploads
 2023-10-31 15:33:26 +00:00
snipe
aa2a25dc19 Display the form errors correctly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:49 +00:00
snipe
57372fc82a Correctly call the validator in the response if it fails 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 15:30:38 +00:00
snipe
ae90f9defa
Merge pull request #13817 from snipe/feature/sc-23901 
Added checkboxes to intentionally remove field values in bulk user edit
 2023-10-31 12:54:07 +00:00
snipe
3495652827 Added checkboxes to intentionally remove field values in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:52:53 +00:00
snipe
5779a63221 Undoing that thing I just did :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:28:57 +00:00
snipe
209627e2cc Force format if dates are given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 12:25:00 +00:00
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
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
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
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
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
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
spencerrlongg
90eb3b86cf added user phone & address fields 2023-10-26 19:10:53 -05: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