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
snipe
45cfec5b29
Merge pull request #14797 from bryanlopezinc/AddTestsForSettings
...
Added test for setup page
2024-05-31 02:31:35 +01:00
Marcus Moore
5a9a231359
Remove alpinejs
2024-05-30 16:57:20 -07: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
snipe
ee8931f886
Merge pull request #14799 from marcusmoore/chore/remove-unused-component
...
Removed unused Livewire component
2024-05-31 00:54:43 +01:00
Marcus Moore
1a1b891309
Remove unused Login Livewire component
2024-05-30 16:49:05 -07:00
Marcus Moore
2eaac3d381
Fix select2 re-renders
2024-05-30 16:20:04 -07:00
Marcus Moore
f03249898a
Update id syntax in custom fields component
2024-05-30 16:12:52 -07:00
snipe
0981cfa902
Built assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-30 20:22:50 +01:00
snipe
37fbcfa22b
Merge pull request #14798 from Godmartinz/redirect_back_to_asset_fix
...
Fixed checkin option from appearing
2024-05-30 19:41:02 +01:00
Godfrey M
0ee441a976
adds hidden as well
2024-05-30 11:19:06 -07:00
Godfrey M
cf8de3baa9
fix checkin option from appearing
2024-05-30 11:11:35 -07:00
bryanlopezinc
404ee238a3
Added test for setup page
2024-05-30 14:37:24 +01: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
snipe
bed8861179
Merge pull request #14796 from snipe/chore/sc-25715/axios
...
Upgraded axios
2024-05-30 13:17:23 +01:00
snipe
180d7b1b5b
Upgraded axios
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-30 13:13:25 +01:00
snipe
386416ee5d
Merge pull request #14795 from snipe/bug/sc-25687/papaparse
...
Upgraded papaparse
2024-05-30 13:04:00 +01:00
snipe
6b5aa91f3d
Upgraded papaparse
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-30 13:00:57 +01:00
Marcus Moore
e80b80f5d1
Remove manual livewire tags
2024-05-29 16:04:05 -07:00
Marcus Moore
9e35441281
Importer fixes
2024-05-29 15:50:42 -07:00
Godfrey M
e28ad50bec
fixes the color change
2024-05-29 15:34:08 -07: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
Marcus Moore
7d95e7765d
Add a few .prevents
2024-05-29 14:13:29 -07:00
Marcus Moore
ee75b30683
Enable legacy_model_binding
2024-05-29 14:06:27 -07:00
Scarzy
ca9d4e3155
Get the tests for download and delete working
2024-05-29 22:01:49 +01:00
Scarzy
633bcbb6c4
Get the file upload test working
...
Added the upload functionality to the get and delete tests, but I
currently don't seem to be able to reference the correct file ID
2024-05-29 22:01:49 +01:00
Scarzy
2d4af61e6c
Begin to add some tests
...
There is currently only really a test for listing, and only for the
empty list response
2024-05-29 22:01:49 +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
b9d56a8ecc
Fix some routes
...
Names of some of the routes overlapped with others in an incompatible
way. This makes the names more distinct
2024-05-29 22:01:48 +01:00
Scarzy
91c1e53e52
Fix the test file location
2024-05-29 22:01:48 +01:00
Scarzy
73a87a8ea8
Add the framework of a test
2024-05-29 22:01:48 +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
f6a1a76095
Add an endpoint for deleting a file
2024-05-29 22:01:48 +01:00
Scarzy
bbb9145744
Add an API endpoint to download files
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
8d924b60d7
Replace references to @this in importer
2024-05-29 13:51:57 -07:00
Marcus Moore
34595c266d
Update script tag
2024-05-29 13:16:30 -07:00
