DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12822 commits 97 branches 266 tags 291 MiB
Commit graph

12822 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe dc7bdca378 Add location/user tracking to maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 10:04:44 +00:00
snipe b1cd44341b
Merge pull request #14347 from snipe/feature/sc-24856_requestable_page 
Dynamically show models/assets on requestable page
 2024-02-28 15:04:48 +00:00
snipe 3da47cdacd Removed header for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 15:03:34 +00:00
snipe 658dda916c Changed operator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 15:01:00 +00:00
snipe 7c3d8b896b Updated asset transformers/presenters to display requestable status 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:55 +00:00
snipe 1ce9df7998 New translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:27 +00:00
snipe a0cbf66c81 Only show tabs if there are requestable assets/models 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:20 +00: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 9fd6aea325
Merge pull request #14281 from Godmartinz/preview-label-fields 
Added better label previews with the new label engine
 2024-02-28 11:48:05 +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
snipe ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728 
Added `min_amt` functionality to licenses
 2024-02-28 11:26:25 +00:00
snipe 92eff653f1 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:26:03 +00:00
snipe 1e66985a78
Merge pull request #14344 from snipe/features/added_created_by_to_groups 
Added created_by to groups table
 2024-02-28 11:19:52 +00:00
snipe a059a42799 Added use Auth to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:14:48 +00:00
snipe b5603fbfe9 Added min amt to license blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:09:07 +00:00
snipe a0423a9cc3 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:56 +00:00
snipe 4ab7112988 Added validation and fillable attributes for min_amt 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:47 +00:00
snipe 767cf96010 Added min_amt to form 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:33 +00:00
snipe 4ffb7790df Added min_amt to API transformer/presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:07:18 +00:00
snipe 3ccc55a78f Added license min amt formatter for BS table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:06:50 +00:00
snipe d0d29e03db Migration for min_amt on licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:06:01 +00:00
snipe 92b7c4b5ec Allow sorting on min_amt 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:05:13 +00:00
snipe dff7c43aed Added minimum account check for licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:05:02 +00:00
snipe 9efbcbbd5e Added min_amt to licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:04:42 +00:00
snipe 31fa0a7044 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:04:32 +00:00
snipe fcb2bf7fea
Merge pull request #14335 from mauro-miatello/develop 
Copy encrypted custom fields
 2024-02-28 09:04:11 +00:00
snipe 0bd27d61b0 Added created_by to groups table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 08:15:59 +00:00
snipe 369ecfa490
Merge pull request #14341 from marcusmoore/chore/sc-24900 
Generate unique department names in factory
 2024-02-28 07:07:45 +00:00
Marcus Moore 87ba2cb407
Generate unique names for departments 2024-02-27 12:47:56 -08:00
Marcus Moore 5084e5d3ef
Improve variable type 2024-02-27 12:23:26 -08: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
Marcus Moore 69022bb8b6
Implement test 2024-02-27 11:12:35 -08:00
Marcus Moore 29d729171c
Align test with actual values passed from the web 2024-02-26 11:13:39 -08:00
MrM 9475871edb
Fix multiple tooltip issue 
If there are multiple tooltips, they all report the message "copied" because there is no element selection. This fix resolves the issue.
 2024-02-25 14:48:05 +01:00
MrM b69364d5ff
Add copy of encrypted custom fields 
Encrypted custom fields may contain sensitive or important information, and it may be useful to have the ability to copy them.
 2024-02-25 14:47:06 +01:00
snipe 10dad8e6e6
Merge pull request #14327 from snipe/fixes/better_ui_for_history_importer 
Nicer UI for history importer
 2024-02-23 11:43:15 +00:00
snipe a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
snipe 8cd0a90ecd
Merge pull request #14325 from snipe/fixes/RB-17890 
Check for valid supplier in license view
 2024-02-23 10:49:56 +00:00
snipe 4a37632ef3 Check for valid supplier in license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 10:48:53 +00:00
snipe 3271d020e9
Merge pull request #14319 from snipe/fixes/RB-17889 
Check for activeFile before trying to get header on import
 2024-02-23 08:19:21 +00:00
snipe e494a2670f
Merge pull request #14321 from akemidx/accessory_pdf_dl_link 
Adding in PDF download to Accesories/Asset/License Histories
 2024-02-23 08:18:55 +00:00
snipe d3a0a337b9
Merge pull request #14323 from ubc-cpsc/bugfix/CVE-2024-25117 
Fixes CVE-2024-25117 php-svg-lib lacks path validation on font through SVG inline styles
 2024-02-23 08:05:03 +00:00
Joël Pittet 3951ee746d Fixes CVE-2024-25117, no other dependencies 2024-02-22 16:49:02 -08:00
Joël Pittet 84e4257e75 Fixes CVE-2024-25117 2024-02-22 16:40:08 -08:00
Marcus Moore c401c88702
Scope event fake 2024-02-22 16:19:33 -08:00
Marcus Moore b55a19cebb
Add assertion event is dispatched with correct timestamp 2024-02-22 13:50:46 -08:00
Marcus Moore 4caadcfa19
Clear pending checkout acceptances when checking in asset via api 2024-02-22 13:33:16 -08:00
Marcus Moore dba837b1d2
Move location migration logic to trait 2024-02-22 13:21:52 -08:00
Marcus Moore 714fc63050
Have legacy locations updated upon api asset checkin 2024-02-22 13:14:30 -08:00