snipe
|
12fa505972
|
Disabmiguate licenses company_id
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-08-29 21:07:30 +01:00 |
|
|
snipe
|
d2b88a5107
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-29 21:02:21 +01:00 |
|
|
snipe
|
4e4930ba62
|
Check for array
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 21:01:48 +01:00 |
|
|
snipe
|
4e35f389df
|
Merge remote-tracking branch 'origin/develop'
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-08-29 20:07:03 +01:00 |
|
|
snipe
|
76301bc30d
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 20:05:03 +01:00 |
|
|
snipe
|
964e105cf9
|
Merge pull request #15415 from snipe/rules/prevent_company_switch
Validation rules to prevent switching user companies if items are assigned to them
|
2024-08-29 19:20:03 +01:00 |
|
|
snipe
|
6fd24c7e14
|
Merge pull request #15418 from snipe/added_multiple_for_custom_report
Fixed #15416 - Added multiple selects for custom report
|
2024-08-29 18:55:11 +01:00 |
|
|
snipe
|
231bc1e2de
|
Updated blade selectors
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 18:31:34 +01:00 |
|
|
snipe
|
37d04b7176
|
Some CSS tweaks for select2
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 17:52:01 +01:00 |
|
|
snipe
|
e62a802926
|
Use whereIn instead of where =
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 17:51:44 +01:00 |
|
|
snipe
|
69e981364a
|
Made multiple select
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 17:51:20 +01:00 |
|
|
snipe
|
e5b9d9a28b
|
Merge remote-tracking branch 'origin/develop'
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-08-29 15:04:32 +01:00 |
|
|
snipe
|
abb4221539
|
Validation rules to prevent switchng user companies if assets are assigned
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 14:55:18 +01:00 |
|
|
snipe
|
e4ebabdaba
|
Merge pull request #15414 from uberbrady/fix_create_user
Use the null-safe property accessor for new-user creation
|
2024-08-29 14:19:51 +01:00 |
|
Brady Wetherington
|
da1e383295
|
Use the null-safe property accessor for new-user creation
|
2024-08-29 14:09:23 +01:00 |
|
|
snipe
|
b64ed254e0
|
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 13:49:09 +01:00 |
|
|
snipe
|
ba291edc42
|
Merge pull request #15412 from uberbrady/ImprovePatchPurchasePrice
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
Fix [FD-43836] PATCH of purchase_cost for assets for comma as decimal separator
|
2024-08-29 13:18:52 +01:00 |
|
|
Brady Wetherington
|
ec2ea955d8
|
Fix PATCH of purchase_cost for assets for comma as decimal separator
|
2024-08-29 12:35:14 +01:00 |
|
|
snipe
|
c197644ba7
|
Merge pull request #15284 from spencerrlongg/bug/sc-26584
[Multi-Company] Fixes Users Being Moved With Items Still Assigned
|
2024-08-29 11:38:15 +01:00 |
|
|
snipe
|
29b30cc5d3
|
Merge pull request #15411 from snipe/snyk/upgrade-webpack
Upgraded webpack
|
2024-08-29 11:29:44 +01:00 |
|
|
snipe
|
6af27516dc
|
Upgraded webpack
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:29:00 +01:00 |
|
|
snipe
|
a89f17a145
|
Merge pull request #15410 from snipe/snyk/upgrade-jquery-ui
Updated jquery UI
|
2024-08-29 11:25:56 +01:00 |
|
|
snipe
|
de0565f5b3
|
Updated jquery UI
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:24:06 +01:00 |
|
|
snipe
|
4111ef0d78
|
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
|
2024-08-29 11:20:21 +01:00 |
|
|
snipe
|
68c708bdef
|
Merge pull request #15409 from snipe/fixes-string
Corrected language string
|
2024-08-29 11:18:34 +01:00 |
|
|
snipe
|
5581950fee
|
Corrected language string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:17:17 +01:00 |
|
|
snipe
|
cfa56e2219
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-29 11:08:53 +01:00 |
|
|
snipe
|
58e366a063
|
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
|
2024-08-29 11:08:02 +01:00 |
|
|
snipe
|
b06c527767
|
Check that the user exists before trying to print
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-29 11:06:30 +01:00 |
|
|
snipe
|
7f1dfcc935
|
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
|
2024-08-28 14:29:06 +01:00 |
|
|
snipe
|
26f28a862a
|
Merge pull request #15404 from snipe/bug/sc-26717-model-delete
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
Set image to null if model is deleted
|
2024-08-28 14:26:03 +01:00 |
|
|
snipe
|
94c981e22c
|
Set image to null if model is deleted
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 14:23:49 +01:00 |
|
|
snipe
|
6f3fb21fef
|
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
|
2024-08-28 12:50:19 +01:00 |
|
|
snipe
|
e8da7e2df2
|
Merge pull request #15403 from snipe/clean_up_depreciations
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
Fixed #15392 - filter by depreciation when showing models
|
2024-08-28 12:46:48 +01:00 |
|
|
snipe
|
d635c86e00
|
Added tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:46:30 +01:00 |
|
|
snipe
|
406ff6984b
|
Added click to select on models table
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:42:23 +01:00 |
|
|
snipe
|
c6ddc501c5
|
Filter by depreciation_id
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:40:12 +01:00 |
|
|
snipe
|
4839181beb
|
Added counts to API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:40:01 +01:00 |
|
|
snipe
|
63a05c89a7
|
Added counts to show method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:39:52 +01:00 |
|
|
snipe
|
385c4f69f7
|
Added counts to depreciation transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:39:43 +01:00 |
|
|
snipe
|
486cd8c8c9
|
Nicer formatting for searchableAttributes
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:39:09 +01:00 |
|
|
snipe
|
eb5d93b3c2
|
Added assets relationship
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:38:55 +01:00 |
|
|
snipe
|
a5ff623484
|
Added asset, license, model count to API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:38:43 +01:00 |
|
|
snipe
|
b5a4389815
|
Added badge count, fixed model bulk edit menu
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 12:38:31 +01:00 |
|
|
snipe
|
7b5b559baa
|
Merge pull request #15401 from snipe/fixes-15397-new-window-for-label
Opens label new window
|
2024-08-28 11:57:29 +01:00 |
|
|
snipe
|
67a9929745
|
Opens label new window
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-28 11:56:54 +01:00 |
|
|
snipe
|
a48e79a1fc
|
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
|
2024-08-27 07:37:53 +01:00 |
|
|
snipe
|
64c4433b98
|
Merge pull request #15396 from snipe/add_start_end_date_to_users_edit
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
Added `start_date` and `end_date` to user bulk edit
|
2024-08-27 07:36:37 +01:00 |
|
|
snipe
|
22bc088f6f
|
Added start_date and end_date to user bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-27 07:21:19 +01:00 |
|
|
snipe
|
d3e8e06638
|
Add @swift2512 as a contributor
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-08-26 14:07:06 +01:00 |
|