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

13328 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 86677b5f13 Make last_checkin sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:25 +00:00
snipe 3f5b94f8ad Merge remote-tracking branch 'origin/develop' 2024-03-27 19:52:23 +00:00
snipe cf8cb8521b
Merge pull request #14515 from squintfox/fixes-results-not-limited-by-api-params 
Fixes #14289: /reports/activity API endpoint returns too many results due to orwhere
 2024-03-27 19:51:58 +00:00
Robert Spadaro ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04:00
snipe 57010b4c23
Merge pull request #14500 from Godmartinz/add-accessory-signature-to-print-all 
Added signature to user print report for Accessories and Consumables
 2024-03-27 19:02:59 +00:00
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00:00
snipe 1572e339f9
Merge pull request #14514 from snipe/localizations/new_translations_march_224 
Updated translations
 2024-03-27 19:01:23 +00:00
snipe 7782e5cc93 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 18:59:28 +00:00
Jeff Clay 1b8c7ff4ec
Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php and updated .env files to provide value for the new option. 2024-03-27 11:38:13 -05:00
snipe 3bb81d1e4d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2024-03-27 16:18:28 +00:00
snipe 756c44fcba
Merge pull request #14510 from snipe/snyk/Upgrade-alpinejs-from-3.13.5-to-3.13.6 
[Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6
 2024-03-27 16:14:53 +00:00
snipe befa4428d0
Merge pull request #14509 from snipe/feature/sc-25173/filter_assigned_user_assets_by_category_id 
Added ability to filter in user's assigned assets by category ID and model ID
 2024-03-27 16:13:51 +00:00
snipe 60c678680a [Snyk] Upgrade alpinejs from 3.13.5 to 3.13.6 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 16:12:57 +00:00
snipe 8bc9688d71 Added ability to filter on category ID and model ID from user’s asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 16:04:00 +00:00
Godfrey M aa8af2220c trying to remove an encrypted field but not all fields 2024-03-26 16:10:08 -07:00
akemidx b124b9af4d adding in change to settings table 2024-03-26 16:50:39 -04:00
snipe ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation 
Added validation around `pwd_secure_complexity`
 2024-03-26 20:05:04 +00:00
Marcus Moore b5b8777c94
Extract translation string 2024-03-26 12:23:57 -07:00
snipe 850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343 
Add new validator for custom field checkboxes and fix asset model default updates
 2024-03-26 19:22:29 +00:00
Godfrey M 84cc88831d adds signature for components 2024-03-26 12:18:10 -07:00
Godfrey M f4f9b165a7 moves signature check inside of td 2024-03-26 11:24:34 -07:00
Godfrey M 3222d4c8df adds signature check 2024-03-26 09:18:34 -07:00
Godfrey M 3173ead2e7 adds accessory signature to user print report 2024-03-26 09:11:54 -07:00
Godfrey M 040f826c52 removes encrypted fields as a selectable option for labels 2024-03-26 08:57:18 -07:00
snipe 89d733d442 Merge remote-tracking branch 'origin/develop' 2024-03-26 14:53:24 +00:00
snipe df49e8350f
Merge pull request #14498 from snipe/features/limit_report_by_admin 
Fixed #14495 - Allow user_id to be passed to limit to only specific admins
 2024-03-26 14:52:03 +00:00
snipe 3ced85080a Fixed #14495 - Allow user_id to be passed to limit to only specific admins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 14:45:20 +00:00
snipe 0611ab9b4c Merge remote-tracking branch 'origin/develop' 2024-03-26 12:29:39 +00:00
snipe f450cafe3e Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:29:25 +00:00
snipe 1f29eb1875
Merge pull request #14494 from snipe/features/add_supplier_address_to_licenses 
Added supplier details to license view
 2024-03-26 12:20:57 +00:00
snipe a4e5ae0938 Removed duplicates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:20:27 +00:00
snipe 77dacfcc30 Show if deleted supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:19:29 +00:00
snipe 0d9b6eaf71 Added supplier details to license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:18:04 +00:00
snipe 7060ffaf34 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-03-26 11:17:07 +00:00
snipe 02a37e2f89 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 10:16:46 +00:00
snipe 9c1b1bc2b5 Removed fre-order columns - it’s not currently used 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 10:15:46 +00:00
snipe b34156ca25 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-03-26 09:58:35 +00:00
snipe 61bdb57b5d
Merge pull request #14492 from snipe/feature/sc-25142/deeplink_search_urls 
Fixed #14483 - adds deeplinking to search/sort/pagination
 2024-03-26 09:55:50 +00:00
snipe 9df84e235c Check for config variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:54:40 +00:00
snipe 566ba4783e Fixed #14483 - adds deeplinking to search/sort/pagination 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:50:01 +00:00
snipe b41b4b1732 Merge remote-tracking branch 'origin/develop' 2024-03-26 08:48:44 +00:00
snipe ccf9457c45
Merge pull request #14491 from PP-JN-RL/patch-1 
Added Dymo Labelwriter 1933081
 2024-03-26 08:46:03 +00:00
snipe 53aabdab66 Merge remote-tracking branch 'origin/develop' 2024-03-26 08:33:40 +00:00
snipe 8ff85c952e Fixed labelwriter 2112283 namespace 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:33:30 +00:00
Phil J R afe1cb8234
Create LabelWriter_1933081.php 
Added a longer version of the existing label (25 x 54mm vs. 25 x 89mm) due to better availability and to support longer asset names.
 2024-03-26 08:29:47 +00:00
snipe bd42505799 Merge remote-tracking branch 'origin/develop' 2024-03-26 08:23:40 +00:00
snipe 6c735c97c6
Merge pull request #14490 from snipe/bug/sc-25141/bad_method_call_model_restore_from_view 
Fixed #14482 - bad method call model restore from view
 2024-03-26 08:21:27 +00:00
snipe 31a57cdf14 Fixed #14482 - bad method call on restore from view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:18:59 +00:00
snipe 7ebbef25e7 Standardize button styling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:18:36 +00:00
Phil J R f836342194
Rename Label_Writer_2112283.php to LabelWriter_2112283.php 
Fix the name of LabelWWriter_2112283 to be consistent with the existing one.
 2024-03-26 08:16:00 +00:00