snipe
|
98323185de
|
Null and warn if editing asset to a non-deployabe state
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-11 16:43:33 +01:00 |
|
Brady Wetherington
|
9e5f6d656a
|
Improve multi-asset create when using numeric prefixes to asset_tags
|
2024-09-11 15:45:01 +01:00 |
|
|
snipe
|
7e14f8c6d6
|
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-09-11 12:25:28 +01:00 |
|
|
snipe
|
ab3b655312
|
Fixed #15483 - show EOL by default
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>
|
2024-09-11 12:25:09 +01:00 |
|
|
snipe
|
601d8d7e5f
|
Merge pull request #15486 from marcusmoore/fixes/custom-field-values
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 a couple bugs in CustomFieldSetDefaultValuesForModel component
|
2024-09-11 09:46:58 +01:00 |
|
Marcus Moore
|
ca01261c1f
|
Merge branch 'develop' into fixes/custom-field-values
|
2024-09-10 16:05:39 -07:00 |
|
Godfrey M
|
15183c4822
|
rephrased the ternary <-correctly spelled
|
2024-09-10 11:05:03 -07:00 |
|
|
snipe
|
fddbdafb99
|
Fixed conflict
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>
|
2024-09-10 19:03:56 +01:00 |
|
|
snipe
|
a5dbece1a9
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2024-09-10 19:00:05 +01:00 |
|
|
snipe
|
4f0f72b29e
|
Fixed 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.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>
|
2024-09-10 18:15:12 +01:00 |
|
|
snipe
|
4183d1834f
|
Pre-release assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-10 18:14:03 +01:00 |
|
|
snipe
|
713bb104ec
|
Merge remote-tracking branch 'origin/develop'
|
2024-09-10 14:46:15 +01:00 |
|
|
snipe
|
4998d60f39
|
Merge pull request #15481 from snipe/localizations/2024-09-10
Updated translations
|
2024-09-10 14:43:27 +01:00 |
|
|
snipe
|
7cf30003b6
|
Updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-10 14:41:08 +01:00 |
|
|
snipe
|
f6bf2d03c4
|
Merge pull request #15445 from Godmartinz/eula_confusion
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 priority for category eula vs default eula
|
2024-09-10 11:04:58 +01:00 |
|
|
snipe
|
6f44441a8b
|
Merge pull request #15469 from marcusmoore/accessory_tests
Added UI tests for creating accessories
|
2024-09-10 11:04:23 +01:00 |
|
|
snipe
|
e7e5dfbdfa
|
Merge pull request #15470 from marcusmoore/company_tests
Added UI tests for creating companies
|
2024-09-10 11:04:08 +01:00 |
|
|
snipe
|
d62315fbe4
|
Merge pull request #15472 from marcusmoore/testing/dashboard_counts
Added test for dashboard counts
|
2024-09-10 11:03:55 +01:00 |
|
|
snipe
|
7f3f77dec8
|
Merge pull request #15473 from marcusmoore/testing/accessory_api_tests
Added some permission tests for accessory api endpoints
|
2024-09-10 11:03:46 +01:00 |
|
|
snipe
|
82e56c6832
|
Merge pull request #15474 from marcusmoore/bug/sc-26730
Fixed login success message not being displayed
|
2024-09-10 09:37:02 +01:00 |
|
|
Marcus Moore
|
76c9015aa9
|
Add test case
|
2024-09-09 16:51:40 -07:00 |
|
|
Marcus Moore
|
5d5f421294
|
Add test case
|
2024-09-09 16:49:43 -07:00 |
|
|
Godfrey M
|
367f02af86
|
more partials and includes
|
2024-09-09 16:34:04 -07:00 |
|
|
Godfrey M
|
7a1c721eca
|
making modal partials for reuse
|
2024-09-09 16:22:56 -07:00 |
|
|
Marcus Moore
|
6423df2133
|
Merge branch 'develop' into fixes/custom-field-values
# Conflicts:
# resources/views/livewire/custom-field-set-default-values-for-model.blade.php
|
2024-09-09 16:07:37 -07:00 |
|
|
Marcus Moore
|
dc6a5bf998
|
Reflash session so login message is displayed
|
2024-09-09 14:54:19 -07:00 |
|
|
Marcus Moore
|
0820dd9da4
|
Update test names
|
2024-09-09 14:36:32 -07:00 |
|
|
Marcus Moore
|
aa6ab2df60
|
Add permission tests for some accessory api endpoints
|
2024-09-09 14:35:38 -07:00 |
|
|
Marcus Moore
|
22a2cc0256
|
Add test for dashboard counts
|
2024-09-09 13:21:10 -07:00 |
|
|
Godfrey M
|
57fab0268b
|
made it a terenary
|
2024-09-09 13:02:25 -07:00 |
|
|
Godfrey M
|
ad5768d8b2
|
fixes margin for the sidebar using rtl languages
|
2024-09-09 12:45:11 -07:00 |
|
|
Marcus Moore
|
35533c39d5
|
Merge branch 'develop' into company_tests
|
2024-09-09 12:18:02 -07:00 |
|
|
Marcus Moore
|
de403f6e07
|
Merge branch 'develop' into accessory_tests
|
2024-09-09 12:17:53 -07:00 |
|
|
snipe
|
549dec9f9e
|
Merge pull request #15468 from marcusmoore/coverage
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 coverage commands for Herd users
|
2024-09-09 20:13:01 +01:00 |
|
|
Marcus Moore
|
d4426e4686
|
Add simple tests for company creation via UI
|
2024-09-09 11:03:00 -07:00 |
|
|
snipe
|
b2a6349243
|
Merge pull request #15465 from snipe/update_city_on_bulk_user_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
Correctly save user’s city on bulk edit
|
2024-09-09 10:06:42 +01:00 |
|
|
snipe
|
c5dbc5f6b8
|
Correctly save user’s city on bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-09 10:01:07 +01:00 |
|
|
snipe
|
7f2cae4f26
|
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-09-09 03:56:05 +01:00 |
|
|
snipe
|
ce97e2a30f
|
Merge pull request #15463 from snipe/consumables_order_by_remaining
Added ability to sort on qty and remaining for consumables
|
2024-09-09 03:54:28 +01:00 |
|
|
snipe
|
7d9a0eba04
|
Added ability to sort on qty and remaining for consumables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-09-09 03:49:58 +01:00 |
|
|
Marcus Moore
|
010f66f4c9
|
Add validation test
|
2024-09-04 15:48:11 -07:00 |
|
|
Marcus Moore
|
9c6718b459
|
Organize
|
2024-09-04 15:46:35 -07:00 |
|
|
Marcus Moore
|
9f832a93c9
|
Ensure user is stored
|
2024-09-04 15:44:52 -07:00 |
|
|
Marcus Moore
|
487d88c012
|
Add some ui tests for accessories
|
2024-09-04 15:43:01 -07:00 |
|
|
Marcus Moore
|
0e9f7153c0
|
Add composer commands for generating coverage reports via Herd
|
2024-09-04 15:13:45 -07:00 |
|
|
Godfrey M
|
7c8955b126
|
revert changes to label view
|
2024-09-04 12:38:35 -07:00 |
|
|
Godfrey M
|
20fa4c39f9
|
adds setEula to support\settings
|
2024-09-04 12:26:44 -07:00 |
|
|
Godfrey M
|
f04a4a3cf5
|
adds test
|
2024-09-04 12:21:49 -07:00 |
|
|
Godfrey M
|
cf07186ae8
|
gives priority to default eula being checked vs catregory eula
|
2024-09-03 12:23:23 -07:00 |
|
|
Marcus Moore
|
51d63d57c6
|
Hide the "Add default values" checkbox if no fieldset selected
|
2024-09-03 12:22:43 -07:00 |
|