snipe
6c17b141db
Removed duplicate locations_id search
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-19 10:35:21 +01:00
snipe
d0299de898
Merge remote-tracking branch 'origin/develop'
2024-06-18 11:25:55 +01:00
snipe
941582ac2a
Properly scope archived based on settings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-18 10:27:11 +01:00
snipe
05b97db747
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2024-06-18 09:32:30 +01:00
Marcus Moore
796d6909d5
Add missing }
2024-06-17 14:40:06 -07:00
snipe
233e4af7f8
Added base asset models test
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-17 11:57:30 +01:00
snipe
dc1b808a28
Fixed static request
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-17 11:47: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
snipe
c641b733e1
Merge pull request #14834 from bryanlopezinc/AddAppUrlTest
...
Added test for app url config
2024-06-12 11:14:17 +01:00
Brady Wetherington
c8820adb56
Add two new 'with()' relationships to Users API index query
2024-06-10 13:29:53 +01:00
bryanlopezinc
d35e251d6e
Added test for app url config
2024-06-05 21:46:43 +01:00
snipe
5cdb2b7163
Check that the user was not aready deleted
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 14:00:35 +01:00
snipe
d4c080c7e4
Use the form request on the UI controller
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 13:40:32 +01:00
snipe
065a47a446
Use the DeleteUser request
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 13:28:44 +01:00
snipe
de7b8940fe
Merge pull request #14828 from fe80/fix/controller-signature-s3
...
fix(ActionlogController): add missin class Illuminate\Support\Facades…
2024-06-05 09:58:03 +01:00
snipe
09e94ec176
Reordered withTrashed() and find()
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 09:57:24 +01:00
fe80
ea7c3c8485
fix(ActionlogController): add missing class Illuminate\Support\Facades\Storage
2024-06-05 10:55:27 +02:00
snipe
bc36c8074e
Merge pull request #14807 from bryanlopezinc/AddTestToCheckEnvVisibility
...
Added test for .env visibility for setup page
2024-06-05 09:50:54 +01:00
snipe
a742105c21
Merge pull request #14827 from fe80/fix/controller-signature-s3
...
fix(ActionlogController): correct signature image for s3 bucket
2024-06-05 09:40:21 +01:00
fe80
7a76ec9e02
fix(ActionlogController): correct signature image for s3 bucket
2024-06-05 10:08:15 +02:00
snipe
877adb082c
Fixed translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-03 16:40:52 +01:00
snipe
67fb3f10d5
Tightened up tests with better checks
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-01 04:24:47 +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
3f9a80942e
Removed manual companyable from non-API views
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 23:10:23 +01:00
snipe
dc62e393c3
Hotfix for user permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 21:22:21 +01:00
snipe
a15ed6eaee
Wrap disabled <a> links in a span for tooltips
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 19:29:29 +01:00
snipe
cf45e7536f
Redirect with error if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 18:51:58 +01:00
snipe
ca8d478e87
Redirect if model is invalid
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 18:46:32 +01:00
bryanlopezinc
c63c17d49f
Added test for .env visibility for setup page
2024-05-31 17:33:57 +01:00
snipe
801e58d52e
Removed manual scoping
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 06:58:15 +01:00
snipe
aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset
...
Added Redirect options to asset check in/out
2024-05-30 14:14:04 +01:00
snipe
a46e2ebfd8
Small tweaks to user export, user view translations
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-30 13:59:00 +01:00
snipe
f710b1aac3
Merge pull request #14614 from akemidx/feature/sc-19796
...
ADDED: Export User Permissions (Superuser & Admin)
2024-05-30 13:41:26 +01:00
snipe
f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset
2024-05-30 13:38:11 +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
12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout
...
Bulk Consumable Checkout
2024-05-29 19:42:25 +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
bryanlopezinc
5d01a06245
Reduce IDE errors in App\Http\Controllers\SettingsController
2024-05-29 08:07:49 +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
snipe
485caf1d92
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout
...
Added tests around asset checkout
2024-05-25 11:33:33 +01:00
Spencer Long
cdb1140f10
Merge branch 'develop' into bug/sc-24884
2024-05-23 13:53:00 -05:00
snipe
8b3ff5a82d
Handle potentially deleted admin users in license export
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-23 08:39:15 +01: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
4bb7c1701f
Fiddled with storage facade a little more
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-22 17:44:49 +01:00
snipe
5fd0f56258
Use proper storage facade for checking if the file exists
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-22 17:38:49 +01:00
snipe
37d7e89e93
Fixed error message
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-22 17:29:43 +01:00
snipe
3ab197075a
Nicer handling of erroring when filename+log do not match
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-22 17:20:03 +01:00
snipe
bb96a190fd
Moved validator
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-22 12:34:48 +01:00
Godfrey M
f2693ee957
conditionally fixed redirect select option
2024-05-21 14:08:35 -07: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
Godfrey M
a53f89cd2c
remove license checkout changes p2
2024-05-20 10:26:45 -07:00
Godfrey M
280c03dcad
remove license checkout changes
2024-05-20 10:25:59 -07:00
Godfrey M
e70fb42f87
remove license redirects
2024-05-20 10:22:01 -07:00
Brady Wetherington
f633dbba64
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-20 12:55:29 +01:00
snipe
771c85e347
Translated account save message
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-20 11:19:31 +01:00
snipe
54b24434e1
Set file name variable
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 19:56:58 +01:00
snipe
81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form
2024-05-16 16:13:21 +01:00
snipe
09914f508f
Removed more debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 15:16:52 +01:00
snipe
de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance
...
Adds a note text area to asset acceptances/declines
2024-05-16 15:06:05 +01:00
Godfrey M
fb9a5f928f
removed license changes
2024-05-15 16:39:26 -07:00
snipe
55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug
...
Fixed user assets not updating when a user changes location
2024-05-15 19:20:14 +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
c1d5b8713b
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 16:33:48 +01:00
snipe
8310b91e00
Use UploadFileRequest for audit files
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 16:33:48 +01:00
snipe
e5653eaa93
Save new data
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 16:33:47 +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
eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912
...
Bulk Edit Tests and Tweaks
2024-05-15 11:22:31 +01:00
Godfrey M
dc418a7033
need to make variables names uniform
2024-05-14 14:09:54 -07:00
Godfrey M
15cc4345ab
adds dynamic redirects to Assets
2024-05-14 13:25:52 -07:00
Godfrey Martinez
5272824d85
Merge branch 'develop' into asset-location-update-bug
2024-05-13 10:47:25 -07:00
snipe
9bce0f2ff7
Format fix
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-13 18:19:14 +01:00
spencerrlongg
ad2ba252ee
two new test
2024-05-07 15:11:33 -05:00
spencerrlongg
17ef20ea92
alright, in a working place
2024-05-07 14:08:47 -05: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
Godfrey M
c94a7613ca
dropdown redirect options, helper function and session variable added
2024-05-02 12:16:20 -07:00
snipe
4224bc0c43
Removed extra settings param
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-02 12:36:57 +01:00
spencerrlongg
e177993bcc
notes and some playing around, push for eod
2024-05-01 16:57:11 -05:00
spencerrlongg
25480293dc
change keys to values, add test
2024-04-30 18:03:26 -05:00
snipe
103809b65f
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 21:01:43 +01:00
snipe
3f04afee5c
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 19:01:26 +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
snipe
2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button
...
Added a License Export function and button
2024-04-24 04:42:56 +01:00
spencerrlongg
b11c900a4c
fix bracket, + overwrite required rulesets
2024-04-23 16:29:07 -05:00
akemidx
ac4aa97103
develop reheading
2024-04-23 17:05:50 -04:00
akemidx
0bc93c6a1e
space
2024-04-23 15:31:37 -04:00
Spencer Long
53ccd196d7
Merge branch 'develop' into bug/sc-24884
2024-04-23 13:57:59 -05:00
snipe
685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels
...
Removed encrypted fields from label options
2024-04-23 13:31:38 +01: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
Godfrey M
96b3af7cbc
fixed view from sending all custom fields
2024-04-22 18:27:34 -07:00
Godfrey M
5fc6771543
adds licenses available, updated teranslations
2024-04-22 17:58:49 -07:00
akemidx
0d049a0be7
conflict resolution
2024-04-22 20:09:40 -04:00
akemidx
01c24ab4cd
translating text
2024-04-22 19:16:14 -04:00
Godfrey M
14ddf36d46
removed two duplicate translations
2024-04-22 10:43:11 -07:00
Godfrey M
25f1167c9d
adds company scoping to license export
2024-04-22 10:38:55 -07:00
snipe
2aa3ce15bd
Removed escaping on notes for file uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-22 14:55:02 +01:00
akemidx
e8d9701a26
array key existing
2024-04-17 19:16:25 -04: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
9bb15aaf1b
Added individual gates to keep response consistent with other company-ed things
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-17 10:57:49 +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
ed0a441e4d
Refactor destroy method
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-11 14:52:03 +01:00
snipe
460693c153
Added comment
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-11 14:40:13 +01:00
snipe
f54a94bd4c
Refactorered methods
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-11 14:40:00 +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
Marcus Moore
4434de6241
Add test case
2024-04-10 15:47:26 -07:00
Godfrey M
a2bca0e358
fixed comments
2024-04-10 15:05:21 -07:00
Marcus Moore
7dbf8a8a8e
Add tests for asset and location check out
2024-04-10 13:28:52 -07:00
Godfrey M
0849262243
fixed notes
2024-04-10 12:19:34 -07:00
Godfrey M
17095feb33
fix typo
2024-04-10 12:15:48 -07:00
Godfrey M
f42ae46338
exports all licenses
2024-04-10 12:14:44 -07:00
Godfrey M
e2679852ce
added export button, half the logic for export method
2024-04-10 11:31:30 -07:00
Marcus Moore
deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
2024-04-10 11:01:35 -07:00
snipe
adacdc038d
Apply company scoping for users
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-10 12:34:32 +01:00
snipe
e11287ec25
Redirect on checkin if the asset is already checked in
...
Signed-off-by: snipe <snipe@snipe.net>
2024-04-04 15:00:55 +01:00