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

729 commits

Author SHA1 Message Date
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
Tobias Regnery
9e1d7ffb5d Fix scope of departments for FullMultipleCompanySupport 
If a user tries to view or edit a department from a different company
with FullMultipleCompanySupport enabled, there is a 403 error displayed.
Apply the correct company scope in order to only display the departments
from the own company in the departments view.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2021-07-06 09:45:46 +02: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
a016f4ecd0 Applies PR #9761 to integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:11:22 -07: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
Laravel Shift
802dc9240d Shift bindings 
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
 2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00: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
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
markbrule
6c1553167d
issue #9422 - pivot ID was being used as a user_id (#9512) 2021-05-04 22:27:01 -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
Ivan Nieto Vivanco
36bc47c61c
Handle regex format when assigned from API (#9443) 2021-04-20 14:44:47 -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
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
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
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
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
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
Brady Wetherington
462f8c791f
Hotfix to develop to yank extraneous e() (#9080) 2021-02-02 16:44:54 -08:00