Commit graph

15918 commits

Author SHA1 Message Date
snipe 09b7db5103 Additional fix for #15817
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 20:57:09 +00:00
snipe add3edba20
Merge pull request #15822 from snipe/add_model_number_to_view_assets
Fixed #15820 - added model number to view-assets
2024-11-14 20:52:44 +00:00
snipe b4a2a4e1ec Fixed #15820 - added model number to view-assets
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 20:51:18 +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
snipe 7b7a848a43
Merge pull request #15819 from snipe/fixes_asset_file_deletion
Corrected route name for delete action on filestable on assets
2024-11-14 18:01:56 +00:00
snipe 636e466b8a Fixed delete model file route
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 17:58:20 +00:00
snipe 838a6d03bd Corrected route name for filestable on assets
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 17:51:49 +00:00
Godfrey M 0f1f6bc6a5 fixed rest of dymos 2024-11-14 09:45:52 -08:00
snipe 306c97b5b5
Merge pull request #15816 from Godmartinz/Teams_fix
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Update Docker Hub Description / dockerHubDescription (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
replace the via() channel for MS Teams (deprecated)
2024-11-14 17:09:47 +00: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 c093b4531d Fixed anchor links
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 14:47:09 +00:00
snipe a0b8483878 Removed extra sort
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 14:41:11 +00:00
snipe 075e3503b1 Removed Twitter links
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 14:38:51 +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 3e131d515d Add @maciej-poleszczyk as a contributor 2024-11-14 11:06:55 +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 70d9ef428c
Merge pull request #15811 from snipe/small_fix_for_embiguous_created_by
Specify table name in select for models controller
2024-11-14 10:20:16 +00:00
snipe 4e28650ca9 Specify table name in select
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 10:18:39 +00:00
snipe a060f603b5 Versioning stuff is hard - fixed v7.0.14 to v7.1.14
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-11-14 01:11:01 +00:00
snipe f7dcfca66c Bumped version
Signed-off-by: snipe <snipe@snipe.net>
2024-11-13 23:46:04 +00:00
snipe cb7e47a3a3 Updated translations
Signed-off-by: snipe <snipe@snipe.net>
2024-11-13 22:55:33 +00:00
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