Marcus Moore
|
c021609c13
|
Merge branch 'develop' into testing/fmcs-accessories
|
2024-09-18 10:42:58 -07:00 |
|
snipe
|
fcefcc8184
|
Merge pull request #15512 from marcusmoore/testing/fmcs
Added tests for delete methods in api
|
2024-09-18 13:44:44 +01:00 |
|
|
Marcus Moore
|
eb35608bb5
|
Remove call handled by form request
|
2024-09-16 16:35:33 -07:00 |
|
|
Marcus Moore
|
60a54cee79
|
Add tests for delete license endpoint
|
2024-09-16 12:33:30 -07: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 |
|
|
Marcus Moore
|
5299b3e9f0
|
Remove code handled by CompanyableChildTrait
|
2024-09-12 13:29:44 -07: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 |
|
|
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
|
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
|
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
|
56e31d2303
|
Fixed #15366 - use permission for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-22 14:58:09 +01:00 |
|
r-xyz
|
cd7db5c4a8
|
Fix some typos in models file handler.
|
2024-08-21 22:24:08 +02:00 |
|
|
r-xyz
|
4ec361c718
|
Add AssetModel files endpoints to API
|
2024-08-21 19:49:51 +02:00 |
|
|
snipe
|
856c57cb12
|
Corrected some translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-16 12:39:59 +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
|
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 |
|
|
snipe
|
ac1543d568
|
Fixed #15247 - make pie chart on dashboard respect the “show archived” setting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-12 17:54:42 +01:00 |
|
|
snipe
|
ce5be8ac24
|
Merge pull request #15100 from Godmartinz/depreciation_percentage
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 Depreciation Percentage as an option
|
2024-08-12 10:10:25 +01:00 |
|
|
snipe
|
a1ce9b9285
|
Added query scope for ordering by admin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:50 +01:00 |
|
|
snipe
|
9350a20189
|
Include accessories count
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
This isn’t exactly right right now
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:19:47 +01:00 |
|
|
snipe
|
889d5da71e
|
Check for accessories on bulk items
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:04:32 +01:00 |
|
arne-kroeger
|
e8d0147075
|
Adjusted missing down on migration and code smells
|
2024-07-29 19:04:10 +02:00 |
|
|
arne-kroeger
|
b18baf74d2
|
added options to checkout accessoires to locations and assets
Added #14979: add checkout functionality to accessoires
|
2024-07-29 10:54:53 +02:00 |
|
|
snipe
|
57f6ecb1da
|
Added created_by to license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:24:13 +01:00 |
|
|
snipe
|
c3a2cdeee9
|
Added assets endpoint for locations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 20:53:58 +01:00 |
|
Godfrey Martinez
|
c96ccbb6cb
|
Merge branch 'develop' into depreciation_percentage
|
2024-07-24 12:12:28 -07:00 |
|
|
spencerrlongg
|
1139ed676a
|
$id to $asset->id (thanks tests)
|
2024-07-23 13:03:25 -05:00 |
|
|
Spencer Long
|
64be353156
|
Merge branch 'develop' into bug/sc-24884
|
2024-07-23 12:55:19 -05:00 |
|
|
snipe
|
0c933bcc5d
|
Cleaned up controllers, use form requests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 00:25:42 +01:00 |
|
Godfrey M
|
48821f8391
|
updates transformer, api controller
|
2024-07-16 12:58:23 -07:00 |
|
|
snipe
|
00d7b36c36
|
Eager load suppliers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:22:22 +01:00 |
|
|
snipe
|
abd79219dd
|
Use form request to check for valid category
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 15:26:24 +01:00 |
|
|
snipe
|
82743abadc
|
Cleans up the consumables index controller
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 14:15:18 +01:00 |
|
|
snipe
|
5597992d63
|
Fixed API key missing translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 13:17:46 +01:00 |
|
|
snipe
|
1d65781d8d
|
More type-hinting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 07:07:20 +01:00 |
|
|
snipe
|
2a796fdc09
|
Format error
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 03:23:48 +01:00 |
|
|
snipe
|
5ebcc3b1a0
|
More type hinting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 02:36:55 +01:00 |
|
|
snipe
|
ef56f599d2
|
Use asset model request
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 21:52:29 +01:00 |
|
|
snipe
|
e98284fff5
|
Modernized helpers and use statements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:48:35 +01:00 |
|
|
snipe
|
aefaabdb1a
|
Removed non-counts from allowed array
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-03 21:40:43 +01:00 |
|
|
spencerrlongg
|
6f29c0a7cf
|
Merge branch 'refs/heads/develop' into bug/sc-24884
# Conflicts:
# routes/api.php
|
2024-07-02 15:48:39 -05:00 |
|
|
snipe
|
55c98cc27a
|
Check that the user exists before trying to fill the request
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-27 14:05:28 +01:00 |
|
|
snipe
|
7ec44e46ce
|
Added ability check for restoring users at all
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 20:35:28 +01:00 |
|
|
snipe
|
c2e649e2bf
|
Fixed small permissions issue
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 20:07:37 +01:00 |
|
|
snipe
|
e60dbc883c
|
Removed test code
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:42:34 +01:00 |
|
|
snipe
|
9e59bd5687
|
Cleaned up controller code a bit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:33:36 +01:00 |
|
|
snipe
|
dd9e9c7a6d
|
Fixed return types
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 18:49:49 +01:00 |
|
|
snipe
|
dc7b9315b5
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 10:35:54 +01:00 |
|