DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15960 commits 52 branches 269 tags 311 MiB
Commit graph

6278 commits

Author SHA1 Message Date
snipe 2a21cce4f5
Merge pull request #15839 from Godmartinz/fix-mail-envelope-variable 
replace env with config variable for from address
 2024-11-21 14:41:04 +00:00
Godfrey M f7c1fc852d no checked out to email doesnt trigger a 500 2024-11-20 08:29:28 -08:00
snipe 8cd4b3303e
Merge pull request #15847 from NebelKreis/feature/hardware-label-generation-api
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Added #15677: API Route for Generating Asset Labels
 2024-11-20 11:14:28 +00:00
NebelKreis d5c141dc59 Fix: Removed setting validation as it is not strictly necessary 2024-11-20 11:55:48 +01:00
snipe cca76005a2
Merge pull request #15852 from marcusmoore/testing/ui-delete-component
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Added tests around deleting component via ui
 2024-11-20 01:27:19 +00:00
Marcus Moore 54f5f46e31
Improve check for image existence 2024-11-19 16:44:42 -08:00
Godfrey M 99de639be4 fix mail.from.address variables in config, simplify envelop[ variable 2024-11-19 09:32:11 -08:00
snipe 15a31bd141 Fixed variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-19 13:22:44 +00:00
NebelKreis 66d6b01307 Feature: Added translations for label generation API endpoint 2024-11-19 14:16:06 +01:00
NebelKreis 889aff43c2 Feature: Added API endpoint for generating asset labels 2024-11-19 14:13:05 +01:00
Godfrey M f533cdc07a update default from address to alternate config variable 2024-11-18 12:39:28 -08:00
Godfrey M d14f43fbbe replace env with config variable for from address 2024-11-18 10:54:03 -08:00
snipe e8d1093376 Fixed admin user not showing in download all activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-15 18:51:45 +00:00
snipe 187e231c0e Fixed #15825
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-15 13:18:15 +00:00
snipe 09b7db5103 Additional fix for #15817
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 20:57:09 +00:00
snipe f2faf58786
Merge pull request #15817 from Godmartinz/label_fix 
Removes asset tag if 2D code is not present
 2024-11-14 20:49:31 +00:00
Godfrey M 0f1f6bc6a5 fixed rest of dymos 2024-11-14 09:45:52 -08:00
Godfrey M 23038ab209 removes tag if qr code is not present 2024-11-14 08:54:12 -08:00
Godfrey M 702621ec57 replace the via channel class 2024-11-14 08:38:18 -08:00
snipe a0b8483878 Removed extra sort 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 14:41:11 +00:00
snipe 940f1c2ecc Fixed #15812 - regression in action_type search 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 12:24:15 +00:00
snipe 364410a586
Merge pull request #15558 from maciej-poleszczyk/develop 
Fixing #15064 - to not fail ldap sync on single data issue with ldap …
 2024-11-14 11:06:18 +00:00
snipe 4e28650ca9 Specify table name in select 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-14 10:18:39 +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
Godfrey M 1061df8c8b fix user checkout license category email check 2024-11-13 13:07:28 -08: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
Godfrey M 8389c03450 improved logging in checkoutable listener 2024-11-13 12:19:16 -08: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 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 4a18946dd7 Added created by to imports 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 18:42:27 +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 2f943bc052 Better error messaging for bad fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:44:09 +00:00
snipe 4afe873f24 Fixed tests, updated CSV 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-13 16:21:40 +00:00