Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] develop from snipe:develop #58

Open
wants to merge 5,903 commits into
base: develop
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Mar 28, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Mar 28, 2023
marcusmoore and others added 29 commits October 3, 2024 13:40
…r_users

Removed duplicate JS and removed line break before user section
Docker Env: Change trusted proxies to RFC1918
Added `Model::reguard()` to importer
Only show EULA when available on print users page
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
snipe and others added 30 commits October 30, 2024 19:29
changes `admin_cc_email` validation to allow an array
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.
Fix ${var} deprecation warning in License model
Fixed MS Team Notifications to utilize workflows after deprecation
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
…debugging

Revert "Added the display of logs when tests fail in GitHub Actions"
Fixed notifications for licenses and asset to asset checkoutables
Signed-off-by: snipe <snipe@snipe.net>
Added Checkout ID column to user accessory table
Signed-off-by: snipe <snipe@snipe.net>
Add new indexes to locations and users for faster manager lookups
…nager_indexes

Improved indexes on manager_id for locations and users, including del…
Signed-off-by: snipe <snipe@snipe.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants