DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15269 commits 97 branches 266 tags 291 MiB
Commit graph

15269 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b88f2054dd Refactor isDeletable on companies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 20:38:34 +01:00
snipe d7914e238d Added created by to company on save 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 20:34:54 +01:00
snipe 74088ea581 Optimize isDeletable counts 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 20:13:38 +01:00
snipe f283b5fbe8 Eager load adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:56:39 +01:00
snipe eb6f05faf7 Eager load adminuser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:41:46 +01:00
snipe 118183ff58 Removed footer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:41:39 +01:00
snipe ebf6ce6980 Refactor for fewer queries 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:27:10 +01:00
snipe 5ebf0ed2b2 Updated variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 19:19:14 +01:00
snipe 836893cba5 Added id to report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:35:00 +01:00
snipe cd98b3817d Removed duplicate line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:26:08 +01:00
snipe 727806372c Added created_by to status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:22:11 +01:00
snipe 5e1c736d49 Added created_by for manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 18:04:50 +01:00
snipe 6579fa72da Added scoping for categories and companies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:56:05 +01:00
snipe 82d6e1510f Order by created_by for depreciations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:41:05 +01:00
snipe 822ea96dfd Use auth()->id() instead of Auth::id() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:31:46 +01:00
snipe b247fc33b9 Added legacy comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:28:01 +01:00
snipe 2dcae780c0 Reapply deleted code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:26:21 +01:00
snipe 5c3180ffa0 Removed duplicate code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:25:09 +01:00
snipe 65eba30038 Fixed markdown in acceptance reminder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:23:34 +01:00
snipe bbce7b40ca Additional consistencies 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:20:56 +01:00
snipe 02a29c71ef Added created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:01:48 +01:00
snipe 6699995972 Added created_by to components 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:01:36 +01:00
snipe 951f03094a Added created_by to kits 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 17:01:17 +01:00
snipe 354b00ef15 Made method name consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:45:51 +01:00
snipe c93229179b Added order by created_by to accessories 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:45:39 +01:00
snipe a77a7065d7 Added order by admin to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:34:10 +01:00
snipe 4363e8b34c Updated importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:20:42 +01:00
snipe 9adb2c24f3 Squashed commit of the following: 
commit dddbf27d78
Author: snipe <snipe@snipe.net>
Date:   Wed Sep 18 14:18:52 2024 +0100

    Updated language strings

    Signed-off-by: snipe <snipe@snipe.net>

commit fcefcc8184
Merge: 04bb3eec8 3519a82dd
Author: snipe <snipe@snipe.net>
Date:   Wed Sep 18 13:44:44 2024 +0100

    Merge pull request #15512 from marcusmoore/testing/fmcs

    Added tests for delete methods in api

commit 04bb3eec83
Merge: 154d5d8d9 f963b9a19
Author: snipe <snipe@snipe.net>
Date:   Wed Sep 18 13:41:37 2024 +0100

    Merge pull request #15521 from uberbrady/improve_country_selector

    Fix selected-index of Countries drop-down [fd-44144]

commit f963b9a19f
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Wed Sep 18 13:24:26 2024 +0100

    Fix selected-index of Countries drop-down

commit 154d5d8d91
Merge: 6c996b775 9e5f6d656
Author: snipe <snipe@snipe.net>
Date:   Tue Sep 17 23:40:25 2024 +0100

    Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets

    [Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags

commit 3519a82ddd
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 16:55:20 2024 -0700

    Fix name: TestsFullMultipleCompaniesSupport

commit a629df07bf
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:49:08 2024 -0700

    Implement interfaces on existing test classes

commit 9a13fcab23
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:38:38 2024 -0700

    Pluralize

commit f5705a1dde
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:34:55 2024 -0700

    More unification

commit f325c4afdb
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:32:38 2024 -0700

    Unify assertion method

commit 1fddacd7d0
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:25:11 2024 -0700

    Re-order test methods

commit 4af893df61
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 14:20:24 2024 -0700

    Improve assertions

commit b8b3f91ce4
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:55:18 2024 -0700

    Formatting

commit 7f40f55343
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:52:02 2024 -0700

    Add tests for delete supplier endpoint

commit b06e8d442d
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:37:08 2024 -0700

    Add tests for delete status label endpoint

commit c269184c60
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:29:41 2024 -0700

    Add tests for delete predefined kit endpoint

commit 53c673dee2
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 13:13:12 2024 -0700

    Add tests for delete manufacturer endpoint

commit 50730fc4fb
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 12:37:18 2024 -0700

    Add tests for delete location endpoint

commit 60a54cee79
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 12:33:30 2024 -0700

    Add tests for delete license endpoint

commit 446e962a50
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:38:51 2024 -0700

    Add tests for delete group endpoint

commit 79a4bb7316
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:35:44 2024 -0700

    Add tests for delete depreciation endpoint

commit 2f76c1bc5b
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:33:21 2024 -0700

    Add assertion

commit 38b9f4a438
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Sep 16 10:29:20 2024 -0700

    Add tests for delete departments endpoint

commit 3105f53aff
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 16:54:29 2024 -0700

    Add tests for delete custom fieldsets endpoint

commit 2047cfed09
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 16:20:32 2024 -0700

    Add tests for delete custom fields endpoint

commit e3268d32df
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 16:00:02 2024 -0700

    Add tests for delete consumable endpoint

commit 6df8b0ac0e
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 15:52:07 2024 -0700

    Add tests for delete component endpoint

commit 910f13c1f7
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 15:38:30 2024 -0700

    Add tests for delete companies endpoint

commit 8ce2512f55
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:54:44 2024 -0700

    Add tests for delete category endpoint

commit 0ec415d4d0
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:46:22 2024 -0700

    Clean up

commit 2044570e95
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:39:36 2024 -0700

    Add tests for delete asset model endpoint

commit b336c6273d
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:32:42 2024 -0700

    Pluralize test classes

commit 5299b3e9f0
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:29:44 2024 -0700

    Remove code handled by CompanyableChildTrait

commit 872b76b45f
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:29:10 2024 -0700

    Add tests for delete asset maintenance endpoint

commit 275cf4630e
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:16:37 2024 -0700

    Add tests for delete asset endpoint

commit 5c2660bd34
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 13:02:32 2024 -0700

    Introduce interface

commit c7ae9d9dfa
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Sep 12 12:58:47 2024 -0700

    Add tests for delete accessory endpoint

commit 9e5f6d656a
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Wed Sep 11 15:45:01 2024 +0100

    Improve multi-asset create when using numeric prefixes to asset_tags

Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:06:36 +01:00
snipe 634a4afa75 Fixed 1001 query on license 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:04:54 +01:00
snipe 7650628d30 Removed free seat count from fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 16:00:59 +01:00
snipe 7f690a6238 Fixed variable name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-19 15:58:32 +01:00
snipe 655abe8be5 Fixed requestable user_id 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-18 14:32:59 +01:00
snipe bae9982833 Updated request methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-18 14:18:14 +01:00
snipe abe79df6dc Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-18 13:47:30 +01:00
snipe 1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
snipe 6c996b7759
Merge pull request #15516 from snipe/fixes/fmcs_edit_user
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 check for outside assets on user update validation
 2024-09-17 15:54:11 +01:00
snipe 9e957baeb5 Fixed check for outside assets on user update validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 15:46:45 +01: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 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 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
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