DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
14893 commits 96 branches 267 tags 295 MiB
Commit graph

14893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M f05d8281f3 fixes alignment for error msg 2024-07-24 12:06:56 -07:00
Godfrey M d5c9fa823e adds translations 2024-07-24 11:39:33 -07:00
Godfrey M 99741db645 adds status labels to confirmation emails 2024-07-24 11:24:30 -07:00
snipe 90d5a6d8ab Merge remote-tracking branch 'origin/develop' 2024-07-24 19:16:56 +01:00
snipe 5b8529bc83 Fixed pluralization 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 19:16:08 +01:00
snipe f76c68f0ed Merge remote-tracking branch 'origin/develop' 2024-07-24 18:10:23 +01:00
snipe 8368fb5c41
Merge pull request #15160 from snipe/fixes/allow_cloning_of_deleted_assets 
Allow cloning of deleted assets
 2024-07-24 18:09:55 +01:00
snipe d1c39a737f Fixed double semicolon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 18:09:32 +01:00
snipe 425bfa4318 Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 18:06:21 +01:00
snipe 293abbd1d0 Allow cloning of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:38 +01:00
snipe b64b774bd5 Use route model binding on clone, removed unneeded route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:49:21 +01:00
snipe 466ab1e3c0 Removed the banner since we already warn 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:40:24 +01:00
snipe daa9e7810e
Merge pull request #15158 from snipe/fixes/ui_cleanup_for_asset_view 
Cleaned up UI on asset view
 2024-07-24 17:34:17 +01:00
snipe 95a0f3dbe5 Cleaned up UI on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 17:26:55 +01:00
snipe e5ab12496f
Merge pull request #15151 from snipe/snyk-fix-067da5564c4d29b025cd356b125e6ad9 
[Snyk] Security upgrade alpine from 3.18.6 to 3.19
 2024-07-24 14:22:57 +01:00
snipe 4b906e39be
Merge pull request #15155 from snipe/fix_new_alpine 
Switch dockerfile to using php8.2 instead of 8.1 due to Alpine changes
 2024-07-24 14:00:21 +01:00
Brady Wetherington 0dc8f27240 Switch dockerfile to using php8.2 instead of 8.1 due to Alpine changes 2024-07-24 13:56:27 +01:00
snipe c4135c71d4 Merge remote-tracking branch 'origin/develop' 2024-07-24 13:05:16 +01:00
snipe 172da4d655
Merge pull request #15154 from snipe/fixes/15103_show_eol_to_users 
Fixes #15103 - Added EOL and audit into to user profile assets
 2024-07-24 13:03:50 +01:00
snipe 6f8ccd4e10 Fixes #15103 - Added EOL and audit into to user profile assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:54:33 +01:00
snipe 8d36a75342 Merge remote-tracking branch 'origin/develop' 2024-07-24 12:41:20 +01:00
snipe 9457e5b890
Merge pull request #15153 from snipe/fixes/mail_backup_config 
Fixed env var for backup config - related to #14964
 2024-07-24 12:40:46 +01:00
snipe bce7a278ae Fixed env var for backup config - related to #14964 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 12:38:58 +01:00
snipe a6041ae525 Merge remote-tracking branch 'origin/develop' 2024-07-24 10:41:36 +01:00
snipe ab1e097b7c Early return for requiredness 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 10:41:14 +01:00
snipe a781f84aea Merge remote-tracking branch 'origin/develop' 2024-07-24 10:36:23 +01:00
snipe 90a2a808d6
Merge pull request #15149 from spencerrlongg/bug/check_requiredness 
Fixed: Requiredness Check Bug
 2024-07-24 10:33:45 +01:00
snipe 73e2d8e305 Merge remote-tracking branch 'origin/develop' 2024-07-24 10:32:54 +01:00
snyk-bot 0e1e13f54a
fix: Dockerfile.alpine to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-6913411
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249236
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249265
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249419
- https://snyk.io/vuln/SNYK-ALPINE318-BUSYBOX-7249419
 2024-07-24 09:11:01 +00:00
Marcus Moore 869c06f454
Register anonymous blade component namespace 2024-07-23 15:41:58 -07:00
spencerrlongg b61ab423ca ok NOW it should be fine 2024-07-23 17:35:48 -05:00
spencerrlongg 090a595c99 conflict 2024-07-23 17:34:17 -05:00
Spencer Long bc417308c7
Merge branch 'develop' into bug/check_requiredness 2024-07-23 17:32:43 -05:00
spencerrlongg e77e16b9aa this works 2024-07-23 17:22:20 -05:00
spencerrlongg 0ae297634e ugh 2024-07-23 16:59:58 -05:00
spencerrlongg 0f2f559d7a test works, helper still needs work. pushing to check something 2024-07-23 16:46:29 -05:00
snipe 57b5b12952
Merge pull request #15148 from marcusmoore/fixes/dates-in-user-import 
Fixed start_date and end_date in user importer
 2024-07-23 22:37:19 +01:00
snipe 9baaaae1a3 Merge remote-tracking branch 'origin/develop' 2024-07-23 22:15:57 +01:00
snipe 1f4118a146 Fixed rule 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 22:15:37 +01:00
Marcus Moore f4a3823d88
Handle empty strings for dates by converting them to null 2024-07-23 13:57:28 -07:00
snipe b2a69efc9d Merge remote-tracking branch 'origin/develop' 2024-07-23 21:42:12 +01:00
snipe 00ebc8b64d
Merge pull request #15136 from snipe/fixes/cookie_serialization 
Remove cookie serialization
 2024-07-23 21:41:44 +01:00
snipe effd273245
Merge pull request #14458 from spencerrlongg/bug/sc-24884 
Add Form Request and Tests for Update Asset API Method
 2024-07-23 20:57:47 +01:00
snipe 7858c72b98 Fixed string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 20:45:12 +01:00
snipe 09e2c0beab
Merge pull request #15147 from uberbrady/fix_setup_ssl_check 
Fix setup ssl check
 2024-07-23 20:32:13 +01:00
spencerrlongg e8864ffb01 test added, permission fixed 2024-07-23 14:29:17 -05:00
Brady Wetherington d893de2b7e Merge branch 'develop' into fix_setup_ssl_check 2024-07-23 20:24:38 +01:00
Brady Wetherington 7f7cfef81b Mark test as Incomplete, and downgrade error back to debug for tests 2024-07-23 20:24:05 +01:00
Godfrey M d01972bbe5 adds tests for amount and percent 2024-07-23 11:53:59 -07:00
spencerrlongg b9fdb5880a quick push 2024-07-23 13:48:43 -05:00