DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 02:54:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13234 commits 96 branches 267 tags 296 MiB
Commit graph

13234 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 2353c8199c Set qty mutators 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 15:25:22 +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
snipe 9c4fbbe915
Merge pull request #13922 from snipe/bug/sc-24097 
Created mutator on category checkin_email
 2023-11-22 12:16:07 +00:00
snipe d6a337a584 English hard 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:23:17 +00:00
snipe 83ee07cca1 Created mutator on category checkin_email 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:14:04 +00:00
snipe f12efcf5b2 Merge remote-tracking branch 'origin/develop' 2023-11-21 15:45:13 +00:00
snipe 9502525a41
Merge pull request #13914 from snipe/bug/sc-24073 
Fixed missing translation string for `validation.two_column_unique_undeleted`
 2023-11-21 15:44:56 +00:00
snipe 68ac1aaae0 Additional comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:36:11 +00:00
snipe 6a2ab2cfb2 Removed line break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:10:19 +00:00
snipe fb125af0df Tweaked language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:09:50 +00:00
snipe 590cd0c71f Added Validator::replace() for friendlier interpretation of validation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:59 +00:00
snipe 0ae91d305d Add the two_column_unique_undeleted translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:03 +00:00
snipe 0a1eef2e5b Merge remote-tracking branch 'origin/develop' 2023-11-21 14:12:50 +00:00
snipe 9347af0970
Merge pull request #13913 from snipe/bug/sc-24071 
Fixed #13905 - Use `unique_undeleted` instead of `unique_serial`
 2023-11-21 14:12:15 +00:00
snipe 766eee78b2 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:47:49 +00:00
snipe 2b9e4110bc Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:37:56 +00:00
snipe 4eb435e148 Use unique_undeleted instead of unique_serial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 12:36:11 +00:00
akemidx e5a4214b8b hiding all order stuff 2023-11-20 20:32:14 -05:00