snipe
224f04db6c
Merge pull request #16050 from Godmartinz/inactive-slack-hook
...
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
Adds try/catch around notification failing with an inactive webhook for better user experience
2025-01-10 11:23:41 +00:00
snipe
f0bcf78941
Merge pull request #16051 from marcusmoore/testing/checkoutable-acceptance-factory-fix
...
Update related asset when checkout acceptance created via factory
2025-01-10 11:22:50 +00:00
林博仁 Buo-ren Lin
c08a4a2b0a
Fixed #16054 : fix incorrect compose service name in the APP_KEY generation command of the Docker env file
...
This resolves the following error:
```
$ docker compose run --rm snipe-it php artisan key:generate --show
no such service: snipe-it
```
and is also how it is done in the documentation.
Fixes #16054 .
Refer-to: APP_KEY | Docker | Snipe-IT documentation <https://snipe-it.readme.io/docs/docker#app_key >
Signed-off-by: Buo-ren Lin (OSSII) <buoren.lin@ossii.com.tw>
2025-01-10 11:29:49 +08:00
Marcus Moore
8597984787
Update asset's assigned_to and assigned_type after creating
2025-01-09 15:09:57 -08:00
Godfrey M
001ccf1ce9
adds translation string instead of hardcoded message
2025-01-09 14:47:07 -08:00
Godfrey M
082a974ee3
changed from redirect with error to with warning
2025-01-09 14:26:54 -08:00
Godfrey M
152c23b8f3
changed log from warning to error
2025-01-09 12:55:25 -08:00
Godfrey M
b635822a85
add try/catch around notification failing for inactive slack hooks
2025-01-09 12:51:54 -08:00
snipe
ec85e4b5b0
Upgrade less from 4.2.0 to 4.2.1 #15996
...
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>
2025-01-09 20:42:04 +00:00
snipe
1acb7e0fe4
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2025-01-09 20:38:47 +00:00
snipe
5914004a57
Add @AnouarTouati as a contributor
2025-01-09 16:13:05 +00:00
snipe
c5afc66d46
Merge pull request #16009 from AnouarTouati/prod-docker-fixes
2025-01-09 16:12:37 +00:00
snipe
bc69660247
Merge pull request #16049 from snipe/localization/update_strings-2025-01-09
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (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
2025-01-09 16:02:03 +00:00
snipe
71c7c64fde
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-09 15:54:51 +00:00
snipe
c284ac5287
Merge pull request #16047 from snipe/bug/sc-28054
2025-01-09 15:19:13 +00:00
snipe
639afe5b9b
Check for blank OR null on formatter
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-09 15:11:22 +00:00
Brady Wetherington
049b9c542b
Conditionally update assets when user's location moves via LDAP
2025-01-09 13:43:59 +00:00
Godfrey M
92762896ef
moar removal
2025-01-07 15:10:46 -08:00
Godfrey M
c699baf519
removed commented out code, and unrelated crap
2025-01-07 15:10:00 -08:00
Godfrey M
97b765b5cc
improved reports query, could be further optimized
2025-01-07 15:06:09 -08:00
snipe
40b41e646d
Merge pull request #16033 from Godmartinz/barcode-fix
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
2025-01-07 19:59:30 +00:00
snipe
63853db450
Merge pull request #16035 from marcusmoore/fixes/unaccepted-assets-reminder
2025-01-07 19:58:23 +00:00
Marcus Moore
48dd3252cb
Fix parameter order
2025-01-07 11:47:16 -08:00
snipe
ee6f60e63c
Merge pull request #16034 from Godmartinz/fix-locale-check
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
2025-01-07 19:00:32 +00:00
Godfrey M
f6abf90ba0
fix locale check
2025-01-07 10:51:48 -08:00
Godfrey M
83ee0e0fb6
untangled code visibility from each label engine
2025-01-07 10:37:59 -08:00
Godfrey M
94f44d1b77
fix label type values in db and defaults. update help text
2025-01-07 10:00:52 -08:00
Godfrey M
e12c7473f8
tinkering with the polymorphic eager load
2025-01-07 09:08:36 -08:00
snipe
407d69b370
Merge pull request #16031 from snipe/make_backups_more_configurable
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
2025-01-07 11:25:17 +00:00
snipe
774e795d97
Pull backup:clean settings into config
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-07 11:17:43 +00:00
snipe
f698f74d3e
Merge pull request #16028 from marcusmoore/fixes/report-template-column
...
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Fixed migration causing issues with mariadb
2025-01-06 22:58:30 +00:00
Marcus Moore
80f9159f4d
Change options to text type
2025-01-06 14:29:18 -08:00
Godfrey M
0ec25d55a0
Merge branch 'develop' into unaccepted_assets_reports_memory_fix
2025-01-06 12:28:17 -08:00
Godfrey M
bb03e00279
fix deprecation on asset obs get unaccept report to populate
2025-01-06 11:26:45 -08:00
snipe
4d3db2ab44
Merge pull request #15919 from Godmartinz/table_dropdownmenu-fix
...
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Removed the `table-responsive` div from several index blades
2025-01-06 18:11:19 +00:00
snipe
c3d52af546
Merge pull request #16024 from snipe/fixes/#15977
...
Fixed #15977 - Set order by on companies
2025-01-06 16:12:42 +00:00
snipe
9672a13402
Set order by on companies
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-06 16:11:18 +00:00
snipe
9564f7fdb8
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-06 12:46:17 +00:00
aHVzY2g
eba1f03363
Added: TZe_24mm_D.php modified TZe_24mm_A that includes 1D code
...
New label format for TZe_24mm that includes all fields of TZe_24mm_A with the addition of the 1D code at the bottom of the label.
2025-01-03 11:10:44 +01:00
snipe
c7ca4d061f
Merge pull request #16013 from ubc-cpsc/bugfix/CVE-2024-56521-tcpdf
...
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
Fixes tecnickcom/tcpdf security CVEs
2024-12-30 23:22:32 +00:00
Joël Pittet
115f08ee49
Fixes tecnickcom/tcpdf security CVES: CVE-2024-56522, CVE-2024-56527, CVE-2024-56519, CVE-2024-56521
2024-12-30 13:59:03 -08:00
Anouar Touati
e33c680679
Improvement: Change the logging channel to storage/logs/laravel.log file in dev container
2024-12-29 11:13:47 -05:00
Anouar Touati
1e8ec783b4
following docs for prod docker without specifying APP_VERSION will now get latest version as doc says
2024-12-29 11:05:02 -05:00
Anouar Touati
a6ed958687
Fixed: dev dependencies are not installed in dev container
2024-12-29 11:02:09 -05:00
Anouar Touati
4354f50168
Fixed: Debug mode is not enabled in dev container
2024-12-29 11:02:09 -05:00
snipe
8fc1227974
Merge pull request #16003 from snipe/asset_maintenance_api_fix
...
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Check for valid asset before accessing properties
2024-12-26 10:31:47 +00:00
snipe
d410f168bd
Removed extra checks, since we already check higher up
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-26 10:28:27 +00:00
snipe
b38f9ad33c
Updated return types
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-26 10:18:00 +00:00
snipe
f8311815ee
Check for valid asset before accessing properties
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-26 10:17:45 +00:00
snipe
3edb501973
Fixed typo sanitze to sanitize
...
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-12-25 20:45:19 +00:00
