DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-24 17:57:36 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
8396 commits 90 branches 265 tags 292 MiB
Commit graph

8396 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 7ebf125dae Merge remote-tracking branch 'origin/develop' 2022-06-30 15:44:51 -07:00
snipe 9a361d573f
Merge pull request #11435 from snipe/features/ldap_warnings 
Added warnings for common LDAP misconfigs
 2022-06-30 15:44:33 -07:00
snipe 1a423a252b Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:22:58 -07:00
snipe 7591f3f092 Added auth filter check regex 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:15:49 -07:00
snipe 2cace3c73a Added LDAP warnings on page load 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:08:12 -07:00
snipe 97afafdd48 Merge remote-tracking branch 'origin/develop' 2022-06-30 14:20:34 -07:00
snipe 656efc5f92 Fixed missing trans() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:20:15 -07:00
snipe 46d055cf74 Fixed weird extra padding on crown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:17:53 -07:00
snipe 423e7439ee Merge remote-tracking branch 'origin/develop' 2022-06-30 14:09:19 -07:00
snipe 2262ef818e
Merge pull request #11427 from Godmartinz/email_users_list 
[feature] adds button to email user list of assets from profile
 2022-06-29 15:25:18 -07:00
snipe 02459aad26
Merge pull request #11430 from uberbrady/scim_more_tolerant 
Make SCIM be more tolerant of missing fields
 2022-06-29 15:24:25 -07:00
Brady Wetherington 2451bb9a2b Make SCIM be more tolerant of missing fields 2022-06-29 14:48:59 -07:00
Godfrey M cd9d2d0cec adds docblock 2022-06-29 13:01:29 -07:00
Godfrey M fc636ea888 removed redundant header 2022-06-29 12:01:56 -07:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe 180f36d145 Merge remote-tracking branch 'origin/develop' 2022-06-29 05:04:21 -07:00
snipe f8fd87b896 Add @ntbutler-nbcs as a contributor 2022-06-29 05:04:07 -07:00
snipe 130c8ea1b0 Add @ntbutler-nbcs as a contributor 2022-06-29 05:03:22 -07:00
snipe 5af6330398
Merge pull request #11417 from ntbutler-nbcs/master 
[Feature] - Add checkoutByTag API endpoint for assets
 2022-06-29 05:03:01 -07:00
snipe daaf8713d8 Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop 2022-06-29 04:58:26 -07:00
snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php
 2022-06-29 04:58:13 -07:00
snipe b04cf20735
Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop 
Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]
 2022-06-29 04:34:51 -07:00
Nathan Butler 6531657ee0 Revert version to dev for pull request 2022-06-29 18:00:15 +10:00
Nathan Butler e28e7e37b8 Removed unneeded checks when searching for asset 2022-06-29 17:49:50 +10:00
snipe 467f59e193 Merge remote-tracking branch 'origin/develop' 2022-06-29 00:25:00 -07:00
snipe be9e6fe847 Another typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:33 -07:00
snipe b0e13611f7 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:08 -07:00
snipe f3887aef33 Merge remote-tracking branch 'origin/develop' 2022-06-29 00:10:38 -07:00
snipe 7b3f891edd
Merge pull request #11418 from snipe/features/api_backup_download 
Download backup via API
 2022-06-29 00:07:09 -07:00
snipe b590f29f33 Attempt a download via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:59:13 -07:00
snipe 1debdc47cf Backups endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:30:17 -07:00
snipe bb7662a214
Merge pull request #11416 from snipe/features/personal_access_endpoint 
Added personal access endpoint to API
 2022-06-28 23:27:21 -07:00
snipe 53bc15900b Formatted show api 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:23:55 -07:00
snipe 90fe7af863 Small refactor 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:18:16 -07:00
snipe 67ad24af08 Return token ID in cli 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:13:25 -07:00
Nathan Butler 67e9b7795a Added asset checkoutByTag API endpoint 2022-06-29 16:11:57 +10:00
snipe 52332bc9ed Include token ID in payload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:10:56 -07:00
snipe dc27d3bec9 Change to plural endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:10:40 -07:00
snipe a711e608c9 Changed siganture to be clearer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:26:37 -07:00
snipe 2f7c04362e Make -kkey-only a flag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:20:55 -07:00
snipe 9b6fd7e19a Set $accessTokenName 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:11:46 -07:00
snipe 9680b02bce Check that the user has permission to create their own API keys 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:09:18 -07:00
snipe e7de7d1716 Show user info as well 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:06:46 -07:00
snipe 112f147596 Console script to generate API tokens 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:04:39 -07:00
snipe 413487de80 Made method naming consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 21:32:12 -07:00
snipe 1158fa9ea8 Added personal access tokens to api 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 21:29:15 -07:00
snipe a8e8112b34
Merge pull request #11415 from snipe/features/more_api_filters 
Added additional filters for api indexes
 2022-06-28 20:04:01 -07:00
snipe 3df9260ca8 Added additional filters for api indexes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 19:59:45 -07:00
snipe 14ba3af086
Merge pull request #11414 from snipe/features/additional_search_fields_for_locations 
Added additional search filters for location API
 2022-06-28 19:08:08 -07:00
snipe 71c8050883 Added additional search filters for location API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 19:07:11 -07:00