DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6585 commits 101 branches 268 tags 288 MiB
Commit graph

1630 commits

Author SHA1 Message Date
Ivan Nieto Vivanco d917ae51b7 Remove e() function from other input fields 2021-08-31 04:01:20 -05:00
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
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
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 febf1ec20f Support legacy image_source property 2021-07-14 13:09:50 +03:00
Petri Asikainen 7b12668af4 Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads 2021-07-13 17:23:44 +03:00
snipe f785c3e759 Default to 1 if no qty is passed 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 16:04:52 -07:00
Petri Asikainen 41deabf998 hand legacy image_source field 2021-07-07 09:33:48 +03:00
Petri Asikainen 7a424649c8 convert image_source field 
This reverts commit b2d3ba7410.
 2021-07-07 09:24:24 +03:00
Petri Asikainen b2d3ba7410 Revert "Handle image_source with ConvertBase64ToFiles" 
This reverts commit 168d7f7004.
 2021-07-07 09:20:38 +03:00
Petri Asikainen 168d7f7004 Handle image_source with ConvertBase64ToFiles 2021-07-07 09:08:37 +03:00
Mark Brule f706c87cbc wrap OR queries in sub-condition 2021-07-06 20:43:17 +00:00
Petri Asikainen e275c9ee90 Fixed case again 2021-07-06 07:10:03 +03:00
Petri Asikainen 347e742e88 merged current upstream/develop 2021-06-30 12:02:05 +03:00
snipe 868419b35b Components checkin/checkout via API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-30 01:02:44 -07:00
Petri Asikainen 6048acc95d fixed capitalization 2021-06-30 06:36:12 +03:00
Petri Asikainen b0aa26e6cb Support images and multipart requests 2021-06-29 14:25:20 +03:00
Petri Asikainen b49733832c Support images and multipart requests 2021-06-29 12:29:17 +03:00
Petri Asikainen 8c0be3aa87 Support images and multipart requests 2021-06-29 12:29:07 +03:00
Petri Asikainen a936744e2e Support images and multipart requests 2021-06-29 12:28:52 +03:00
Petri Asikainen f9da83bc46 Support images and multipart requests 2021-06-29 12:28:42 +03:00
Petri Asikainen fc8498972e Support images and multipart requests 2021-06-29 12:28:32 +03:00
Petri Asikainen 4ba75291e4 Support images and multipart requests 2021-06-29 12:27:18 +03:00
Petri Asikainen a7b1e31776 Support images and multipart requests 2021-06-29 12:27:08 +03:00
Petri Asikainen 604a0b6df1 Support images and multipart requests 2021-06-29 12:26:59 +03:00
Petri Asikainen 4ed9788a0e Support images and multipart requests 2021-06-29 12:26:45 +03:00
Petri Asikainen e8a4059db9 Support images and multipart requests 2021-06-29 12:26:24 +03:00
Petri Asikainen aa402bf896 Support images and multipart requests 2021-06-29 12:26:15 +03:00
Petri Asikainen 8d4219759e Support images and multipart requests 2021-06-29 12:25:47 +03:00
snipe a4fd0c9c6d Fixed #9745 - added searchable, sortable notes field to status labels 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:52:57 -07:00
Petri Asikainen e0c5205e9b save images 2021-06-28 08:11:33 +03:00
Petri Asikainen 695bf1e15f save images 2021-06-28 07:58:08 +03:00
Petri Asikainen 0e2efb6573 Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads 2021-06-27 14:38:55 +03:00
snipe e44a25126d
Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification 
Fixes #9666 Asset checkin via api doesn't send notification.
 2021-06-23 14:35:07 -07:00
Petri Asikainen 491a788cd0 testing image upload via api 2021-06-23 11:22:41 +03:00
Travis Miller 4f6b1bb12d Fixed #9680: Use Eloquent’s withCount method to count Statuslabel assets 2021-06-09 11:52:04 -05:00
Ivan Nieto Vivanco bb227cafb2 Added event to trigger the notification. 2021-06-08 13:16:13 -05:00
Ivan Nieto Vivanco 9f944ad497 Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471]. 2021-05-27 15:48:13 -05:00
snipe 9f2b4c721d Allow password reset from user profile 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-26 15:32:23 -07:00
kcoyo cee6f0d579
Update LoginController.php 
Fixed #9607 - Sessions expire for SAML/RemoteUser/LDAP
 2021-05-25 16:37:34 -07:00
Marc Leuser 4030789786
fix LicenseSeatsController method documentation (#9584) 
in an attempt to get the automatic API reference generation to work
 2021-05-14 16:14:32 -07:00
Ivan Nieto Vivanco 36a43642d8
Changed the orderBy clause inside the custom reports function that forms the CSV to be 'id' so making it a unique value and don't causes repeated items. [ch14587] (#9535) 2021-05-04 23:50:02 -07:00
markbrule 6c1553167d
issue #9422 - pivot ID was being used as a user_id (#9512) 2021-05-04 22:27:01 -07:00
Tom Misilo a6bbe1fec3
Delete file from assets folder, not just the ref. (#9525) 2021-05-04 22:18:22 -07:00
snipe cee5eea121 Use 24-hour date format for audit 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-30 15:37:39 -07:00
snipe c6726015f7 Added missing use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-30 14:52:08 -07:00
snipe 315bcb6b38 Added use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-23 14:26:57 -07:00
Steven 82f73eb9e2
Added user locale to REST API GET /api/users response; (#9486) 
* Clearer reporting on import

Signed-off-by: snipe <snipe@snipe.net>

* Try adding  text/x-Algol68 to import

Signed-off-by: snipe <snipe@snipe.net>

* Added user locale to REST API GET /api/users response;

Co-authored-by: snipe <snipe@snipe.net>
 2021-04-23 12:09:00 -07:00
Brady Wetherington 72a813f23d
This fixes the controller signature error people are getting with LDAP logins (#9466) 2021-04-21 10:23:32 -07:00
aranar-pro 5127727730
Fixed #9424: import history adds asset model to assigned user and respects checkin date (#9350) 
* Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.

* Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.

* Fixed #9294: whitespace and comment cleanup for merge

* Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.
 2021-04-20 21:25:17 -07:00
snipe c17eaaad69 Check that the field is valid before checking to see count() 
This mostly affects the demo, since the seeder updates info often

Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:10:28 -07:00
snipe e286ff0be3 Added show() redirect for CustomFields::show() 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-20 15:09:23 -07:00
Brady Wetherington 2a28f5e66c
(Maybe?) Fixes the problem where we always need LDAP enabled (#9321) 
* I *think* this fixes the problem where we need LDAP even if we aren't using it?

* Pull the LdapAd dependency out of the AuthController constructor
 2021-04-20 14:53:47 -07:00
Ivan Nieto Vivanco 36bc47c61c
Handle regex format when assigned from API (#9443) 2021-04-20 14:44:47 -07:00
snipe e1c6d4ced7 Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Requests/SettingsSamlRequest.php
 2021-04-14 15:15:07 -07:00
Godfrey Martinez 246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings (#9416) 
* new branch, added manager as an additional field. Currently having DB issues

* WIP DB Issue with eloquent

* added department to LDAP sync

* removed unused variables
 2021-04-14 10:17:57 -07:00
Brady Wetherington 792a31cc7f Merge branch 'develop' 2021-04-06 20:10:22 -07:00
snipe e47e2e3754 Fixed #9404 - include note in accessory API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 10:57:30 -07:00
snipe 3ffa3534a0 Use environmental variables in memory limits 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-05 21:47:57 -07:00
snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/users/print.blade.php
 2021-04-05 20:55:49 -07:00
snipe df72f92bc0 Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-05 20:16:06 -07:00
AlexanderWPapyrus a1f9642a18
Increases DPI of barcode for small lables (#9344) 
solves issue #9293
 2021-04-05 19:33:10 -07:00
Godfrey Martinez 5ea759f615
Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318) 
* LDAP and Active Directory has plenty of other [ch15504]

* removed department id from ldap sync

* removed department id from ldap sync

* Update 2021_03_18_184102_adds_several_ldap_fields.php
 2021-04-05 19:26:04 -07:00
Marc Leuser 90b7d34c69
Added #6695: add API endpoint for license seats (#8058) 
* remove miselading comment line

* added dedicated API endpoint for license seats

* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway

* reduce amount of IFs

* add sanity checks to show()

* fix goofed logging logic

* add tests for action log entries
 2021-03-29 19:41:26 -07:00
NMC 3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. (#6891) 
* Add a way for a user to override the skin setting.

* Add site setting to allow user to change the skin.

* Fix skin list.

Co-authored-by: NMC <info@nmc-lab.com>
 2021-03-29 19:09:23 -07:00
Tom Misilo 7557879d4a
Add support for overriding the Time and Memory Limits (#8389) 
This is similar to what exists for the LDAP Import, and adds support for
setting th  Import and Report max execution time and memory limits

Co-authored-by: snipe <snipe@snipe.net>
 2021-03-24 11:40:43 -07:00
snipe 0b41f9182a Merge remote-tracking branch 'origin/develop' 2021-03-24 11:35:39 -07:00
snipe 86fef3f40a Set SAML errors to warning instead of error 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-17 22:30:26 -07:00
snipe c90604b5ae Merge remote-tracking branch 'origin/develop' 2021-03-17 22:19:24 -07:00
snipe 069e9e52fe Try/catch barcodes so they don’t shit up the logs 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-17 22:19:10 -07:00
snipe 9f3a8a43cc Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.lock
 2021-03-17 19:41:02 -07:00
snipe 8fd8e716ac
Changed debug level on bad LDAP connection (#9314) 
* Changed debug level on bad LDAP connection

TODO:

Unfuck all of this. It’s a mess and it really doesn’t work the way we think it does. AdLdap library strikes again. :(

Signed-off-by: snipe <snipe@snipe.net>

* Improved phrasing

Signed-off-by: snipe <snipe@snipe.net>
 2021-03-17 19:24:28 -07:00
snipe ab092fd209 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	app/Providers/AppServiceProvider.php
#	config/logging.php
#	config/services.php
 2021-03-15 12:29:29 -07:00
Brady Wetherington c7626f8387
Add new StorageHelper and use it where it makes sense (#9276) 2021-03-15 12:26:39 -07:00
snipe f164f0ea60 Fixed #9266 - set a colors_array variable even if other conditions are not met 2021-03-09 21:04:32 -08:00
Ivan Nieto Vivanco d64b35c348
Added a condition to ensure that only assets checked out to an user that is being deleted are updating their status (#9233) 2021-03-01 13:07:23 -08:00
Ivan Nieto Vivanco ab7dd90602
Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. (#9210) 2021-02-26 12:56:04 -08:00
snipe f37d5d3d03 Fixed #9085 - asset models not showing proper pagination 
Huge thanks to @inietov for catching this one
 2021-02-25 16:43:38 -08:00
johnson-yi 763e17f491
Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187) 2021-02-23 11:05:22 -08:00