lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17911 commits 1 branch 0 tags 220 MiB
Commit graph

340 commits

Author SHA1 Message Date
Robert-Azelis
3ea5d4ee40
Update BulkAssetsController.php 
Fix for bulk updarte of purchase date to calculate new EOL
 2024-05-02 12:55:17 +02:00
spencerrlongg
e177993bcc notes and some playing around, push for eod 2024-05-01 16:57:11 -05:00
spencerrlongg
25480293dc change keys to values, add test 2024-04-30 18:03:26 -05:00
snipe
3f04afee5c Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:26 +01:00
snipe
2aa3ce15bd Removed escaping on notes for file uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 14:55:02 +01:00
snipe
e11287ec25 Redirect on checkin if the asset is already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:00:55 +01:00
Godfrey M
633249b08a user assets get updated when a user changes location 2024-03-21 15:15:40 -07:00
Marcus Moore
0fcf223960
Add minimal validation for asset_tags 2024-03-12 12:00:10 -07:00
Marcus Moore
f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
Godfrey M
c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
snipe
a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808 
Added tests around asset check in and added missing actions to the api controller action
 2024-02-28 13:34:12 +00:00
snipe
a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788 
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
 2024-02-28 11:47:46 +00:00
Marcus Moore
a5516e3511
Improve trait name 2024-02-27 12:06:29 -08:00
Marcus Moore
0e460baf82
Improve readability 2024-02-27 12:03:36 -08:00
snipe
a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
Marcus Moore
dba837b1d2
Move location migration logic to trait 2024-02-22 13:21:52 -08:00
Marcus Moore
d7aed2edc9
Remove unneeded code 2024-02-14 11:10:45 -08: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
111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146 
Fixes Default Location Being Set During Asset Creation and Checkout
 2024-02-10 11:47:46 +00:00
snipe
3868e711f4 Return null if asset was hard-deleted/purged 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 21:08:07 +00:00
snipe
55b3050ca8 Re-applied previous withTrashed PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:37:18 +00:00
snipe
84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe
fa47707974 Use withTrashed() to get the barcode on deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:26:49 +00:00
Brady Wetherington
9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
spencerrlongg
d0a82adc3f changed condition 2024-01-29 20:44:26 -06:00
snipe
105d4899f5 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 20:33:13 +00:00
snipe
ba680126bc Properly sort the results based on non-asset fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:06 +00:00
Brady Wetherington
4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
Spencer Long
8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe
b53a4c366e Removed escaping on notes on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:26:41 +00:00
spencerrlongg
6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
spencerrlongg
68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg
88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
snipe
899890b224 Use update array nomenclature 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:25:35 +00:00
snipe
2d4a14d4bb Fixed from rebase :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:55:41 +00:00
snipe
3b9f069627 Switched back to old version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:54:42 +00:00
snipe
2c6b957fbe Removed unused query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:28:37 +00:00
snipe
6ae03a204b Added the model info back in 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:21:14 +00:00
snipe
c91713e20a Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:55 +00:00
snipe
4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe
f9d5c451bc Committing this for now - not done 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe
5574218966 More FAFO - cleanup needed, but model_id works now 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe
c997ae44c2 FAFO troubleshooting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +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
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
e2d0136336 Fixed goofy translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:14:44 +00:00
snipe
f7ccef16e7 Refactorer controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:02:47 +00:00
snipe
08153d418f Use new alert box and linked string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:18 +00:00
snipe
aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets 
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
 2023-10-26 15:56:47 +01:00
snipe
9bba0b764a Added clearer comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-26 14:38:39 +01:00