DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
12297 commits 89 branches 265 tags 290 MiB
Commit graph

12297 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 81cf08adf5 Updated acorn to 8.11.2 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:16:40 +00:00
snipe 1b77632ecb
Merge pull request #13941 from snipe/security/snyk_13938 
Upgraded webpack to 5.89.0
 2023-11-23 15:15:08 +00:00
snipe d4bdaf16e7 Upgraded webpack to 5.89.0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:13:13 +00:00
snipe e3a8952f4b
Merge pull request #13940 from snipe/features/add_location_to_user_view_assets 
Added location to user view assets
 2023-11-23 15:02:23 +00:00
snipe ad6b286e10 Added default location to view-assets view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:39 +00:00
snipe 7f94b7df32 Removed refresh from asset view table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:01:24 +00:00
snipe 776b16d379 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-11-22 23:41:31 +00:00
snipe 6409018b08 Bumped hash and moved to pre version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:41:03 +00:00
snipe 780279a620 Merge remote-tracking branch 'origin/develop' 2023-11-22 23:22:46 +00:00
snipe 31f429e1c4
Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg 
Escape the asset tag before passing it to the view
 2023-11-22 23:21:54 +00:00
snipe 3a0b994443
Merge pull request #13933 from snipe/fixes/removed_extra_return 
Removed extra return statement in consumables API checkout method
 2023-11-22 23:21:06 +00:00
snipe 1307ef19cf Escape the asset tag before passing it to the view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:20:47 +00:00
snipe aed6b531cb Derp. Extra return statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:05:38 +00:00
snipe 43db3b13ef Merge remote-tracking branch 'origin/develop' 2023-11-22 23:02:20 +00:00
snipe bb0ba0bebe
Merge pull request #13932 from snipe/features/use_allowlist_for_user_logging 
Use allowlist for user observer logging
 2023-11-22 23:01:52 +00:00
snipe ba127be344 Use saveQuietly to prevent double entries 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:00:30 +00:00
snipe c6178bd619 Added translation for success password save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:59:59 +00:00
snipe 3929c8f260 Nicer alert layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:57:54 +00:00
snipe f922d0518e Added allow list - quiet the observer down for magical laravel things 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:35:34 +00:00
snipe 45d9119733 Removed debugging/comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:32:34 +00:00
snipe e269415fec Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:55:44 +00:00
snipe 996caafa80 Merge remote-tracking branch 'origin/develop' 2023-11-22 21:42:32 +00:00
snipe 8481768c3d Save quietly for login methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:42:21 +00:00
snipe 91c36730e7 Merge remote-tracking branch 'origin/develop' 2023-11-22 21:39:47 +00:00
snipe d3175b2ca4 Removed remember token from changed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:39:06 +00:00
snipe dfabf9082b Merge remote-tracking branch 'origin/develop' 2023-11-22 21:37:35 +00:00
snipe a8123db4fb Fixed comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:35:12 +00:00
snipe b1e782d2f0 Small nits picked to make Brady happy 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:34:39 +00:00
snipe 60517f811e
Merge pull request #13931 from snipe/features/nicer_icons_for_activity_report 
Use updated icons for activity report
 2023-11-22 21:10:22 +00:00
snipe 58679a13eb Use updated icons for activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:07:07 +00:00
snipe 3d9a9c7fe8
Merge pull request #13930 from snipe/features/added_user_observer 
Added user observer
 2023-11-22 20:51:27 +00:00
snipe 22246dd099 Unset the specific arrays we don’t want to keep 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:50:46 +00:00
snipe a7f76f9860 Hide certain fields from changelog 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:28:58 +00:00
snipe 8b79a8afdf Added user observer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:22:05 +00:00
snipe 299db76009
Merge pull request #13928 from snipe/fixes/double_logging_on_asset_restore 
Fixes double logging on asset restore
 2023-11-22 20:10:45 +00:00
snipe 20c0f687e9 Added restored to asset observer, removed manual logging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:09:10 +00:00
snipe d06cfe6502 Changed verb to “restore” from “restored” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:08:41 +00:00
snipe 534ac5ac53
Merge pull request #13926 from snipe/bug/sc-24106 
Fixed issue where delete then restore could result in duplicate asset tags
 2023-11-22 18:33:17 +00:00
snipe e2d0136336 Fixed goofy translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:14:44 +00:00
snipe 6a3ab526de Refactorer API controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:04:24 +00:00
snipe 19877244cd Added/refactorerd isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:03:26 +00:00
snipe f7ccef16e7 Refactorer controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:02:47 +00:00
snipe 0e51a0935d Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:41:12 +00:00
snipe ffc1266d0e UI fix - don’t show the trash can icon on things that can be restored 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:41:06 +00:00
snipe 2972c31a11 Added restore endpoints for manufacturers and asset models API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 17:40:47 +00:00
snipe e10258804d Merge remote-tracking branch 'origin/develop' 2023-11-22 13:48:35 +00:00
snipe 0d29ac9856 Fixded gate return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 13:48:20 +00:00
snipe 10d867ccc9 Merge remote-tracking branch 'origin/develop' 2023-11-22 12:28:42 +00:00
snipe eae98d3f35
Merge pull request #13923 from snipe/bug/sc-24098 
Quick revert for #13830
 2023-11-22 12:28:25 +00:00
snipe a08dcbdfdb Quick revert for #13830 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 12:25:42 +00:00