DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
9216 commits 95 branches 267 tags 295 MiB
Commit graph

9216 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
snipe 52dc5aa4ba Added field to controller and tranformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:26:59 +00:00
snipe 23cbee9493 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-11-03 14:18:55 -07:00
snipe 7c21158680 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:18:13 -07:00
snipe 30f4af3ac2 Merge remote-tracking branch 'origin/develop' 2022-11-03 14:14:23 -07:00
snipe b1fa50cde2
Merge pull request #12067 from snipe/fixes/modelfile_image_path 
Fixed model file image path/variable
 2022-11-03 14:13:54 -07:00
snipe 236684ec92 Fixed model file image path/variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:12:49 -07:00
snipe c45e777324 Merge remote-tracking branch 'origin/develop' 2022-11-03 14:10:08 -07:00
snipe 53499b1e29
Merge pull request #12066 from snipe/fixes/small_uploads_fixes 
Fixed - small uploads fixes
 2022-11-03 14:08:52 -07:00
snipe 04b6f023ae Use new upload string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:57:50 -07:00
snipe 3c7d63c060 Disallow uploads if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:52:23 -07:00
snipe 7cb1ca8754 Fixed image path to show preview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:51:48 -07:00
snipe 52e33a8b0e Merge remote-tracking branch 'origin/develop' 2022-11-03 13:27:21 -07:00
snipe 0f5fbb6a04 Re-added gitignore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:27:06 -07:00
snipe 6d5ace0458
Merge pull request #12049 from uberbrady/improve_scim_externalid_support 
Fixed writes to the `externalId` from SCIM
 2022-11-02 15:43:55 -07:00
snipe 6f14355cbc
Merge pull request #12060 from snipe/features/added_accessories_file_uploads 
Added accessories file uploads
 2022-11-01 19:51:38 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 2f9e097854
Merge pull request #12059 from snipe/fixes/consumables_files_translations 
Use the generic file uploads strings
 2022-11-01 19:32:35 -07:00
snipe 97aeb1fcec Use the generic file uploads strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:31:23 -07:00
snipe e6d259bac0
Merge pull request #12058 from snipe/features/added_uploads_to_components 
Added uploads to components
 2022-11-01 19:30:17 -07:00
snipe 8887d40b86 Added gitignore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:29:21 -07:00