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

1812 commits

Author SHA1 Message Date
Ivan Nieto Vivanco
e7470b5545 Remove e() function from the saved notes when updating an asset maintenance 2021-08-31 03:50:57 -05:00
snipe
085be16966 Merge remote-tracking branch 'origin/develop' 2021-08-25 14:45:41 -07:00
Ivan Nieto Vivanco
4a79c77630 Add a condition to checkin licenses assigned to Assets 2021-08-25 16:38:34 -05:00
snipe
4abb9baa95 Merge remote-tracking branch 'origin/develop' 2021-08-24 15:29:41 -07:00
Shanks
961e80404a
Update AssetsController.php 
Fix：When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
 2021-08-24 16:39:58 +08:00
snipe
70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs 
Add client side ldap certs
 2021-08-23 16:30:46 -07:00
snipe
9285697611 Merge remote-tracking branch 'origin/develop' 2021-08-20 17:30:52 -07:00
snipe
9687bcb41c Fixed issue where consumables model number was not searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-20 17:30:35 -07:00
snipe
24af2ab67a Merge remote-tracking branch 'origin/develop' 2021-08-18 14:31:53 -07:00
snipe
7b447a2f16 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-08-18 14:31:38 -07:00
Ivan Nieto Vivanco
f04e23cacb Add a small refactor so we not repeat logic 2021-08-18 15:22:53 -05:00
Ivan Nieto Vivanco
4207858a14 Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index 
Also edit the default color for assets with the Pending label, so it match the color in the docs
 2021-08-18 14:08:35 -05:00
snipe
b88fde5dae Nicer comment formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-18 12:07:09 -07:00
Brady Wetherington
4d4badf830 Got the client-side LDAP setup working well enough for sync! 2021-08-17 14:43:36 -07:00
Godfrey M
cef0e424e1 adds a Floor value for depreciation models 2021-08-16 18:14:10 -07:00
James Emanuel
98285001ac
Fixing Typo on creating Depreciation 2021-08-16 15:33:17 +03:00
snipe
ef687fdc7b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-14 14:07:04 -07:00
snipe
45caa8a90d Added restore functionalty to asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-08-14 14:06:15 -07:00
Godfrey M
01037cf9cb initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358] 2021-08-10 18:26:43 -07:00
NMC
4cfc4aec1d fix false search in api. 2021-08-01 15:10:22 -04:00
NMC
976957ddd4 Add Maintained filed in licenses view and api. + Expires in API 2021-08-01 14:30:16 -04:00
snipe
cdc4940338
Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset 
Fixes Integrity constraint violation when emailing password reset.
 2021-07-30 16:01:53 -07:00
Ivan Nieto Vivanco
27cdfbc579 Edit the log message 2021-07-29 16:14:52 -05:00
Ivan Nieto Vivanco
405545cd88 Add exception handling in the ForgotPasswordController 2021-07-29 16:02:45 -05:00
snipe
593e1234a5
Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api 
Fixed #9671: wrap OR queries in sub-condition in checkedout search
 2021-07-27 14:39:10 -07:00
Ivan Nieto Vivanco
38a2a0c1ee Add the pertinent filters in Accessories and Consumables controllers 2021-07-26 12:59:15 -05:00
snipe
5f842d02ef Fixed namespace 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-15 13:24:40 -07:00
Petri Asikainen
f753404197 missed this when rebasing 2021-07-15 12:26:14 +03:00
Petri Asikainen
5d999d2572 legacy image_source support for store 2021-07-15 12:26:14 +03:00
Petri Asikainen
2fc3ff671e hand legacy image_source field 2021-07-15 12:26:14 +03:00
Petri Asikainen
89cc84f1d9 convert image_source field 
This reverts commit b2d3ba7410.
 2021-07-15 12:26:14 +03:00
Petri Asikainen
f24138da44 Revert "Handle image_source with ConvertBase64ToFiles" 
This reverts commit 168d7f7004.
 2021-07-15 12:26:14 +03:00
Petri Asikainen
a76b36cad9 Handle image_source with ConvertBase64ToFiles 2021-07-15 12:26:14 +03:00
Petri Asikainen
23f77b2894 Fixed case again 2021-07-15 12:26:14 +03:00
Petri Asikainen
6173aaa25c fixed capitalization 2021-07-15 12:26:13 +03:00
Petri Asikainen
91af3f2661 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
4191dd39ea Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
2f3501bdc2 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
f1b8ce0a1b Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
6a21660c14 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
64c8767e81 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
0e7af80806 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
e95b15d553 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
bb269e0e5f Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
60f13c8d79 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
5081ca3512 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
b4380c8012 Support images and multipart requests 2021-07-15 12:26:13 +03:00
Petri Asikainen
f6766c5f23 Support images and multipart requests 2021-07-15 12:26:07 +03:00
Petri Asikainen
8bbbb06c5e testing image upload via api 2021-07-15 12:24:25 +03:00
Petri Asikainen
febf1ec20f Support legacy image_source property 2021-07-14 13:09:50 +03:00