Commit graph

6205 commits

Author SHA1 Message Date
snipe 6928b1b273 Added eol date to bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
2024-11-10 17:47:10 +00:00
Godfrey M 2362cb5e52 refactor to getNotifiables 2024-11-04 16:32:46 -08:00
Godfrey M 0d707a1851 fixes notifications for licenses and asset to asset checkouables 2024-11-04 15:13:10 -08:00
Godfrey M 21a27dcac1 fixed conflicts 2024-10-31 12:55:46 -07:00
Godfrey M 97a449e80e removes instanceof User check 2024-10-31 12:50:13 -07:00
Godfrey M e65942064e send emails even if target has no email 2024-10-31 12:45:29 -07:00
snipe 49de07045a
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
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
Fixed MS Team Notifications to utilize workflows after deprecation
2024-10-31 17:53:17 +00:00
Jeremy Price 69e74bbdd3 Fix ${var} deprecation warning in License model
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php

PHP Deprecated:  Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated:  Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219

This simple fix switches the offending statements to {$var} syntax.
2024-10-30 19:43:54 -07:00
Godfrey M bd23772fe9 changes cc_email validation to allow array 2024-10-30 11:42:15 -07:00
Godfrey M 73772a0138 change button text 2024-10-30 11:12:31 -07:00
Godfrey M b26cae372c merged in develop 2024-10-30 10:40:23 -07:00
Godfrey M d6ba303f39 Merge branch 'develop' into refacto_ms_teams_notifs
# Conflicts:
#	app/Listeners/CheckoutableListener.php
2024-10-30 10:27:45 -07:00
snipe f68df1fa06 Made type searchable in action logs
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-10-30 13:21:13 +00:00
snipe f0813e03bf
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail
Separated Notifications and Emails: Check ins and Check outs
2024-10-30 12:18:41 +00:00
Godfrey M 9a0eee8f03 revert testing variables 2024-10-28 15:03:43 -07:00
Godfrey M 6128765d1f change wording on notification button 2024-10-28 15:03:03 -07:00
Godfrey M c24f79c025 update method comment 2024-10-28 14:58:43 -07:00
Godfrey M e7c4343c90 readd checkin accessory format 2024-10-28 14:56:48 -07:00
Godfrey M c0620c27ff adds back laravels channel formats 2024-10-28 14:30:34 -07:00
Godfrey M ed81973fe6 adds notifications for deprecation 2024-10-28 13:57:42 -07:00
Godfrey M b987b3dc00 adds back the laravel channels package and applies a deprecated check 2024-10-28 10:57:48 -07:00
snipe 86d784bd59 Fixed #15740 - use non-translated strings for icons
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-10-28 13:37:59 +00:00
Godfrey M 58ff641f82 removed unused variables 2024-10-24 22:53:53 -07:00
Godfrey M ce68f550d8 remove alert emails from cc 2024-10-24 16:01:17 -07:00
Godfrey M 6f0c1b12b1 this adds check out message for consumables 2024-10-24 15:04:54 -07:00
Godfrey M 278bc5e52a ads check in and checkout message for license seats 2024-10-24 14:59:10 -07:00
Godfrey M cce75a8185 adds check in and checkout messag for accessories 2024-10-24 14:48:23 -07:00
Godfrey M e27ff13377 adds check in and checkout message for assets 2024-10-24 14:39:40 -07:00
Godfrey M 56365495a1 remove unnecessary fields in accessory checkout mail 2024-10-24 14:26:42 -07:00
Godfrey M 18da80e6de fix checkoutable listener for microsoft teams 2024-10-24 14:24:00 -07:00
Godfrey M 18760e3fa1 replaces teams notification package, passes integration test 2024-10-24 12:21:51 -07:00
snipe dfc63641dc
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Fix multi create partial failure (fixes: [RB-18591])
2024-10-24 11:40:50 +01:00
Godfrey M ab3b9c4510 remove unnecessary code from checkinasset notification 2024-10-23 16:24:01 -07:00
Godfrey M 2cc2b2b1df apply array_filter to cc emails to prevent errors 2024-10-23 16:06:27 -07:00
Godfrey M 62d06b44d6 set fallback from email address to service.snipe-it.io 2024-10-23 15:43:42 -07:00
Godfrey M f29a383179 Merge branch 'develop' into seperating_notification_n_mail
# Conflicts:
#	app/Notifications/CheckoutConsumableNotification.php
2024-10-23 15:15:14 -07:00
Godfrey M fd74c35102 remove old notify by mail from consumable notification 2024-10-23 15:08:29 -07:00
Godfrey M c681946b1d added component markdown changes 2024-10-23 15:05:39 -07:00
Godfrey M 6c34a5c52c conditionally check cc emails, initiate variables 2024-10-23 14:54:21 -07:00
Godfrey M 1b5f4415ae corrected cc email behavior 2024-10-23 14:44:45 -07:00
snipe 3ee76be7e3 Added manufacturer and model_number to components
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 17:50:22 +01:00
snipe 0b6859c491 Added ability to checkout consumables in variable qty
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 15:05:35 +01:00
Godfrey M 1e9922a0b0 fix moar tests 2024-10-22 16:14:36 -07:00
Godfrey M ead27accac fixed accessory tests and notifiable target 2024-10-22 15:45:52 -07:00
Marcus Moore 5ecd2b6293
Default checkbox elements to an empty array 2024-10-22 14:04:05 -07:00
Godfrey M 1e31592c55 messing with the tests 2024-10-22 11:49:06 -07:00
Marcus Moore d10fe77ee7
Merge branch 'develop' into fixes/get-id-for-current-user 2024-10-22 09:38:31 -07:00
snipe 9cf71976f6 Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 16:51:42 +01:00
snipe 15745d9737
Merge pull request #15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
2024-10-22 16:39:44 +01:00
snipe 252d99421c
Merge pull request #15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
2024-10-22 16:26:48 +01:00