DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15637 commits 101 branches 268 tags 320 MiB
Commit graph

15637 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 4af893df61
Improve assertions 2024-09-16 14:20:24 -07:00
Marcus Moore b8b3f91ce4
Formatting 2024-09-16 13:55:18 -07:00
Marcus Moore 7f40f55343
Add tests for delete supplier endpoint 2024-09-16 13:52:02 -07:00
Marcus Moore b06e8d442d
Add tests for delete status label endpoint 2024-09-16 13:37:08 -07:00
Marcus Moore c269184c60
Add tests for delete predefined kit endpoint 2024-09-16 13:29:41 -07:00
Marcus Moore 53c673dee2
Add tests for delete manufacturer endpoint 2024-09-16 13:13:12 -07:00
Marcus Moore 50730fc4fb
Add tests for delete location endpoint 2024-09-16 12:37:18 -07:00
Marcus Moore 60a54cee79
Add tests for delete license endpoint 2024-09-16 12:33:30 -07:00
Marcus Moore 446e962a50
Add tests for delete group endpoint 2024-09-16 10:38:51 -07:00
Marcus Moore 79a4bb7316
Add tests for delete depreciation endpoint 2024-09-16 10:35:44 -07:00
Marcus Moore 2f76c1bc5b
Add assertion 2024-09-16 10:33:21 -07:00
Marcus Moore 38b9f4a438
Add tests for delete departments endpoint 2024-09-16 10:29:20 -07:00
snipe fe5fc6e0ce
Merge pull request #15471 from Godmartinz/Edit_side-panel
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Fixes margin for the sidebar menus while using rtl languages
 2024-09-16 15:56:31 +01:00
snipe 62747a0090
Merge pull request #15493 from Godmartinz/fix_consumables_media_sizing 
Fixed misalignment of consumables with smaller media
 2024-09-16 15:02:55 +01:00
snipe 9ff2111055 Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
2024-09-16 14:52:48 +01:00
snipe b465cc98d8
Merge pull request #15510 from snipe/bulk_users_locale_fix 
Fixed #15504 - allow nulling/not changing locale in user bulk edit
 2024-09-16 14:45:06 +01:00
snipe 4debaaea39 Fixed #15504 - allow nulling/not changing locale in user bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-16 14:31:10 +01:00
snipe 1328366a48 Merge remote-tracking branch 'origin/develop'
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
2024-09-16 12:38:56 +01:00
setpill 4facc4007e feat: Explicitly request LDAP attributes during sync 2024-09-13 17:05:48 +02:00
setpill 31da47e046 refactor: Put LDAP attribute mapping in array 2024-09-13 17:05:28 +02:00
Marcus Moore 3105f53aff
Add tests for delete custom fieldsets endpoint 2024-09-12 16:54:29 -07:00
Marcus Moore 2047cfed09
Add tests for delete custom fields endpoint 2024-09-12 16:20:32 -07:00
Marcus Moore e3268d32df
Add tests for delete consumable endpoint 2024-09-12 16:00:02 -07:00
Marcus Moore 6df8b0ac0e
Add tests for delete component endpoint 2024-09-12 15:52:07 -07:00
Marcus Moore 910f13c1f7
Add tests for delete companies endpoint 2024-09-12 15:38:30 -07:00
Marcus Moore 8ce2512f55
Add tests for delete category endpoint 2024-09-12 13:54:44 -07:00
Marcus Moore 0ec415d4d0
Clean up 2024-09-12 13:46:22 -07:00
Marcus Moore 2044570e95
Add tests for delete asset model endpoint 2024-09-12 13:39:36 -07:00
Marcus Moore b336c6273d
Pluralize test classes 2024-09-12 13:32:42 -07:00
Marcus Moore 5299b3e9f0
Remove code handled by CompanyableChildTrait 2024-09-12 13:29:44 -07:00
Marcus Moore 872b76b45f
Add tests for delete asset maintenance endpoint 2024-09-12 13:29:10 -07:00
Marcus Moore 275cf4630e
Add tests for delete asset endpoint 2024-09-12 13:16:37 -07:00
Marcus Moore 5c2660bd34
Introduce interface 2024-09-12 13:02:32 -07:00
Marcus Moore c7ae9d9dfa
Add tests for delete accessory endpoint 2024-09-12 12:58:47 -07:00
Godfrey M 0bc98e971f refactoring modals with partials and fixing misalignments 2024-09-12 12:26:19 -07:00
snipe 8774da3921
Merge pull request #15492 from snipe/fixes/edit_to_archived_warning
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Fix - warn user on changing status to undeployable when editing
 2024-09-12 16:08:44 +01:00
Godfrey M c6c5cb73cf fixes consumables positioning with smaller media 2024-09-11 10:49:27 -07:00
snipe a97530367d Fixed tests again 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 17:29:22 +01:00
snipe 43250ae881 Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 17:04:09 +01:00
snipe 04e96b8f20 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-11 16:43:41 +01:00
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'
Some checks failed
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details
2024-09-11 12:25:28 +01:00
snipe ab3b655312 Fixed #15483 - show EOL by default
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
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
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
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
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
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
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-10 18:15:12 +01:00