DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8288 commits 97 branches 266 tags 291 MiB
Commit graph

3462 commits

Author SHA1 Message Date
snipe 2cace3c73a Added LDAP warnings on page load 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:08:12 -07:00
snipe 656efc5f92 Fixed missing trans() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:20:15 -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
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 e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -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 e28e7e37b8 Removed unneeded checks when searching for asset 2022-06-29 17:49:50 +10: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 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 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 3df9260ca8 Added additional filters for api indexes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 19:59:45 -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
snipe c90ed9f25f Allow models uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:50:07 -07:00
snipe d8d12d4590
Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync 
Add a new `--filter` option to Artisan ldap-sync command
 2022-06-28 09:50:48 -07:00
Brady Wetherington be3388d647 Add a new --filter option to Artisan ldap-sync command 2022-06-27 19:49:59 -07:00
snipe 94e723a88f
Merge pull request #11404 from snipe/features/fix_transliteration 
Fixed custom field transliteration
 2022-06-27 17:42:02 -07:00
snipe 14d8fb66aa
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value 
Only care about the custom field's converted name when updating the custom field itself
 2022-06-27 17:36:26 -07:00
snipe bf08e73f8f Removed comments and server side cookie info 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:36:09 -07:00
snipe 52bd7d0d68 Merge remote-tracking branch 'origin/develop' 2022-06-27 14:25:38 -07:00
snipe baad3b9d58 Only care about the converted name when updating the custom field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 14:17:07 -07:00
snipe 131edb611e Refine output and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 13:54:21 -07:00
snipe bee694e605 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 09:57:20 -07:00
snipe d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset 
Fixes #8155 -  improve the workflow during asset creation
 2022-06-24 18:53:07 -07:00
snipe 8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating 
Adds validation to custom fields' default values
 2022-06-24 18:11:16 -07:00
snipe d167d2a10f Disallow backup deletion and log attempt if not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:49:22 -07:00
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe 86d2c2b153 Small naming changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:11:59 -07:00
snipe f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users 
Added created_by to users
 2022-06-23 18:48:42 -07:00
snipe 0bc3ca5c42 Fixed comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:44:27 -07:00
snipe 9fd3541520 Missed on createdBy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:42:22 -07:00
snipe 3e559044b2 Changed method and scope names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:41:13 -07:00
snipe 1c25057e42
Merge pull request #11379 from Godmartinz/license_acceptance_eula 
adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf
 2022-06-23 18:26:19 -07:00
snipe 9c9f5be6fe Do not show the creating admin by default in list view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:28:34 -07:00
snipe d8daec2e0a Added created_by results to user index API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:19:30 -07:00