DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10355 commits 96 branches 267 tags 296 MiB
Commit graph

10355 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 571ce5b741 corrects the color choice for the ldap_test_results 2022-09-19 11:59:02 -07:00
snipe 733b0750a2 Merge remote-tracking branch 'origin/develop' 2022-09-16 14:20:25 -07:00
snipe 9369165007
Merge pull request #11842 from snipe/security/license_file_access 
Check for `licenses.files` permissions
 2022-09-16 14:19:37 -07:00
snipe f75d348dc0 Fixed license policy method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:06:46 -07:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
snipe 0924d2144b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-09-15 21:47:14 -07:00
snipe 9cae4f1d1b
Merge pull request #11838 from snipe/features/larger_checkboxes_in_lists 
Larger checkbox in lists
 2022-09-15 21:44:42 -07:00
snipe ca70988879 Larger checkbox in lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 21:42:16 -07:00
snipe 421c9baecc # Conflicts: 
Signed-off-by: snipe <snipe@snipe.net>
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2022-09-15 20:11:07 -07:00
snipe 5c9e84f663 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 20:09:00 -07:00
snipe fbb5f1445a
Merge pull request #11837 from snipe/fixes/disappearing_checkboxes 
Downgraded BS Tables
 2022-09-15 20:06:42 -07:00
snipe 07e0fec1de Downgraded BS Tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 20:05:29 -07:00
snipe c6cbf3712e Merge remote-tracking branch 'origin/develop' 2022-09-15 16:22:47 -07:00
snipe 0f777b3168
Merge pull request #11836 from snipe/fixes/500_if_image_is_missing 
Fixed 500 error if uploaded file is missing from asset view
 2022-09-15 16:21:13 -07:00
snipe 62ad3fad1c Remove DL button if file doesn’t exist 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:11:27 -07:00
snipe eb1e287c15 Better handle missing files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:08:13 -07:00
snipe 3eab44f748
Merge pull request #11835 from snipe/fixes/depreciation_when_no_purchase_date 
Fixes 500 in depreciation on asset view when no purchase date
 2022-09-15 15:52:58 -07:00
snipe 1885e73704 Ignore warning icon if no purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:42:47 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:39:47 -07:00
Brady Wetherington 1899e4d1e8 try/catch wrap notifications on checkin/checkout 2022-09-15 13:18:42 -07:00
snipe 481eb2c7f0 Merge remote-tracking branch 'origin/develop' 2022-09-15 11:40:33 -07:00
snipe 51d7f2b97b
Merge pull request #11830 from inietov/fixes/default_values_for_checkboxes_unaccessible 
Fixed #9801 #11199 Default Values for Checkbox Field Types Unaccessible
 2022-09-15 11:28:15 -07:00
Ivan Nieto Vivanco 9b2eda2d70 Save and show the default values properly on custom fields of type checkbox 2022-09-15 11:52:49 -05:00
Ivan Nieto Vivanco 41b75704e3 Removes format when changing to custom fields elements that doesn't need it 2022-09-15 11:21:02 -05:00
Ivan Nieto Vivanco 20220764bb Add possible values for custom fields of type checkbox 2022-09-15 11:18:54 -05:00
snipe abd2349604 Add @rnelsonee as a contributor 2022-09-14 20:08:39 -07:00
snipe ac4f91918e
Merge pull request #11771 from rnelsonee/PAT_test 
Fixed #11769: PAT Test hardcoded text
 2022-09-14 20:01:18 -07:00
snipe 28f0b72bcd Merge remote-tracking branch 'origin/develop' 2022-09-14 19:56:16 -07:00
snipe ad7bc6f38a
Merge pull request #11825 from snipe/features/added_applecare_lookup_link 
Added Applecare lookup link if manufacturer is apple
 2022-09-14 19:54:47 -07:00
snipe 72feaee6c0 Added Applecare lookup link if manufacturer is apple 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 19:43:48 -07:00
snipe 4ac3650d64 Merge remote-tracking branch 'origin/develop' 2022-09-14 18:21:40 -07:00
snipe 3877770160
Merge pull request #11824 from snipe/fixes/removed_assetlog_from_custom_report 
Fixed custom asset report timeout - removed assetlog
 2022-09-14 18:20:14 -07:00
snipe 3192a68b06 Pulled assetlog from custom report controller 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 18:17:52 -07:00
snipe 284b4d869f
Merge pull request #11823 from Godmartinz/gh11822_depreciation_calc_off 
Fixes depreciation calculations off
 2022-09-14 17:39:59 -07:00
Godfrey M 6b6a079440 fixes current value and monthly depreciation on reports and calculations 2022-09-14 17:01:18 -07:00
Godfrey M a0624fe179 reworks the depreciation formula, includes months passed instead of months remaining 2022-09-14 16:00:21 -07:00
snipe d598f75721
Merge pull request #11811 from inietov/fixes/min_qty_not_importing_consumables 
Fixed Mini quantity field values are not importing into Snipe-IT
 2022-09-14 12:12:52 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco d51eca20f0 Add min_amt field in Consumables and Accessories imports 2022-09-12 18:11:48 -05:00
snipe 9b5790b7e6
Merge pull request #11072 from snipe/fixes/support_apache_24 
YOLO
 2022-09-12 14:26:43 -07:00
Godfrey M 28bc97f29f one line away from this being over with 2022-09-12 11:40:16 -07:00
snipe a8a00f0a79 Updated prod JS assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 11:08:29 -07:00
snipe cbd16174d8
Merge pull request #11810 from snipe/maintenance/updated_dev_assets 
Updated compiled assets
 2022-09-12 10:55:40 -07:00
snipe 448aefac28 Updated compiled assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 10:54:54 -07:00
snipe b23cd6d4f0
Merge pull request #11808 from snipe/snyk-upgrade-390057161cf95c21d9a4b53f57207321 
[Snyk] Upgrade bootstrap-table from 1.20.2 to 1.21.0
 2022-09-11 16:56:22 -07:00
snyk-bot b0ea1a31dc
fix: upgrade bootstrap-table from 1.20.2 to 1.21.0 
Snyk has created this PR to upgrade bootstrap-table from 1.20.2 to 1.21.0.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2022-09-11 23:55:26 +00:00
snipe 11a2f96b4f
Merge pull request #11806 from snipe/snyk-upgrade-390057161cf95c21d9a4b53f57207321 
[Snyk] Upgrade bootstrap-table from 1.20.2 to 1.21.0
 2022-09-11 01:30:34 -07:00
snyk-bot 7361977cdc
fix: upgrade bootstrap-table from 1.20.2 to 1.21.0 
Snyk has created this PR to upgrade bootstrap-table from 1.20.2 to 1.21.0.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2022-09-10 23:32:02 +00:00
snipe 659703bd7d
Merge pull request #11790 from inietov/fixes/double_login_issue_when_switching_users 
Fixed Double login when switching users
 2022-09-06 17:03:21 -07:00
Ivan Nieto Vivanco 3aff97ace1 Remove the previous user hashed password 2022-09-06 18:43:35 -05:00