snipe
|
91f3e07b83
|
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.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2025-03-05 17:05:28 +00:00 |
|
|
snipe
|
c9f55bfd94
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-05 17:04:57 +00:00 |
|
|
snipe
|
c29bdbdacb
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/_all-skins.css
# public/css/dist/skins/_all-skins.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/mix-manifest.json
|
2025-03-05 13:46:29 +00:00 |
|
|
snipe
|
27d98fbb93
|
Merge pull request #16429 from snipe/bug/sc-28609
Updated HTML label colors in blue skin
|
2025-03-05 13:43:53 +00:00 |
|
|
snipe
|
0e1f40626f
|
Updated label colors in blue skin
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-05 13:40:36 +00:00 |
|
|
snipe
|
a20d104d2f
|
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.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
|
2025-03-05 11:59:47 +00:00 |
|
|
snipe
|
7a312d075c
|
Check for null on webhook url
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.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-05 11:59:35 +00:00 |
|
|
snipe
|
a61dd8ac17
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-05 10:52:42 +00:00 |
|
|
snipe
|
e1156be919
|
Merge pull request #16427 from snipe/fixed_user_modal_email
Fixes user create modal - check if $item is set
|
2025-03-05 10:52:00 +00:00 |
|
|
snipe
|
fcf7a543fd
|
Check if $item is set
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-05 10:47:33 +00:00 |
|
|
snipe
|
7ee9a690ea
|
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.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
|
2025-03-05 01:12:22 +00:00 |
|
|
snipe
|
bef54983fa
|
Merge pull request #16421 from marcusmoore/chore/migrate-label-helpers-pt8
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.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Replace calls to Form::label pt8
|
2025-03-05 01:01:21 +00:00 |
|
Marcus Moore
|
f2b44f7002
|
Replace Form::label in company select partial
|
2025-03-04 16:46:43 -08:00 |
|
|
Marcus Moore
|
de7d32f632
|
Replace Form::label on ldap settings page
|
2025-03-04 16:44:26 -08:00 |
|
|
Marcus Moore
|
c798df2920
|
Replace Form::label on label settings page
|
2025-03-04 16:34:22 -08:00 |
|
|
snipe
|
5ba94c6c41
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-05 00:12:09 +00:00 |
|
|
snipe
|
779330af14
|
Merge pull request #16420 from marcusmoore/fixes/report-url
Fixed custom report template route
|
2025-03-05 00:11:30 +00:00 |
|
|
Marcus Moore
|
f01ff1f1d7
|
Add dedicated named route
|
2025-03-04 16:07:35 -08:00 |
|
|
Marcus Moore
|
1e4daf0348
|
Fix route
|
2025-03-04 16:04:28 -08:00 |
|
|
snipe
|
9fa855c837
|
Prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 23:30:45 +00:00 |
|
|
snipe
|
9251007574
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-04 23:29:31 +00:00 |
|
|
snipe
|
fae79a91f6
|
Merge pull request #16418 from marcusmoore/chore/custom-report-template-activity-log-removal
Stop reporting report template events to activity log
|
2025-03-04 23:28:43 +00:00 |
|
|
Marcus Moore
|
e8ee218f39
|
Purge activity log of report template data
|
2025-03-04 15:20:23 -08:00 |
|
|
Marcus Moore
|
cb5b0bd89c
|
Stop reporting report template creates, updates, and deletes to action log
|
2025-03-04 15:11:37 -08:00 |
|
|
snipe
|
0ed49fa7a0
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 22:55:58 +00:00 |
|
|
snipe
|
f25b8379e6
|
Merge pull request #16413 from Godmartinz/visited_link-color-change
Changed `visited-link` and `link` colors in default theme to be more accessible
|
2025-03-04 22:55:17 +00:00 |
|
|
snipe
|
bc618fcef4
|
Merge pull request #16414 from Godmartinz/Audit_error_fix
Adds audit notification for MS Teams
|
2025-03-04 22:54:32 +00:00 |
|
Godfrey M
|
7c194422f3
|
Merge branch 'develop' into Audit_error_fix
|
2025-03-04 14:51:21 -08:00 |
|
|
Godfrey M
|
49ff47fbcf
|
Merge branch 'develop' into visited_link-color-change
|
2025-03-04 14:47:48 -08:00 |
|
|
snipe
|
cc73b984cb
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-04 21:13:43 +00:00 |
|
|
snipe
|
77c978d29a
|
Merge pull request #16416 from Godmartinz/expiring-asset-email-test
fix Expiring alert tests
|
2025-03-04 21:11:52 +00:00 |
|
|
Godfrey M
|
437b3cd865
|
fix conflicts
|
2025-03-04 13:08:53 -08:00 |
|
|
Godfrey M
|
3641016271
|
remove commented code
|
2025-03-04 13:08:03 -08:00 |
|
Godfrey Martinez
|
cc127c8e1e
|
Merge branch 'develop' into expiring-asset-email-test
|
2025-03-04 13:06:36 -08:00 |
|
|
Godfrey M
|
4bac509341
|
fix Expiring alert tests
|
2025-03-04 12:58:04 -08:00 |
|
|
snipe
|
f4f6dcb885
|
Updated test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:48:59 +00:00 |
|
|
snipe
|
d89f38bbfb
|
Set defaults on save
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:33 +00:00 |
|
|
snipe
|
9351cc2252
|
Set default to 0
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:22 +00:00 |
|
|
snipe
|
a31a732d38
|
Nicer UI for invert flag
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:15 +00:00 |
|
|
snipe
|
1be420b0e9
|
Fixed test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:37:45 +00:00 |
|
|
snipe
|
548ef97c32
|
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.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2025-03-04 19:57:33 +00:00 |
|
|
snipe
|
2b0127ab0c
|
Bumped version
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.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.4) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:56:58 +00:00 |
|
|
snipe
|
ed8a486726
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-04 19:54:08 +00:00 |
|
|
snipe
|
8791640908
|
Add @Fiala06 as a contributor
|
2025-03-04 19:53:25 +00:00 |
|
|
snipe
|
1ab0911fc8
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-04 19:52:16 +00:00 |
|
|
snipe
|
1dacd25e6d
|
Check for purchase_cost before adding the “each”
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:50:11 +00:00 |
|
|
snipe
|
bdbaea7294
|
Merge remote-tracking branch 'origin/develop'
|
2025-03-04 19:43:28 +00:00 |
|
|
snipe
|
45317c0959
|
Merge pull request #16415 from snipe/nicer_error_message_on_model_not_found
Nicer model name formatting on RMB model not found
|
2025-03-04 19:42:45 +00:00 |
|
|
snipe
|
63e4c42445
|
Added strtolower
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:33:17 +00:00 |
|
|
snipe
|
d4e227f003
|
Whitespace
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 19:29:09 +00:00 |
|