Glukose1
|
d8df52cc8f
|
Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field.
|
2024-08-15 12:20:51 +02:00 |
|
snipe
|
85486fa58c
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-15 10:53:54 +01:00 |
|
|
snipe
|
10dc1f1368
|
Re-pull the accessory checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:51:49 +01:00 |
|
|
snipe
|
3618df2ec5
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-15 10:44:39 +01:00 |
|
|
snipe
|
8f7bce7aad
|
Re-added UI for checkout to non-users for accessories
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:44:27 +01:00 |
|
|
snipe
|
a201f22fdb
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:36:12 +01:00 |
|
|
snipe
|
6070d530cf
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-15 10:35:33 +01:00 |
|
|
snipe
|
4d66f7c93f
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:35:02 +01:00 |
|
|
snipe
|
6c0cf94473
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-15 10:28:08 +01:00 |
|
|
snipe
|
381003eeab
|
Cleaned up asset tag field on quickscan checkin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:27:31 +01:00 |
|
|
snipe
|
c3d4c821f3
|
Merge pull request #15303 from snipe/features/#15301_optional_status_to_quickscan_checkin
Fixed #15301 - Added optional status to quickscan checkin
|
2024-08-15 10:26:04 +01:00 |
|
|
snipe
|
d8038ac483
|
Removed status label list
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:17:08 +01:00 |
|
|
snipe
|
d268f25f16
|
Make asset tag required
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:16:57 +01:00 |
|
|
snipe
|
01c69c8f8f
|
Allow optional status label on quickscan checkin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-15 10:08:48 +01:00 |
|
spencerrlongg
|
9622e05cf5
|
correct api test
|
2024-08-14 18:41:06 -05:00 |
|
|
spencerrlongg
|
afaf53cdfc
|
failing ui test
|
2024-08-14 18:14:21 -05:00 |
|
|
spencerrlongg
|
f031309f8f
|
set up api controller for route/model binding
|
2024-08-14 16:09:15 -05:00 |
|
|
spencerrlongg
|
20ec420ba3
|
not quite done, api side needs some work
|
2024-08-14 13:53:29 -05:00 |
|
Marcus Moore
|
ab63a19aff
|
Initialize concept of cached values
|
2024-08-14 11:01:51 -07:00 |
|
|
spencerrlongg
|
a70b94e707
|
Merge branch 'refs/heads/develop' into bug/sc-26584
|
2024-08-14 11:36:19 -05:00 |
|
r-xyz
|
0d7cf55a3a
|
Add support for Docker secrets in Standard and alpine image.
|
2024-08-14 17:40:52 +02:00 |
|
Brady Wetherington
|
008bf036b5
|
Got rid of weird namespace declaration and commented-out data-toggle line
|
2024-08-14 16:09:34 +01:00 |
|
|
Brady Wetherington
|
cc5ad456e6
|
Expose the 'sanitize' system for backup restores to the web GUI
|
2024-08-14 15:59:21 +01:00 |
|
|
snipe
|
3e29457094
|
Merge pull request #15292 from snipe/features/updated_phpinsights
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
Updated phpinsights
|
2024-08-14 12:12:40 +01:00 |
|
|
snipe
|
0b3ac2a9cd
|
Updated phpinsights
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-14 12:08:49 +01:00 |
|
|
snipe
|
bf4b915168
|
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-14 10:45:13 +01:00 |
|
|
snipe
|
0f1e5181a6
|
Nicer input layout for bulk edit name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-14 10:09:14 +01:00 |
|
|
snipe
|
0a9c2e354f
|
Merge remote-tracking branch 'origin/develop'
|
2024-08-14 10:02:43 +01:00 |
|
|
snipe
|
e544007185
|
Merge pull request #15291 from snipe/features/bulk_update_asset_name
Added asset name to bulk asset edit
|
2024-08-14 10:02:09 +01:00 |
|
|
snipe
|
4b690e8e1f
|
Updated test to check for nulling
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-14 10:01:56 +01:00 |
|
|
snipe
|
371afde52d
|
Bulk edit asset name
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-14 09:52:25 +01:00 |
|
|
Marcus Moore
|
038e86954b
|
Improve property name
|
2024-08-13 17:30:53 -07:00 |
|
|
Marcus Moore
|
f6c1642bf2
|
Use computed fields in CustomFieldSetDefaultValuesForModel component
|
2024-08-13 17:01:35 -07:00 |
|
|
snipe
|
7a6a2e3d92
|
Merge pull request #15290 from marcusmoore/test-fixes
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 component check in test
|
2024-08-14 00:00:55 +01:00 |
|
|
Marcus Moore
|
3f8ac59f4c
|
Reference the entry in the components_assets table
|
2024-08-13 15:31:16 -07:00 |
|
|
snipe
|
74e7b1cfa5
|
Merge pull request #15286 from marcusmoore/test-updates
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
Implemented artisan test case
|
2024-08-13 20:46:46 +01:00 |
|
|
Marcus Moore
|
ae0a6d66f3
|
Update tests
https://masteringlaravel.io/daily/2024-02-09-watch-out-for-this-when-testing-artisan-commands
|
2024-08-13 12:16:08 -07:00 |
|
|
Marcus Moore
|
321839e074
|
Fix namespace
|
2024-08-13 12:14:56 -07:00 |
|
|
spencerrlongg
|
120cfd13c5
|
translation
|
2024-08-13 14:07:40 -05:00 |
|
|
spencerrlongg
|
09f2739298
|
works, un-reassignable licenses are an issue
|
2024-08-13 13:45:41 -05:00 |
|
|
snipe
|
e9fc455a30
|
Merge pull request #15192 from Godmartinz/status_labels_check_emails
Added status labels to confirmation emails
|
2024-08-13 18:24:15 +01:00 |
|
Godfrey M
|
8af4126de1
|
removed indent from blades
|
2024-08-13 10:21:33 -07:00 |
|
|
Godfrey M
|
5d1c48c071
|
fixes alignment, and box issue with pie chart
|
2024-08-13 10:11:49 -07:00 |
|
|
snipe
|
47f1b3b14e
|
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-08-13 16:48:06 +01:00 |
|
|
snipe
|
3044af9410
|
Merge pull request #15280 from snipe/bug/sc-23294
Fixed select2 “x” color on multi-select and border color
|
2024-08-13 16:46:56 +01:00 |
|
|
snipe
|
4f0f0af83b
|
Make the border radius match the rest of the site
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-13 16:46:26 +01:00 |
|
|
snipe
|
198afee946
|
Fixed select2 “x” color on mult-select and border color
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-13 16:42:23 +01:00 |
|
|
snipe
|
def0af652d
|
Merge pull request #15279 from TelecomsSansFrontieres/fix_missing-translate-item-assets
Fix: add missing admin/hardware/table.name key
|
2024-08-13 16:35:25 +01:00 |
|
Florent Bervas
|
20e4ba0590
|
lang: relocated translation key to existing item in general
|
2024-08-13 15:07:54 +00:00 |
|
|
snipe
|
72fd9977e5
|
Merge pull request #15277 from uberbrady/silence_saml_errors
Fixed: [sc-26355] Attempt to de-escalate SAML login and logout errors
|
2024-08-13 15:51:03 +01:00 |
|