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
snipe
6c17b141db
Removed duplicate locations_id search
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-19 10:35:21 +01:00
snipe
d87da78eb5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2024-06-17 11:18:33 +01:00
snipe
756a2ac25c
Added API tests
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-12 11:58:12 +01:00
snipe
7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users
2024-06-12 11:27:26 +01:00
snipe
1ca9bb5aa8
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api
...
Added #9413 : Asset file upload from API
2024-06-12 11:18:06 +01:00
Brady Wetherington
c8820adb56
Add two new 'with()' relationships to Users API index query
2024-06-10 13:29:53 +01:00
snipe
065a47a446
Use the DeleteUser request
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 13:28:44 +01:00
snipe
877adb082c
Fixed translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-03 16:40:52 +01:00
snipe
cff382605c
Fixed some missing strings and checks
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-01 04:01:04 +01:00
snipe
03b0268dc2
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-01 03:00:45 +01:00
snipe
801e58d52e
Removed manual scoping
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 06:58:15 +01:00
Scarzy
f48c5ee252
Fix an error message
2024-05-29 22:32:45 +01:00
Scarzy
98a94dec29
Change some errors to be 404
...
The asset or file was not found, so 500 wasn't the best choice of error
code
2024-05-29 22:17:36 +01:00
Scarzy
45329912e6
Give a better response to listing no files on an asset
...
HTTP500 was never a good choice. Now it sends back an empty array
2024-05-29 22:01:49 +01:00
Scarzy
bb0a614c39
Update some comments
2024-05-29 22:01:48 +01:00
Scarzy
f11ea79406
Add some sanity checks that the asset actually exists
2024-05-29 22:01:48 +01:00
Scarzy
e817b20840
Fix some responses to be more appropriate
...
Error/success was mixed up
2024-05-29 22:01:48 +01:00
Scarzy
516f766a44
Remove some debug code
2024-05-29 22:01:48 +01:00
Scarzy
f5791c79a5
Change the returns to be API appropriate
2024-05-29 22:01:48 +01:00
Scarzy
194853d860
Remove a redundant line
2024-05-29 22:01:48 +01:00
Scarzy
92670d5711
Add the ability to list files for an asset
2024-05-29 22:01:48 +01:00
Scarzy
8a2ea971e1
Add an API assets files controller
...
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
2024-05-29 22:01:48 +01:00
snipe
df1cef59d5
Fixes path for redirect response
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 18:01:40 +01:00
snipe
92ba889cae
Updated/removed facades
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:53:51 +01:00
snipe
f17162c2e2
Use artisan facade
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:40:05 +01:00
snipe
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:38:15 +01:00
Marcus Moore
4c78da3bbf
Re-add json encoding of permissions
2024-05-28 13:03:09 -07:00
snipe
b1cb9259da
Re-use total to avoid duplicate count
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 18:01:47 +01:00
snipe
03b5c2e246
Fixed bad translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 15:21:28 +01:00
Brady Wetherington
8df9007a8e
Merge branch 'snipeit_v7_laravel10' into develop
2024-05-27 18:08:27 +01:00
Spencer Long
cdb1140f10
Merge branch 'develop' into bug/sc-24884
2024-05-23 13:53:00 -05:00
Marcus Moore
8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
2024-05-22 16:09:27 -07:00
Marcus Moore
6d104251b3
Remove todo
2024-05-22 15:40:54 -07:00
Marcus Moore
f16c79bb9a
Improve event assertions
2024-05-22 15:38:23 -07:00
Marcus Moore
c7fa2c04ad
Add scenario
2024-05-22 13:33:12 -07:00
Marcus Moore
8ca882d1c8
Complete a scenario
2024-05-22 13:23:49 -07:00
Brady Wetherington
4adbd7af4c
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-22 21:02:11 +01:00
snipe
bb96a190fd
Moved validator
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-22 12:34:48 +01:00
snipe
34f1ea1c0e
Re-order gating and refactor group syncing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-21 10:00:49 +01:00
Brady Wetherington
f633dbba64
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-20 12:55:29 +01:00
snipe
c137fafa97
Updated language
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 18:10:43 +01:00
snipe
cb22a3d556
Updated comments again :-/
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 17:52:50 +01:00
snipe
c7accb4599
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 17:38:42 +01:00
snipe
3c4098038d
Fail early if no tag
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 16:33:47 +01:00
snipe
8c327e6523
Handle user not found properly
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 19:16:56 +01:00
snipe
d942b8f1fb
Fixed alias names
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 17:40:35 +01:00
snipe
49dc9767b6
Added debugging :(
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 15:54:43 +01:00
snipe
410b547f3c
Added users and locatipon count to API
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-07 12:07:28 +01:00
Brady Wetherington
5b02a43957
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-06 18:44:03 +01:00
snipe
4224bc0c43
Removed extra settings param
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-02 12:36:57 +01:00
snipe
103809b65f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 21:01:43 +01:00
snipe
6dc9ccffcd
Refactor api for handling audit/expected checkins
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 18:56:57 +01:00
snipe
bf058bd5c6
Use updated scopes
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 14:02:56 +01:00
Brady Wetherington
3f5c5cbe82
Merge branch 'develop' into snipeit_v7_laravel10
2024-04-24 16:24:43 +01:00
spencerrlongg
b11c900a4c
fix bracket, + overwrite required rulesets
2024-04-23 16:29:07 -05:00
Spencer Long
53ccd196d7
Merge branch 'develop' into bug/sc-24884
2024-04-23 13:57:59 -05:00
snipe
bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields
...
Re-enabled updating encrypted custom fields via API [sc-41465]
2024-04-23 10:20:55 +01:00
snipe
4450351b75
Only sync groups if API user is superadmin
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-17 11:06:50 +01:00
snipe
65dd729e19
Additional gates
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-17 10:57:20 +01:00
Brady Wetherington
67a8e0b5c6
This re-enables the ability to update encrypted custom fields via the API
2024-04-15 18:46:11 +01:00
snipe
710370ac24
Added scoping for destroy
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-11 14:58:25 +01:00
snipe
460693c153
Added comment
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-11 14:40:13 +01:00
Marcus Moore
5567a1e9ac
Formatting
2024-04-10 17:37:11 -07:00
Marcus Moore
f28a82de71
Implement some tests, scaffold others
2024-04-10 17:27:07 -07:00
Marcus Moore
7c2fae7b9d
Scaffold api test cases
2024-04-10 17:08:45 -07:00
spencerrlongg
0a90df2b14
alright conflicts resolved
2024-04-03 14:40:14 -05:00
Spencer Long
4ab75c1c03
Merge branch 'develop' into bug/sc-24884
2024-04-03 14:08:41 -05:00
Brady Wetherington
65e21faa3e
Merge branch 'develop' into snipeit_v7_laravel10
...
Hopefully, last merge?
2024-04-02 20:34:04 +01:00
snipe
f42e5d5292
Reverting the store/update asset API responses for now
...
This currently breaks the Jamf integration - need a better longer term plan.
Signed-off-by: snipe <snipe@snipe.net>
2024-03-28 21:58:49 +00:00
snipe
86677b5f13
Make last_checkin sortable
...
Signed-off-by: snipe <snipe@snipe.net>
2024-03-27 20:37:25 +00:00