DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 12:04:21 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
11666 commits 97 branches 267 tags 296 MiB
Commit graph

11666 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6400bdc266
Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag 
Added ability to include deleted items in tag search endpoint
 2022-11-15 17:54:34 +00:00
snipe ffd252a00c
Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification 
Added: API endpoint to trigger a user email notification with their assigned assets
 2022-11-15 17:51:15 +00:00
snipe 7fcf6f2463 Removed deleted parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:47:21 +00:00
snipe 5103f28598
Merge pull request #12121 from snipe/fixes/safer_file_existance_checking_for_model_files 
Replace error suppression with better logic
 2022-11-15 17:43:39 +00:00
snipe 60d7128a5e Replace error suppression with better logic 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:41:57 +00:00
snipe 2c5a0d370c Clean up API byserial and bytag, allow deleted param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:33:56 +00:00
snipe bcbe517446 Added ability to include deleted items in tag search endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:18:09 +00:00
lukasfehling d9a9bd1c0d Added a api endpoint for sending email notifications to users with their assigned assets 2022-11-15 18:17:51 +01:00
snipe 2166fcec41
Merge pull request #12118 from snipe/features/adds_asset_tag_and_serial_to_api 
Allow searching firectly for asset tag and serial
 2022-11-15 17:16:17 +00:00
snipe 9a5d431962 Allow searching firectly for asset tag and serial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:13:26 +00:00
snipe 6dc0846f38
Merge pull request #12117 from snipe/fixes/pr_12106_missing_slash_for_stdClass 
Fixes PR #12106 missing slash for std class
 2022-11-15 17:04:58 +00:00
snipe 50431c046f Fixed missing slash in stdClass 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:04:06 +00:00
Ivan Nieto Vivanco f0ecab7bb1 Fix typo in variable (ah-hyuck!) 2022-11-15 11:00:40 -06:00
Ivan Nieto Vivanco 7cc8b39863 Checks if settings let URL's be shown in email notifications 2022-11-15 10:55:54 -06:00
snipe ae259f36ae
Merge pull request #12106 from fernando-almeida/develop 
Fix HTTP AssetTransformer to generate an empty object for missing custom fields
 2022-11-15 15:54:43 +00:00
Ivan Nieto Vivanco cd2997b674 Determine if email_logo or logo setting needs to be used in the Forgot Password email 2022-11-15 08:08:26 -06:00
snipe b4ff07ce9e Merge remote-tracking branch 'origin/develop' 2022-11-14 22:53:39 +00:00
snipe 8122236944
Merge pull request #12096 from snipe/features/add_custom_field_option_to_view_assets 
Added custom field option to view assets
 2022-11-14 22:45:26 +00:00
snipe 56c4fa7c27 Override display settings if field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:41:31 +00:00
snipe 602c2698d2 Fixed broken table header tag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:06:23 +00:00
snipe ff0b68724f
Merge pull request #12107 from snipe/fixes/500_on_missing_model_file 
Fixed 500 error if model files are missing
 2022-11-14 22:04:31 +00:00
snipe d4ac7530b6 Removed download button for files that don’t exist on the server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:04:06 +00:00
snipe 4aded5e117 FIxed 500 error if model files are missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:01:33 +00:00
snipe 8d03ce5e2c Merge remote-tracking branch 'origin/develop' 2022-11-14 17:45:01 +00:00
snipe 15da39d44a
Merge pull request #12105 from snipe/fixes/500_on_missing_license_files 
Fixed 500 on missing license files
 2022-11-14 17:44:16 +00:00
snipe 077d343f01 Prevent 500 if license file is missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 17:42:40 +00:00
Fernando Almeida 47ee2a8153 Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array. 2022-11-14 16:31:08 +00:00
Cram42 17e81af4cd Add more Avery label sheets 2022-11-12 20:29:50 +08:00
Cram42 ffce6ec327 Need uppercase 2022-11-12 20:29:34 +08:00
Cram42 60ef5686ab Add "Pop Out" button for preview 2022-11-12 19:02:38 +08:00
Cram42 af0872dc23 Fix form refresh after bootstrap-table 2022-11-11 14:23:38 +08:00
Cram42 30a7a31724 Move label preview to alpine component 2022-11-11 14:23:02 +08:00
Cram42 67d021e457 Add alpinejs to deferred scripts 2022-11-11 11:25:41 +08:00
snipe ae95ee49f1 Hide the option if the field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:56:50 +00:00
snipe 2ac558494d Set column width instead of letting BS tables guess 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:21:07 +00:00
snipe ede16ad2c2 Removed unused block 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:35 +00:00
snipe 1e34398c99 Permissions check on the field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:12 +00:00
snipe 7a5fcfb87a Loop through fields array 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:59 +00:00
snipe 1fa624420e Removed unneeded relationships 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:49 +00:00
Cram42 7108156072 Fix button disabling 2022-11-10 19:24:02 +08:00
Cram42 a4b93d4bbd Create Field Definitions helper control 2022-11-10 19:20:18 +08:00
Cram42 f849fcca89 Change the way fields are passed 2022-11-10 18:54:02 +08:00
Godfrey M 92ae271292 adds validation for department names at Company locations 2022-11-09 13:11:33 -08:00
snipe 6a9131e771
Merge pull request #12088 from uberbrady/minimal_scim_upgrade 
Added new SCIM env vars; and upgraded SCIM library
 2022-11-09 19:30:50 +00:00
Brady Wetherington 383bd6bb45 Add new SCIM env vars; upgrade SCIM library 2022-11-09 19:08:15 +00:00
snipe 097821b818 Slight revamping of column layouts and also added new general.display_in_user_view column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:28:19 +00:00
snipe 2e56c9b521 Added new general.display_in_user_view field to form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:59 +00:00
snipe b95d24b5eb Additional translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:44 +00:00
snipe f91e1d58ad Migration to add the field to the custom_fields table 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:34 +00:00
snipe 7c37c70164 Added new field to allowed_fields so that the API can change them if needed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:22 +00:00