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

12912 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 1b80c8938a removed unnecessary if statement 2024-02-15 13:04:00 -08:00
Godfrey M dc77c01fd3 removes spacing 2024-02-15 13:00:38 -08:00
Godfrey M 83474d6e59 moves the array manipulation up the page where it should be 2024-02-15 12:59:47 -08:00
Godfrey M 529310c93a fixed typo in comment 2024-02-15 12:41:31 -08:00
Godfrey M 70f26f33a5 does a collect and map instead of a for loop for the array solution 2024-02-15 12:34:09 -08:00
Godfrey M 414bc10c40 removes the double for loop with a better solution 2024-02-15 12:02:08 -08:00
Godfrey M 250b0a7afb gives a better example with custom fields in label preview 2024-02-15 11:50:41 -08:00
snipe e5355db672 Merge remote-tracking branch 'origin/develop' 2024-02-15 18:39:57 +00:00
snipe aef45a90b2
Merge pull request #14278 from uberbrady/allowlist_and_db_prefix_for_restore 
Allowlist and db prefix for restore
 2024-02-15 14:50:44 +00:00
snipe 9221641bba Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-02-15 14:50:37 +00:00
snipe 6bca1e3b22 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:48:07 +00:00
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
Marcus Moore aec59f2da6
Update assertion to be more correct 2024-02-14 12:27:42 -08:00
Marcus Moore 905df5ec25
Consolidate test cases 2024-02-14 12:14:27 -08:00
Marcus Moore bacfdc5049
Scaffold additional tests 2024-02-14 11:33:03 -08:00
Marcus Moore 3cc72021b6
Move notification test to notifications test suite 2024-02-14 11:16:31 -08:00
Marcus Moore 4354e126b1
Scaffold tests 2024-02-14 11:11:08 -08:00
Marcus Moore 02f39472f9
Remove duplicate test 2024-02-14 11:10:59 -08:00
Marcus Moore d7aed2edc9
Remove unneeded code 2024-02-14 11:10:45 -08:00
Marcus Moore af513946a2
Implement test 2024-02-14 10:48:49 -08:00
Marcus Moore 7bfd02054b
Remove duplicate authorization check 2024-02-14 10:48:41 -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