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

15895 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 0ba861920f Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 22:51:20 +00:00
snipe e185b2b781 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 22:50:13 +00:00
snipe 5084843f9d
Merge pull request #15809 from marcusmoore/fixes/teams 
Fixed Microsoft Teams notifications
 2024-11-13 22:38:24 +00:00
Marcus Moore e80a456e04
Remove duplicate method 2024-11-13 14:35:20 -08:00
Marcus Moore c399d797b4
Add conditional for microsoft team integration version 2024-11-13 14:29:01 -08:00
Marcus Moore ac3ae651b1
Remove incorrect typehint 2024-11-13 14:15:43 -08:00
snipe 73383c688e
Merge pull request #15782 from Toreg87/fixes/indentation_userscontroller 
Fix Indentation in UsersController
 2024-11-13 21:21:40 +00:00
snipe 9d2cbc4bb9 Add @DarrenRainey as a contributor 2024-11-13 21:20:45 +00:00
snipe 796a397d08
Merge pull request #15807 from DarrenRainey/develop 
Patch for whitespace causing HTTP 500 errors.
 2024-11-13 21:20:26 +00:00
snipe 381c6e05bb
Merge pull request #15808 from Godmartinz/check-license-for-email-boolean 
Fixed checkin/checkout email boolean check for Licenses
 2024-11-13 21:17:08 +00:00
snipe ada8e77b85 Added location to asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 21:16:08 +00:00
Godfrey M 1061df8c8b fix user checkout license category email check 2024-11-13 13:07:28 -08:00
Darren Rainey 823af33d1f
Patch for whitespace causing HTTP 500 errors. 
Patch for whitespace causing HTTP 500 errors.
Patch that adds qoutes around MAIL_FROM_NAME and MAIL_REPLYTO_NAME as current script will generate a .env file which causes an 500 error preventing the site from loading.

Log File: /var/log/apache2/error.log:
The environment file is invalid!
Failed to parse dotenv file. Encountered unexpected whitespace at [Asset Management System].
 2024-11-13 20:58:36 +00:00
snipe 02ba13be26
Merge pull request #15730 from akemidx/bug/sc-26974-2 
FIXED: Login button can disappear under some circumstances
 2024-11-13 20:47:20 +00:00
snipe 0a87b0b790
Merge pull request #15784 from Godmartinz/Fieldset_table_borders 
Fixed dark background to fieldsets and right border
 2024-11-13 20:40:25 +00:00
snipe f2fc11035f
Merge pull request #15806 from Godmartinz/improved-checkoutable-logging 
improved logging in checkoutable listener
 2024-11-13 20:39:21 +00:00
snipe 3c08760aeb
Merge pull request #15802 from snipe/features/import_models 
Ability to import asset models (separate from assets)
 2024-11-13 20:37:31 +00:00
Godfrey M 8389c03450 improved logging in checkoutable listener 2024-11-13 12:19:16 -08:00
snipe ab2e7a315a
Merge pull request #15805 from Godmartinz/license-markdown-fix 
Fixed license serial gate in markdown
 2024-11-13 20:13:28 +00:00
Godfrey M d7b60b3482 fix serial check in markdown 2024-11-13 11:59:22 -08:00
snipe 52dceda5a2
Merge pull request #15804 from snipe/update_laravel 
Updated laravel, additional packages for CVE-2024-52301
 2024-11-13 19:49:12 +00:00
snipe 92ae7267d0 Updated laravel, additional packages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 19:43:39 +00:00
snipe 7ccbc60ec0 Chaneg to ucfirst for Assetmodel -> AssetModel 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 19:35:56 +00:00
snipe 2e340f9a23 Two more case fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 19:18:38 +00:00
snipe 304fddb1d1 Removed unused test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:59:32 +00:00
snipe 1caf73f9da Fixed casing, fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:58:30 +00:00
snipe 6f700ccc95 Added relationship for adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:42:44 +00:00
snipe 6fee533283 Updated CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:42:35 +00:00
snipe 4a18946dd7 Added created by to imports 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:42:27 +00:00
snipe 7c3f9ba6af Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:42:03 +00:00
snipe d3602c0595 Allow sorting on admin name in API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:23:26 +00:00
snipe 1aef7edc43 Added created by to the import itself 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:23:11 +00:00
snipe d4018a2834 Added created_by to models API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:22:57 +00:00
snipe 0c3b8cb114 Moved created by to create only 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:22:46 +00:00
snipe b6dbb8879a Added created by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:22:30 +00:00
snipe 3a1fb615e7 Added admin sort scope 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:22:05 +00:00
snipe 8c3b50dbf2 Added created by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:21:36 +00:00
snipe 54f7917fbe Added created by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:21:27 +00:00
snipe d7e5fe50eb Use auth facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:21:19 +00:00
snipe 0a6096e528 Updated method name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:21:00 +00:00
snipe 0ae1db6fe3 Added created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:20:47 +00:00
snipe 4d3137e15a Added $accessory->created_by = auth()->id(); 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:18:46 +00:00
snipe 66aaafc4f2 Updated variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 17:08:20 +00:00
snipe 85dbbdbbcb wtf 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:53:19 +00:00
snipe 813b304a01 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:49:58 +00:00
snipe 2f943bc052 Better error messaging for bad fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:44:09 +00:00
snipe 74ca561ab0 Fixed welcome email toggle 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:43:57 +00:00
snipe 69e36738fe Updated CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:28:10 +00:00
snipe 4afe873f24 Fixed tests, updated CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:21:40 +00:00
snipe 220902a8b4
Merge branch 'develop' into features/import_models 2024-11-13 15:51:36 +00:00