DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14240 commits 101 branches 268 tags 288 MiB
Commit graph

14240 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 14c4765be2
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:00:52 +01:00
snipe 3afe996755
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:00:47 +01:00
snipe 0891bd747a
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:00:31 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
Godfrey M 0327e71f0f made message the keys, cleaned up array 2024-05-21 13:26:29 -07:00
Godfrey M 69c2cf2c4f fixed assetcheckin test, created redirect option test 2024-05-21 13:13:25 -07:00
Godfrey M 9f02be0823 removed extra div 2024-05-21 10:15:18 -07:00
Godfrey M b5553af8ed rename variable 2024-05-21 10:11:53 -07:00
Godfrey M 4d6f4303f5 fixed partial up 2024-05-21 10:11:01 -07:00
snipe 34f1ea1c0e Re-order gating and refactor group syncing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 10:00:49 +01:00
snipe e3561ad38e Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 09:56:57 +01:00
snipe a7ccf0efff Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 09:56:51 +01:00
snipe f422c2ecad
Merge pull request #14741 from Godmartinz/footer-issue 
removed extra div tags
 2024-05-20 20:44:27 +01:00
Godfrey M db9c435ae0 removed extra div tags 2024-05-20 10:48:57 -07:00
Godfrey M a53f89cd2c remove license checkout changes p2 2024-05-20 10:26:45 -07:00
Godfrey M 280c03dcad remove license checkout changes 2024-05-20 10:25:59 -07:00
Godfrey M e70fb42f87 remove license redirects 2024-05-20 10:22:01 -07:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe cc0f2d7074 Merge remote-tracking branch 'origin/develop' 2024-05-20 11:22:34 +01:00
snipe a820f248c8
Merge pull request #14736 from snipe/fixes/small_translation_additions 
Fixes/small translation additions
 2024-05-20 11:21:47 +01:00
snipe 6a6272ace3 Translate no records found message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:47 +01:00
snipe bcb747f886 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:37 +01:00
snipe 771c85e347 Translated account save message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:31 +01:00
snipe e5c358a1fe
Merge pull request #14731 from snipe/features/csp_env 
Fixed #14664 - allow additional urls in env for CSP
 2024-05-16 22:25:11 +01:00
snipe 52c906f6b8 Added to env.example 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 22:21:52 +01:00
snipe ca1555d962 Fixed #14664 - allow additional urls in env for CSP 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 22:19:18 +01:00
snipe 0d4f13219b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-05-16 22:00:07 +01:00
snipe 7fdbbc846e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 21:59:38 +01:00
snipe dbbbb103a0
Merge pull request #14730 from snipe/localizations/updated_strings 
Updated translations
 2024-05-16 21:58:24 +01:00
snipe 2182ea1ce8 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 21:57:19 +01:00
snipe f2cc9ec1dd Merge remote-tracking branch 'origin/develop' 2024-05-16 19:57:46 +01:00
snipe 54b24434e1 Set file name variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 19:56:58 +01:00
snipe 653ad562a4 Updated codacy link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 18:56:44 +01:00
snipe 7743b03129 Merge remote-tracking branch 'origin/develop' 2024-05-16 18:51:27 +01:00
snipe 84a601f364
Merge pull request #14729 from snipe/fixes/attribute_for_purchase_date 
Sets purchase date as date (versus datetime) in labels
 2024-05-16 18:49:49 +01:00
snipe 88d131666c Sets purchase date as date (versus datetime) in labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 18:40:49 +01:00
snipe d691f3b315 Merge remote-tracking branch 'origin/develop' 2024-05-16 16:37:47 +01:00
snipe 00a9d5f33e
Merge pull request #14719 from snipe/fixes/add_next_audit_date_to_assets_form 
Added next audit date to assets form
 2024-05-16 16:33:49 +01:00
snipe eb0fd2f519 Removed stricter validation :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 16:29:11 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe 2539c9e697 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 16:01:41 +01:00
snipe 3dfd471fa4 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2024-05-16 15:33:50 +01:00
snipe 4119526889
Merge pull request #14728 from snipe/fixes/smarter_decryption_in_activity 
Only attempt to decrypt custom fields in activity log if the value is not empty
 2024-05-16 15:31:18 +01:00
snipe 6b3346d90c Only attempt to decrypt if there is a value 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:28:25 +01:00
snipe 312ce51de6 Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:25:57 +01:00
snipe 09914f508f Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:16:52 +01:00
snipe 45eda0f611 Removed debug lines 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:09:27 +01:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
snipe 2f18430ce4
Merge pull request #14725 from snipe/features/added_security_dot_txt 
Added security.txt file
 2024-05-16 09:59:46 +01:00
snipe 8d67e02d63 Added security.txt file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 09:56:11 +01:00