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
756a2ac25c
Added API tests
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-12 11:58:12 +01:00
7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users
2024-06-12 11:27:26 +01:00
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
c8820adb56
Add two new 'with()' relationships to Users API index query
2024-06-10 13:29:53 +01:00
065a47a446
Use the DeleteUser request
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-05 13:28:44 +01:00
877adb082c
Fixed translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-03 16:40:52 +01:00
cff382605c
Fixed some missing strings and checks
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 04:01:04 +01:00
03b0268dc2
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-01 03:00:45 +01:00
801e58d52e
Removed manual scoping
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-31 06:58:15 +01:00
f48c5ee252
Fix an error message
2024-05-29 22:32:45 +01:00
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
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
bb0a614c39
Update some comments
2024-05-29 22:01:48 +01:00
f11ea79406
Add some sanity checks that the asset actually exists
2024-05-29 22:01:48 +01:00
e817b20840
Fix some responses to be more appropriate
...
Error/success was mixed up
2024-05-29 22:01:48 +01:00
516f766a44
Remove some debug code
2024-05-29 22:01:48 +01:00
f5791c79a5
Change the returns to be API appropriate
2024-05-29 22:01:48 +01:00
194853d860
Remove a redundant line
2024-05-29 22:01:48 +01:00
92670d5711
Add the ability to list files for an asset
2024-05-29 22:01:48 +01:00
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
df1cef59d5
Fixes path for redirect response
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 18:01:40 +01:00
92ba889cae
Updated/removed facades
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:53:51 +01:00
f17162c2e2
Use artisan facade
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:40:05 +01:00
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:38:15 +01:00
4c78da3bbf
Re-add json encoding of permissions
2024-05-28 13:03:09 -07:00
b1cb9259da
Re-use total to avoid duplicate count
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 18:01:47 +01:00
03b5c2e246
Fixed bad translation string
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-28 15:21:28 +01:00
8df9007a8e
Merge branch 'snipeit_v7_laravel10' into develop
2024-05-27 18:08:27 +01:00
8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
2024-05-22 16:09:27 -07:00
6d104251b3
Remove todo
2024-05-22 15:40:54 -07:00
f16c79bb9a
Improve event assertions
2024-05-22 15:38:23 -07:00
c7fa2c04ad
Add scenario
2024-05-22 13:33:12 -07:00
8ca882d1c8
Complete a scenario
2024-05-22 13:23:49 -07:00
4adbd7af4c
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-22 21:02:11 +01:00
bb96a190fd
Moved validator
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-22 12:34:48 +01:00
34f1ea1c0e
Re-order gating and refactor group syncing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-21 10:00:49 +01:00
f633dbba64
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-20 12:55:29 +01:00
c137fafa97
Updated language
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 18:10:43 +01:00
cb22a3d556
Updated comments again :-/
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:52:50 +01:00
c7accb4599
Added comments
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 17:38:42 +01:00
3c4098038d
Fail early if no tag
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-15 16:33:47 +01:00
8c327e6523
Handle user not found properly
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 19:16:56 +01:00
d942b8f1fb
Fixed alias names
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:40:35 +01:00
49dc9767b6
Added debugging :(
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 15:54:43 +01:00
410b547f3c
Added users and locatipon count to API
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:07:28 +01:00
5b02a43957
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-06 18:44:03 +01:00
4224bc0c43
Removed extra settings param
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-02 12:36:57 +01:00
103809b65f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 21:01:43 +01:00
6dc9ccffcd
Refactor api for handling audit/expected checkins
...
Signed-off-by: snipe <snipe@snipe.net >
2024-04-26 18:56:57 +01:00
