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

13014 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joël Pittet 3008a4ed7a Fixes CVE-2024-27354 and CVE-2024-27355 2024-03-05 09:55:56 -08:00
Godfrey M 95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
snipe 9a5c1b8126
Merge pull request #14362 from Godmartinz/labels-not-generating-properly 
Fixes inconsistencies with generating labels
 2024-03-04 18:49:44 +00:00
Godfrey M e926db76a0 fixes inconsistencies with generating labels 2024-03-04 10:26:38 -08:00
snipe 9419c7fdeb Fixed contributing link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:42:26 +00:00
snipe 9dbb4abe7e Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:30:05 +00:00
snipe 19e0fb7955 Reverting CSP change 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:25:14 +00:00
snipe 5b9b21a7d1
Merge pull request #14357 from snipe/fixes/stricter_csp_rules 
Removed unsafe-inline and unsafe-eval
 2024-03-01 11:48:51 +00:00
snipe 93e69ab0c6 Removed unsafe-inline and unsafe-eval 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:44:49 +00:00
snipe bc5c559413
Merge pull request #14356 from snipe/fixes/set_csp_rule_to_true_by_default 
Set CSP headers to true by default
 2024-03-01 11:37:53 +00:00
snipe 9b2fcbff08 Set CSP headers to true by default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:36:37 +00:00
snipe ad2674d20b
Merge pull request #14355 from snipe/localization/new_strings 
Updated language strings
 2024-03-01 11:18:12 +00:00
snipe 10ac2c830f Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:17:02 +00:00
snipe df3053eafb
Merge pull request #14354 from snipe/bug/sc-24911 
Use SVG cleaner on favicons
 2024-03-01 10:19:59 +00:00
snipe aaae952acb Use SVG cleaner on favicons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 10:17:57 +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 551354b1bb
Add group annotation for tests 2024-02-27 18:05:18 -08:00
Marcus Moore 03b7891edc
Remove unneeded factory states 2024-02-27 18:03:53 -08:00
Marcus Moore 8978dff054
Consolidate helpers into trait 2024-02-27 18:01:08 -08:00
Marcus Moore d20844fefa
Improve readability by extracting additional helpers 2024-02-27 17:57:12 -08:00
Marcus Moore cd579a04dd
Improve readability by extracting fireCheckOutEvent method 2024-02-27 17:52:18 -08:00
Marcus Moore 15b8140bff
Fix test helper 2024-02-27 17:48:17 -08:00
Marcus Moore 9a93ad2e06
Remove unneeded factory state 2024-02-27 17:46:27 -08:00
Marcus Moore bd4d3aa52b
Improve readability by extracting additional helpers 2024-02-27 17:44:19 -08:00