snipe
5e465fa417
Merge remote-tracking branch 'origin/master' into develop
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (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-16 19:06:02 +00:00
snipe
de5d66f5d2
Comment out ad-hoc note button for now
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-16 19:05:52 +00:00
snipe
bbc9ed5778
Fixed audit date default on bulk audit
...
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (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-15 22:28:50 +00:00
snipe
1d0c156d2e
Increased due for checkin warning
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-15 22:12:18 +00:00
snipe
7de5e2e7ef
One more audot field increase
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-15 22:11:22 +00:00
snipe
8d935b34eb
Fixed audit interval input width
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-15 22:07:53 +00:00
snipe
9830959f11
Fixed input width on audit interval
...
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-15 22:07:15 +00:00
snipe
37b39956b5
Merge pull request #16071 from snipe/bug/sc-28149
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
2025-01-14 14:35:24 +00:00
snipe
9a4fd81c70
Use correct icon for ad-hoc notes on assets
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-14 14:34:17 +00:00
snipe
0bb2e98af3
Built assets
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-14 12:33:59 +00:00
snipe
1c8d94c953
Merge pull request #15525 from akemidx/updated_ad_hoc_notes
2025-01-14 11:33:21 +00:00
snipe
ca11efd3ee
Merge pull request #16036 from Godmartinz/unaccepted_assets_reports_memory_fix
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
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-13 22:23:30 +00:00
snipe
4a6a94a50e
Merge pull request #16010 from AnouarTouati/dev-container-fixes
2025-01-13 22:23:13 +00:00
snipe
2d65b38155
Merge pull request #16011 from AnouarTouati/dev-docker-improv
2025-01-13 21:00:04 +00:00
snipe
587449ef97
Merge pull request #15981 from akemidx/bug/sc-27551
2025-01-13 17:35:58 +00:00
snipe
06ffac9d7d
Merge pull request #16046 from uberbrady/ldap_asset_location_switch_fix
2025-01-13 17:33:13 +00:00
snipe
e32ed03f66
Merge pull request #16061 from snipe/moved_keywords_on_admin_settings
2025-01-13 17:10:01 +00:00
snipe
a7543b407f
Added a few more words
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-13 17:07:22 +00:00
snipe
98b1ba1e39
Moved keywords in lang file
...
Signed-off-by: snipe <snipe@snipe.net>
2025-01-13 17:04:48 +00:00
snipe
e03ed7567a
Merge pull request #15747 from NebelKreis/feature/custom-data-options-for-2d-barcode
2025-01-13 15:20:56 +00:00
Nebel
9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode
2025-01-13 15:49:32 +01:00
snipe
3f5c166417
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
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-13 13:59:41 +00:00
snipe
cf091377b6
Add @brlin-tw as a contributor
2025-01-13 13:59:34 +00:00
snipe
0cc7a7014f
Merge pull request #16053 from brlin-tw/patch-1
...
Fixed #16054 : fix incorrect compose service name in the APP_KEY generation command of the Docker env file
2025-01-13 13:59:05 +00:00
snipe
4790ad53e3
Updated font-awesome to 6.7.2
...
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (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-13 13:57:45 +00:00
snipe
62dc075834
Add @aHVzY2g as a contributor
2025-01-13 13:55:28 +00:00
snipe
41da04cd22
Merge pull request #16018 from aHVzY2g/patch-3
2025-01-13 13:55:04 +00:00
Marlon Spangenberg
0c4fc56b80
increased label/field size to 2.5, reduced supported fields to 3
2025-01-13 12:20:56 +01:00
Marlon Spangenberg
907f0553d4
moved label value into the same line, changed label font to freemono
2025-01-13 12:14:30 +01:00
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
