Marcus Moore
|
ea1f8328b9
|
Include MAIL_FROM_ADDR in phpunit configuration
|
2024-12-02 10:23:02 -08:00 |
|
Godfrey M
|
99464fcd86
|
fixes general webhook not firing
|
2024-12-02 10:19:24 -08:00 |
|
snipe
|
93d4d24194
|
Fixed funky layout in importer
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
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 17:56:15 +00:00 |
|
|
snipe
|
1bbe9bf6c9
|
Merge remote-tracking branch 'origin/develop'
|
2024-12-02 17:43:03 +00:00 |
|
|
snipe
|
6874f703bf
|
Some CSS twiddling
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 17:42:26 +00:00 |
|
|
snipe
|
a7d5b3944e
|
Merge pull request #15908 from snipe/revert-15892-bug/harden-checkout-validation
Revert "Hardened asset checkout validation by requiring integer"
|
2024-12-02 17:42:02 +00:00 |
|
|
Marcus Moore
|
b5e83899c6
|
Revert "Hardened asset checkout validation by requiring integer"
|
2024-12-02 09:37:21 -08:00 |
|
|
snipe
|
dcd586e3cd
|
Merge remote-tracking branch 'origin/develop'
|
2024-12-02 17:17:20 +00:00 |
|
|
snipe
|
1246ab1de7
|
Fixed bulk user form in user detail view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 17:14:36 +00:00 |
|
|
snipe
|
5a4a3aa8f3
|
Merge remote-tracking branch 'origin/develop'
|
2024-12-02 15:59:25 +00:00 |
|
|
snipe
|
2220828b00
|
Merge pull request #15904 from snipe/fixes/#15901
Fixed #15901 - re-added required indicator on text and select custom fields
|
2024-12-02 15:51:32 +00:00 |
|
|
snipe
|
716c67d4b8
|
Fixed #15901 - re-added required indicator on text and select custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-02 15:45:07 +00:00 |
|
|
snipe
|
ee4a54be24
|
Fixed order by notes for users
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
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-27 15:48:13 +00:00 |
|
|
snipe
|
46be1ada60
|
Merge pull request #15892 from marcusmoore/bug/harden-checkout-validation
Hardened asset checkout validation by requiring integer
|
2024-11-27 14:55:11 +00:00 |
|
|
snipe
|
e1c0a80c20
|
Merge remote-tracking branch 'origin/develop'
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
|
2024-11-27 13:52:03 +00:00 |
|
|
snipe
|
2cb1b6d462
|
Use transformer on API update
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-27 13:51:53 +00:00 |
|
|
snipe
|
37ac7fe25c
|
Merge remote-tracking branch 'origin/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
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-11-26 20:38:46 +00:00 |
|
|
snipe
|
11f83b4cd9
|
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
|
2024-11-26 20:12:14 +00:00 |
|
|
snipe
|
0f1d10bd69
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-26 20:12:09 +00:00 |
|
|
snipe
|
82108f8a18
|
Merge pull request #15208 from akemidx/feature/sc-26415
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
|
2024-11-26 20:11:04 +00:00 |
|
akemidx
|
a7dae10a82
|
fixing line
|
2024-11-26 15:06:25 -05:00 |
|
|
akemidx
|
2727210c78
|
requested changes from pr
|
2024-11-26 15:04:54 -05:00 |
|
|
Marcus Moore
|
fcbd5dcae5
|
Harden asset checkout validation by requiring ints
|
2024-11-26 11:33:17 -08:00 |
|
|
snipe
|
fa80716320
|
Merge pull request #15890 from Godmartinz/mobile-view-fix
Mobile view fix
|
2024-11-26 19:13:39 +00:00 |
|
|
Godfrey M
|
15c9df0ab1
|
fix mobile view for asset and user
|
2024-11-26 10:59:31 -08:00 |
|
|
snipe
|
6ee0c93c87
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-26 18:47:22 +00:00 |
|
|
snipe
|
37e091adbb
|
Merge pull request #15889 from Godmartinz/Fix-user-API-location-update
Fixed Users API `update` from clearing `location_id` unnecessarily
|
2024-11-26 18:45:20 +00:00 |
|
|
Godfrey M
|
021e82927e
|
fixed mobile view of assets
|
2024-11-26 10:42:59 -08:00 |
|
|
Godfrey M
|
60642cd902
|
fix user api update from clearing location_id unnecessarily
|
2024-11-26 09:58:17 -08:00 |
|
|
snipe
|
fd07550803
|
Merge remote-tracking branch 'origin/develop'
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
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-11-25 14:19:05 +00:00 |
|
|
snipe
|
30b481bc93
|
Updated version
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
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-25 14:18:31 +00:00 |
|
|
snipe
|
25bfd3e845
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-25 13:05:28 +00:00 |
|
|
snipe
|
0f18ee86f7
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-25 13:05:05 +00:00 |
|
|
snipe
|
4a5f65616f
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-25 12:56:08 +00:00 |
|
|
snipe
|
f125c90c94
|
Merge pull request #15870 from marcusmoore/bug/sc-26857
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
Always call resizeCanvas
|
2024-11-22 00:59:36 +00:00 |
|
|
akemidx
|
0d608552ef
|
orange bar for requirednessness
|
2024-11-21 19:09:54 -05:00 |
|
|
akemidx
|
dd223fc215
|
commit for testing
|
2024-11-21 19:01:27 -05:00 |
|
|
Marcus Moore
|
87756cac66
|
Remove debugging
|
2024-11-21 14:30:17 -08:00 |
|
|
Marcus Moore
|
9f49c25401
|
WIP: move signature pad creation up and add debugging
|
2024-11-21 13:12:13 -08:00 |
|
|
Marcus Moore
|
d0378070c8
|
Always call resizeCanvas
|
2024-11-21 12:38:53 -08:00 |
|
|
snipe
|
9f395d1f6a
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-21 19:58:49 +00:00 |
|
|
snipe
|
feba860a90
|
Merge pull request #15850 from akemidx/bug/sc-27448
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
Adding colon to password translation string
|
2024-11-21 19:58:04 +00:00 |
|
|
akemidx
|
424316df9f
|
fixing colon placements
|
2024-11-21 14:32:22 -05:00 |
|
|
snipe
|
b7aedb7dcb
|
Merge pull request #15818 from spencerrlongg/bug/sc-27213
Resolves Validation for Encrypted Numeric and Alpha Custom Fields
|
2024-11-21 19:25:27 +00:00 |
|
|
snipe
|
8b38dc83f6
|
Merge pull request #15851 from marcusmoore/testing/api-component-checkin
Fixed bug in component checkins via api
|
2024-11-21 19:24:12 +00:00 |
|
|
snipe
|
ad2b85393b
|
Merge remote-tracking branch 'origin/develop'
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
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2024-11-21 19:23:10 +00:00 |
|
|
snipe
|
85c1b0ec57
|
[Snyk] Upgrade jquery-ui from 1.14.0 to 1.14.1 #15868
Signed-off-by: snipe <snipe@snipe.net>
|
2024-11-21 19:22:08 +00:00 |
|
|
snipe
|
b99b56b32b
|
Merge remote-tracking branch 'origin/develop'
|
2024-11-21 14:41:42 +00:00 |
|
|
snipe
|
2a21cce4f5
|
Merge pull request #15839 from Godmartinz/fix-mail-envelope-variable
replace env with config variable for from address
|
2024-11-21 14:41:04 +00:00 |
|
|
snipe
|
3a683d84a7
|
Merge pull request #15859 from Godmartinz/remove_name_null_warning
Adds a ternary for blank emails for mail notifications
|
2024-11-21 14:38:03 +00:00 |
|