DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9176 commits 101 branches 268 tags 320 MiB
Commit graph

9176 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6113afe36e
Merge pull request #12125 from inietov/fixes/email_issues 
Fixed #11699 and #12065 Email issues
 2022-11-28 14:09:42 -08:00
snipe 305df42f92
Merge pull request #12167 from inietov/features/no_submit_until_status_selected 
Fixed #11980 Submit button deactivated in Users' Bulk Checkin if no status selected
 2022-11-28 13:17:33 -08:00
snipe 9aa0356de7
Merge pull request #12159 from uberbrady/upgrade_scim_server_to_upstream 
Pulled in latest upstream changes for improved standards-compliance
 2022-11-28 13:15:27 -08:00
snipe d2dcb29dcb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/models/custom_fields_form.blade.php
 2022-11-28 12:27:36 -08:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M 8d861cfd82 adds age to the asset table 2022-11-28 10:59:18 -08:00
Godfrey M 078e7281cd adds asset age to asset view 2022-11-28 10:45:58 -08:00
snipe 3ef578eb56
Merge pull request #12164 from Robert-Azelis/patch-7 
Fix categories view columns matching
 2022-11-23 18:47:02 -08:00
snipe 11a1ab971c
Merge pull request #12166 from inietov/fixes/custom_fields_values_develop 
Fixed #12046 #12137 Custom field checkboxes not holding value for develop
 2022-11-23 18:44:23 -08:00
snipe d226cf189b
Merge pull request #12168 from inietov/fixes/error_accepting_assets 
Fixed #12161 500 error when accepting assets
 2022-11-23 18:41:42 -08:00
Ivan Nieto Vivanco c082d8b90e Return empty string if no MAIL_REPLYTO_ADDR var set 2022-11-23 18:22:31 -06:00
Ivan Nieto Vivanco b1985a08c4 Checks the status before activate the submit button on users bulk-checkin 2022-11-23 17:45:59 -06:00
Ivan Nieto Vivanco 9bafe795b0 Corrected the view when editing custom fields values 2022-11-23 16:34:29 -06:00
snipe bb4c084435
Merge pull request #12165 from inietov/fixes/custom_fields_values 
Fixed #12046 #12137 Custom field checkboxes not holding value
 2022-11-23 15:09:58 -05:00
Ivan Nieto Vivanco feeb1c7ac8 Corrected the view when editing custom fields values 2022-11-23 12:21:07 -06:00
Robert-Azelis c2cfd8ff53
Update CategoryPresenter.php 2022-11-23 19:00:08 +01:00
Robert-Azelis 20ad4fb681
Update CategoryPresenter.php 
Fix snipe#12153
 2022-11-23 18:42:38 +01:00
Brady Wetherington 06a1fe5b38 Pulled in latest upstream changes for improved standards-compliance 2022-11-22 12:52:11 -08:00
snipe b6f87633f5 Merge remote-tracking branch 'origin/develop' 2022-11-22 12:36:00 -08:00
snipe e426846c23
Merge pull request #12157 from snipe/fixes/inherit_bgcolor_for_readonly 
Fixed background color for readonly date picker fields
 2022-11-22 16:57:34 +00:00
snipe 27898e660c Inherit the background color, since the field isn’t actually technically readonly 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-22 08:54:48 -08:00
Aaron 2c7364bdfe Fixed #11225: run_as_app_user unknown operand 
Fixed #10581: installer does not work on CentOS7
Fixed #10105: php not found, composer failed
Fixed #9035: CentOS 7 IUS repos missing
 2022-11-22 11:47:58 -05:00
snipe 0d9d02c6d6
Merge pull request #12148 from whalehub/develop 
Fix restore icon in table view
 2022-11-19 10:25:48 +00:00
Aaron 7c854c0a5c
Fix restore icon in table view 
Signed-off-by: Aaron <admin@datahoarder.dev>
 2022-11-19 10:45:10 +01:00
snipe efc892cf5e Merge remote-tracking branch 'origin/develop' 2022-11-17 21:29:14 +00:00
snipe ba4c37a7f4
Merge pull request #12139 from snipe/fixes/custom_fields_api_patches 
Fixed #9949 - PATCH to custom fields failing on validation (alt approach to #12011)
 2022-11-17 21:28:39 +00:00
snipe f0c5560c1b
Merge pull request #12141 from Godmartinz/adds_serial_number_to_history 
Added `serial` column to the user history page
 2022-11-17 21:15:26 +00:00
snipe 774962c122 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-17 21:14:35 +00:00
Godfrey M 0a9fd0b867 adds serial to activity report page 2022-11-17 13:09:06 -08:00
Godfrey M 5c94ca1403 removes dead space 2022-11-17 13:06:07 -08:00
Godfrey M 86bc409d3a adds serial column to the action logs 2022-11-17 12:57:53 -08:00
snipe 24841a75d4 Move common things into the model level validation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-17 19:41:10 +00:00
Godfrey M a02a04d601 fixes a regression with the csv assigned to fields 2022-11-16 16:34:57 -08:00
snipe 3997085faf
Merge pull request #12122 from Godmartinz/fixes_checkout_to_all_description 
fixes checkout to all description
 2022-11-16 21:56:53 +00:00
snipe 3ac92e1425
Merge pull request #12127 from deloz/fix-Asset-checked-in-Email-Asset-Picture-Not-Displaying 
Fixed #12095 - email logo still linking even if settings deny it
 2022-11-16 21:55:59 +00:00
snipe 5661e69520 Merge remote-tracking branch 'origin/develop' 2022-11-16 17:49:14 +00:00
snipe cdcd19a7d8
Merge pull request #12132 from snipe/fixes/view_assets_page_error_when_no_custom_fields 
Handle use case where there are no custom fields for any assigned models
 2022-11-16 17:48:53 +00:00
snipe 489895a5fa Added comments and spacing for readability 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:48:28 +00:00
snipe 1122562b4e Handle use case where there are no custom fields for any assigned models 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 17:45:50 +00:00
snipe 65e46c914c Merge remote-tracking branch 'origin/develop' 2022-11-16 15:57:46 +00:00
snipe 4ffe13d3c2
Merge pull request #12131 from snipe/fixes/check_for_format_index_in_custom_field_api_call 
Fixed 500 if `format` is not passed to the create custom field endpoint payload
 2022-11-16 15:57:07 +00:00
snipe 5df76155ce Check for the format index in the $data array when creating a new custom field via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-16 15:53:16 +00:00
snipe e1c33d4eff
Merge pull request #12129 from deloz/fix-remove-duplicate-column-checkin_email 
Fixed #12109 - Duplicate column on Category listing
 2022-11-16 11:41:55 +00:00
Instead of looking elsewhere, it is better to come here together 2fc7a15372
Fixed: #12109 2022-11-16 18:22:11 +08:00
Instead of looking elsewhere, it is better to come here together 9056d48775
Fixed: 12095 2022-11-16 18:16:45 +08:00
Godfrey M 9fefdea9de fixes checkout to all description 2022-11-15 12:50:46 -08:00
snipe 2239c6f7e2 Merge remote-tracking branch 'origin/develop' 2022-11-15 17:58:19 +00:00
snipe da0efaa278 Add @fernando-almeida as a contributor 2022-11-15 17:56:19 +00:00
snipe 69bde0443e Add @lukasfehling as a contributor 2022-11-15 17:56:01 +00:00
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