DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12782 commits 101 branches 268 tags 288 MiB
Commit graph

12782 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 00cea3eb3c Merge remote-tracking branch 'origin/develop' 2024-02-15 14:45:30 +00:00
snipe 19b52a2f24
Merge pull request #14279 from snipe/fixes/clearer_ui_for_fieldsets 
Improved UI for fieldsets
 2024-02-15 14:19:34 +00:00
snipe 6237f6192c Added fieldset button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:14:18 +00:00
snipe cc58d4c3ad Nicer form UI 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:08:06 +00:00
Brady Wetherington 6a78706a3e New 'sanitize' version of backup-restore tool. Optional. 2024-02-15 13:27:18 +00:00
snipe 060c59bf9d Merge remote-tracking branch 'origin/develop' 2024-02-15 12:30:22 +00:00
snipe 6fd3c494be
Merge pull request #14277 from snipe/fixes/change_log_level_to_info 
Lower log level to warning on webhook failure
 2024-02-15 12:28:57 +00:00
snipe 8adfa8dd83 Change exceptions to warnings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 12:28:12 +00:00
snipe 6c9001df09 Changed log level in checkoutable listener to info 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 12:20:14 +00:00
snipe d6159d8cb5 Merge remote-tracking branch 'origin/develop' 2024-02-15 09:59:23 +00:00
snipe 81b9753b79 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-02-15 09:58:09 +00:00
snipe d8b1eec91b
Merge pull request #14197 from inietov/fixes/component_licenses_checkouts_not_displayed_in_asset_history 
Fixes #14010 Adds Components and Licenses logs to Assets history view
 2024-02-15 09:57:46 +00:00
snipe b871813cfd
Merge pull request #14172 from spencerrlongg/bug/sc-23514 
Resolve Duplicate Activity Logs for Imports
 2024-02-15 09:54:43 +00:00
snipe 6f7dce53cc
Merge pull request #14276 from snipe/bug/sc-24828 
Fixed ambiguous query on supplier_id in maintenances
 2024-02-15 09:52:23 +00:00
snipe 13d2af2155 Fixed ambiguous query on supplier_id in maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 09:51:14 +00:00
snipe bf3794822c Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 09:47:45 +00:00
snipe 1fa8fba5fe
Merge pull request #14268 from Godmartinz/checked-out-notif-fix 
Fixed the notification listener
 2024-02-15 08:29:15 +00:00
snipe 3d7697da6f
Merge pull request #14275 from snipe/snyk/14270 
Upgrade webpack from 5.89.0 to 5.90.0
 2024-02-15 08:28:26 +00:00
snipe 42cf17d3bf Upgrade webpack from 5.89.0 to 5.90.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 08:27:52 +00:00
snipe 783e37f06d
Merge pull request #14274 from snipe/snyk/14269 
Upgrade alpinejs from 3.13.3 to 3.13.5
 2024-02-15 08:21:58 +00:00
snipe 9a4cda0bf6 Upgrade alpinejs from 3.13.3 to 3.13.5 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 08:21:19 +00:00
snipe b6279af1d8
Merge pull request #14272 from marcusmoore/testing/update-state-helper-name 
Updated testing helper name
 2024-02-15 08:19:40 +00:00
Marcus Moore bc0a7542ac
Change enableWebhook to enableSlackWebhook 2024-02-14 18:17:34 -08:00
akemidx 232fad0145 query and progress notes 2024-02-14 20:00:23 -05:00
Godfrey M 5cbcac28b1 adds custom fields as an example in label settings 2024-02-14 16:53:38 -08:00
Godfrey M b136e9e29d fix the listener to fire when checking in 2024-02-14 09:16:20 -08:00
snipe 50c910461a Merge remote-tracking branch 'origin/develop' 2024-02-14 11:36:28 +00:00
snipe 88a84e9350
Merge pull request #14264 from snipe/feature/sc-24816 
Added serial and status label to asset maintenances page and API
 2024-02-14 10:37:01 +00:00
snipe 43bb8ae0a8 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:44 +00:00
snipe 638071dadd Check the asset is not deleted when creating the permissions array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:38 +00:00
snipe 8a4c90ade8 Check that the asset is not deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:25 +00:00
snipe 1dfa1da0ee Disable the edit button if permission is not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:10 +00:00
snipe 71ebade641 Added serial and status to searchable relations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:59:10 +00:00
snipe b86b05c4fc Added serial and status fields to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:55 +00:00
snipe 35a70988cb Added sorting by status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:39 +00:00
snipe 56ba26eb45 Disallow editing of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:07 +00:00
snipe adb8be9345 Added bootstrap formatting to show deleted assets more clearly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:57:57 +00:00
snipe abc9ee22c6 Added serial and status to transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:48:02 +00:00
snipe e5ee9760c0 I don’t think we use these anyore because of the modifiers on date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:33 +00:00
snipe 7868a8c174 Added serial for API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:13 +00:00
snipe 03df4cec45 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:46:43 +00:00
akemidx 4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05:00
snipe e2c3386c33 Merge remote-tracking branch 'origin/develop' 2024-02-13 20:37:17 +00:00
snipe a866d6b16e
Merge pull request #14261 from snipe/fixed/missing_location_string 
Fixed incorrect string for location not existing
 2024-02-13 20:29:32 +00:00
snipe a76a69d085 Fixed incorrect string for location not existing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-13 20:23:32 +00:00
Brady Wetherington 955f75f733 Fixes for the prefix-guessing and sanitizing. 2024-02-13 16:45:24 +00:00
snipe 280e778749 Merge remote-tracking branch 'origin/develop' 2024-02-13 13:46:52 +00:00
snipe 60ba898167
Merge pull request #14255 from marcusmoore/chore/sc-24805 
Added LDAP group tag to LDAP tests
 2024-02-13 13:42:51 +00:00
snipe 2c9d5b9ea3
Merge pull request #14247 from ubc-cpsc/bugfix/CVE-2023-37260 
Fixes CVE-2023-37260 upgrading league/oauth2-server
 2024-02-13 13:40:53 +00:00
snipe eb6e2636b5
Merge pull request #14246 from ubc-cpsc/bugfix/CVE-2022-24894 
Fixes CVE-2022-24894 by upgrading symfony/http-kernel
 2024-02-13 13:40:33 +00:00