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
