snipe
e19922abd0
Cleaned up UI controller
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-22 18:49:35 +01:00
snipe
c6a0212384
Merge remote-tracking branch 'origin/master' into develop
2024-06-22 17:33:12 +01:00
snipe
e03614d91b
Added withtrashed back in
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-22 16:40:32 +01:00
snipe
b82770d0a8
One more small fix
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-22 16:38:29 +01:00
snipe
55e1326164
Fixed #14935 - user does not exist
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-22 16:24:18 +01:00
snipe
665aa6eb23
Merge pull request #14924 from snipe/fixes/possible_nicer_handling_for_defaultStatusLabel
...
Possible fix for #14915 - error on import when status label is not provided and no deployable statuses can be found
2024-06-21 21:37:22 +01:00
snipe
3531256c3f
Fixed deprecations
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-21 21:06:43 +01:00
snipe
9a0db72eb4
More strings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 15:40:38 +01:00
snipe
e11a42cf68
Re-use login string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 15:32:00 +01:00
snipe
9594596b8a
Fixed another hard-coded string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 15:22:27 +01:00
snipe
69cf697aa3
Added 2fa translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 15:20:52 +01:00
snipe
45dbe5cb77
Return the id, not the entire status label
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 15:05:38 +01:00
snipe
a1ff35f6ce
Possible fix for #14915
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 14:47:46 +01:00
snipe
30c1e1e86a
Merge remote-tracking branch 'origin/develop'
2024-06-20 14:32:46 +01:00
snipe
8f8a5c639b
Updated profile translation string path
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 14:09:25 +01:00
snipe
c8835bf5db
Merge remote-tracking branch 'origin/develop'
2024-06-20 13:40:37 +01:00
snipe
6dfedac7a7
Merge pull request #14912 from bryanlopezinc/addIsWritableTest
...
Add storage path permissions test
2024-06-20 13:38:56 +01:00
snipe
bd1f43f9ee
Added lastname.firstname as email format
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-20 13:36:48 +01:00
bryanlopezinc
203b60383f
Added storage path permissions test for SettingsController@getSetupIndex
2024-06-19 17:46:59 +01:00
snipe
61ced0b221
Merge remote-tracking branch 'origin/develop'
2024-06-19 11:41:11 +01:00
snipe
ae7675fee0
Added audit date validation back in
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-19 11:37:15 +01:00
snipe
66ed26fbf9
Merge remote-tracking branch 'origin/develop'
2024-06-19 11:13:47 +01:00
snipe
7099358985
Added accessor/mutator
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-19 11:11:50 +01:00
snipe
9a706b3e3e
Removed datetime validation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-19 11:05:31 +01:00
snipe
71c9b03779
Fixed incorrect field name
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-19 11:05:22 +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
20d5587851
Merge remote-tracking branch 'origin/develop'
2024-06-19 10:23:18 +01:00
Marcus Moore
f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# composer.lock
2024-06-18 15:10:46 -07:00
snipe
d9f70c16f7
Possible fix proxy/reverse proxy
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-18 14:44:35 +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
cb6ea2c6fb
Merge remote-tracking branch 'origin/develop'
2024-06-18 09:59:43 +01:00
snipe
2f59bb74cd
Prefaced fields with “users” for clarity
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-18 09:52:41 +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
Marcus Moore
d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# resources/views/livewire/oauth-clients.blade.php
2024-06-17 12:57:04 -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
Marcus Moore
c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3
2024-06-12 15:12:40 -07:00
snipe
cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks
...
Importer tweaks
2024-06-12 12:51:11 +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
Marcus Moore
c51b7d7104
Inline variable
2024-06-10 12:22:23 -07:00
Brady Wetherington
c8820adb56
Add two new 'with()' relationships to Users API index query
2024-06-10 13:29:53 +01:00
snipe
0f4c6dd5b0
Merge pull request #14830 from snipe/chore/sc-25756/better_validation_for_relations_on_delete
...
Better validation for relations on delete
2024-06-07 18:10:41 +01:00
bryanlopezinc
d35e251d6e
Added test for app url config
2024-06-05 21:46:43 +01:00
snipe
871255f28c
Fixed #14812 - added consumables to individual inventory report
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 20:40:45 +01:00
snipe
7ac315e1eb
Fixed tests
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 14:50:45 +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
5bd9ecb8df
Created DeleteUser request
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 13:28:37 +01:00
snipe
1cdec61be6
Use more modern mutator/accessory syntax
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:56:54 +01:00
snipe
b0ddb26e73
Fixed variable name, $field
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
9d9ad86dd5
Added mutators and accessors for dates
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
afe4e5d62e
Added date parser
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
52950f1322
Refactored date parsing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
026c80992e
Pull the log reference
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
0ee2b74ff3
Added date parsers for new date fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
3a0f7eca54
Put asset EOL date back in the Item Importer
...
I have no idea why this is necessary
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
4ccbfb56a4
Make sure the status label is deployable
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
d02904c9a3
Added new fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
c8279c0b99
Moved asset-only date stuff into the asset importer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
f4f184e115
Removed noisy debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +01:00
snipe
b2a86e312b
Added last_checkout and last_checkin as fillable
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-05 10:28:35 +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
9fccafa3ac
Merge pull request #14816 from uberbrady/hotfix_autoincrement_workaround
...
Don't save next autoincrement base if it's going to fail, next
2024-06-05 09:47:40 +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
Marcus Moore
99439f0a5c
Define property
2024-06-04 16:14:07 -07:00
Marcus Moore
5eb5742b3d
Define property
2024-06-04 15:49:39 -07:00
Marcus Moore
296cf3e34b
Update OauthClients component
2024-06-04 15:37:41 -07:00
snipe
6229d0c616
Merge pull request #14758 from U-H-T/features/add_logo_support_for_Brother_TZe24
...
add logo support for Brother TZe24mm labels
2024-06-03 17:02:18 +01:00
snipe
877adb082c
Fixed translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-06-03 16:40:52 +01:00
Brady Wetherington
90818bb147
Don't save next autoincrement base if it's going to fail, next
2024-06-03 15:58:57 +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
b156264684
Tidied up scoping to be better for testing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 23:10:53 +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
06e9625c64
Use hasUser() to avoid table collisions and infinite loop
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 06:58:07 +01:00
snipe
5800e8d8e9
Added companyable trait
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 06:57:34 +01:00
snipe
623aa58163
Removed unused statement
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-31 06:57:25 +01:00
Marcus Moore
1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3
...
# Conflicts:
# app/Livewire/LoginForm.php
# package.json
# resources/views/livewire/login-form.blade.php
2024-05-30 16:56:50 -07:00
Marcus Moore
1a1b891309
Remove unused Login Livewire component
2024-05-30 16:49:05 -07:00
snipe
5a5d171ba2
Put session facade back - derp
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-30 14:15:08 +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
Marcus Moore
17f0ac1eae
Set view correctly
2024-05-29 12:57:43 -07:00
Marcus Moore
8ff639913d
Migrate away from dispatchBrowserEvent()
2024-05-29 12:17:36 -07:00
Marcus Moore
b52380f376
Migrate to new namespace
2024-05-29 12:07:48 -07: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
8ac3937bf4
Commented model loading on asset model
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 18:03:19 +01:00
snipe
1c1729854e
Use statics for location, supplier, etc
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 18:02:22 +01:00
snipe
14c78d9065
Use static for custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 18:02:09 +01: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
snipe
3df2a4a70b
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 15:16:44 +01:00
snipe
6b41970e97
Check that selected is an array
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 15:15:31 +01:00
snipe
92eb6eb1b6
Add unique constraint to name
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-28 15:09:31 +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
Godfrey M
442903ea5e
trying to get link to work, fixed up markup and url
2024-05-23 16:08:18 -07:00
Godfrey M
d3ab152d30
adds reminder notification constructor and updates markdown
2024-05-23 12:47:02 -07:00
U-H-T
2777ac96cc
add logo support for Brother TZe24mm labels
2024-05-23 11:10:23 +02: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