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

9245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 36901d271b adds csvmatch for remote. Im a bit lost though lol 2022-12-05 16:28:19 -08:00
snipe b7a5467f8b
Merge pull request #12204 from akemidx/fixcurlyquotes 
Fixed: curly quotes in #12182
 2022-12-05 15:33:47 -08:00
akemi 2f8a435e18 fixing curly quotes 2022-12-05 18:06:28 -05:00
snipe 9ca40716ce
Merge pull request #12197 from inietov/fixes/custom_regex_defaults_to_any 
Fixed #11682  Custom field type of CUSTOM REGEX defaults back to ANY on editing
 2022-12-05 13:24:22 -08:00
snipe 7518cab7c8
Merge pull request #12194 from Godmartinz/FDD32094_Icon_color_change 
changes the life-ring icon color with themes
 2022-12-01 10:04:55 -08:00
Ivan Nieto Vivanco 8d36971c8b Properly select 'CUSTOM REGEX' from the select list if the format declares onee 2022-11-30 16:21:23 -06:00
Godfrey M 371a5bf4d6 changes the icon color with themes 2022-11-30 10:37:47 -08:00
snipe cfc4229308 Add @akemidx as a contributor 2022-11-29 13:15:28 -08:00
snipe 8bf01715a9
Merge pull request #12182 from akemidx/translate_inventory_notification 
Fixed #12119 - updated user inventory language to use strings
 2022-11-29 13:14:32 -08:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
Godfrey M 3206929ee4 adds AgeFormatter, not working yet 2022-11-29 09:51:42 -08:00
snipe 1fe0bfe17e Removed extra logging case that was very noisy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:27:42 -08:00
snipe 9c205f63ae Merge remote-tracking branch 'origin/develop' 2022-11-28 19:21:19 -08:00
snipe 0cc7389b85
Merge pull request #12187 from snipe/features/added_jobtitle_to_print 
Fixed #12133 - Added job title to header in print assets view
 2022-11-28 19:20:46 -08:00
snipe e21d0729c1 Add jobh title to header in print assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 19:19:42 -08:00
snipe c46dc99e86 Merge remote-tracking branch 'origin/develop' 2022-11-28 17:20:57 -08:00
snipe 64a8d1d207
Merge pull request #12185 from snipe/features/add_serial_to_inventory_email 
Added serial number to emailed inventory report
 2022-11-28 17:20:34 -08:00
snipe 8de59d117f Added serial number to emailed inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-28 17:14:38 -08:00
snipe d5e702ac74 Merge remote-tracking branch 'origin/develop' 2022-11-28 14:12:38 -08:00
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