Marcus Moore
|
41437e4d8f
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-07 13:06:59 -07:00 |
|
snipe
|
7d220dd8c2
|
set default
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:58:04 +01:00 |
|
snipe
|
a99ec062e6
|
Added checkbox for preferences
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:49:07 +01:00 |
|
snipe
|
9350a20189
|
Include accessories count
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
This isn’t exactly right right now
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:19:47 +01:00 |
|
snipe
|
889d5da71e
|
Check for accessories on bulk items
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 20:04:32 +01:00 |
|
snipe
|
5546ab08c2
|
Only delete user records in accessories_checkouts for bulk delete
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 19:53:18 +01:00 |
|
snipe
|
ef183f256c
|
Merge pull request #15242 from Godmartinz/shortcut_option
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Fixed shortcuts to be optional now
|
2024-08-07 18:56:27 +01:00 |
|
Godfrey M
|
6b1784f2ee
|
makes shortcuts optional
|
2024-08-07 10:47:16 -07:00 |
|
snipe
|
a5f075548a
|
Default to user
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-07 18:04:39 +01:00 |
|
Marcus Moore
|
c7ddabcc8b
|
Check for FMCS when checking out component
|
2024-08-06 12:27:15 -07:00 |
|
Marcus Moore
|
f2b78d18a4
|
Merge branch 'develop' into fixes/bulk-checkin-logging
# Conflicts:
# app/Http/Controllers/Users/BulkUsersController.php
|
2024-08-05 17:25:54 -07:00 |
|
Marcus Moore
|
17eccfcd8b
|
Formatting
|
2024-08-05 16:58:27 -07:00 |
|
Marcus Moore
|
01e4382d20
|
Formatting
|
2024-08-05 16:58:17 -07:00 |
|
Marcus Moore
|
1c664af326
|
Remove todo outside of scope
|
2024-08-05 16:58:08 -07:00 |
|
Marcus Moore
|
392d34422a
|
Remove code handled by ConsumableAssignment:: call above
|
2024-08-05 16:57:40 -07:00 |
|
Marcus Moore
|
67b3ab820f
|
Add todo comments
|
2024-08-05 16:10:08 -07:00 |
|
Marcus Moore
|
bfebcdc7ed
|
Improve variable name
|
2024-08-05 15:22:35 -07:00 |
|
Florent Bervas
|
ad794248fe
|
add a warning message if asset tag not found
|
2024-08-05 13:54:33 +00:00 |
|
Florent Bervas
|
b804791ff6
|
feature: extend search capabilities to other assets attributes
|
2024-08-05 12:26:29 +00:00 |
|
Godfrey M
|
854903805b
|
one more spot
|
2024-07-31 12:16:41 -07:00 |
|
Godfrey M
|
b6cac4baae
|
corrects ? usage
|
2024-07-31 12:03:36 -07:00 |
|
spencerrlongg
|
437ddc01b4
|
removed extraneous $request->validate() arguments
|
2024-07-30 16:26:24 -05:00 |
|
arne-kroeger
|
e8d0147075
|
Adjusted missing down on migration and code smells
|
2024-07-29 19:04:10 +02:00 |
|
arne-kroeger
|
b18baf74d2
|
added options to checkout accessoires to locations and assets
Added #14979: add checkout functionality to accessoires
|
2024-07-29 10:54:53 +02:00 |
|
snipe
|
aab29fbb6b
|
Use translated string for restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 16:47:40 +01:00 |
|
snipe
|
e4a82edd3f
|
Merge pull request #15172 from snipe/features/blade_component_for_submit
Use blade component for submit redirect on asset edit/create
|
2024-07-26 15:13:30 +01:00 |
|
snipe
|
ff100c0b9f
|
Added more tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 14:58:10 +01:00 |
|
snipe
|
037cc4d098
|
More tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 14:27:07 +01:00 |
|
snipe
|
cd7f276c40
|
Fixed logging for component
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 13:09:21 +01:00 |
|
snipe
|
5d7f1f77a3
|
Added redirect to checkin/checkout controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:48:07 +01:00 |
|
snipe
|
759ab78f80
|
Added more redirects
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 11:27:36 +01:00 |
|
snipe
|
b6d9f736e3
|
Pulled use session
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:41:28 +01:00 |
|
snipe
|
57f6ecb1da
|
Added created_by to license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 10:24:13 +01:00 |
|
snipe
|
08f4fe5f35
|
Add status messages to redirect
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 22:02:34 +01:00 |
|
snipe
|
73a80a5fbc
|
Use blade component for redirect option
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-25 21:35:13 +01:00 |
|
Marcus Moore
|
44dbbeb608
|
Add accessory and consumable specific checkin methods
|
2024-07-24 14:17:49 -07:00 |
|
snipe
|
c3a2cdeee9
|
Added assets endpoint for locations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 20:53:58 +01:00 |
|
Godfrey Martinez
|
c96ccbb6cb
|
Merge branch 'develop' into depreciation_percentage
|
2024-07-24 12:12:28 -07:00 |
|
Godfrey M
|
d5c9fa823e
|
adds translations
|
2024-07-24 11:39:33 -07:00 |
|
Godfrey M
|
99741db645
|
adds status labels to confirmation emails
|
2024-07-24 11:24:30 -07:00 |
|
snipe
|
293abbd1d0
|
Allow cloning of deleted assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-24 17:49:38 +01:00 |
|
snipe
|
effd273245
|
Merge pull request #14458 from spencerrlongg/bug/sc-24884
Add Form Request and Tests for Update Asset API Method
|
2024-07-23 20:57:47 +01:00 |
|
Brady Wetherington
|
d893de2b7e
|
Merge branch 'develop' into fix_setup_ssl_check
|
2024-07-23 20:24:38 +01:00 |
|
Brady Wetherington
|
7f7cfef81b
|
Mark test as Incomplete, and downgrade error back to debug for tests
|
2024-07-23 20:24:05 +01:00 |
|
spencerrlongg
|
1139ed676a
|
$id to $asset->id (thanks tests)
|
2024-07-23 13:03:25 -05:00 |
|
Spencer Long
|
64be353156
|
Merge branch 'develop' into bug/sc-24884
|
2024-07-23 12:55:19 -05:00 |
|
snipe
|
175862d3c9
|
Added route param to message
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-23 16:37:01 +01:00 |
|
Brady Wetherington
|
5eea08088d
|
Improve .env file checking to not validate SSL certificates
|
2024-07-23 16:03:02 +01:00 |
|
snipe
|
38affea3f3
|
More updates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:57:10 +01:00 |
|
snipe
|
254e2f120b
|
Added clone to consumables
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:40:32 +01:00 |
|
snipe
|
2bfee0c29a
|
Few more tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 16:21:11 +01:00 |
|
snipe
|
8fc5c0b5be
|
Use other default avatar, not in the avatars directory
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 07:34:40 +01:00 |
|
snipe
|
241eb7b031
|
One more bad sig
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 06:06:27 +01:00 |
|
snipe
|
ca399794c3
|
Fixed incorrect signature
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 06:05:01 +01:00 |
|
snipe
|
736d4cc59a
|
Use new deleting method in ImageUploadRequest
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 05:55:34 +01:00 |
|
snipe
|
e373be7dde
|
Skip deleting default avatar from disk on delete
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-20 01:01:27 +01:00 |
|
snipe
|
94619e3284
|
Fixed #15121 - bulk delete restore logging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-19 19:56:58 +01:00 |
|
snipe
|
e328dec9f9
|
Merge branch 'develop' into localizations/more_strings
|
2024-07-18 18:51:17 +01:00 |
|
snipe
|
d9b7df5b85
|
Added form requests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 00:26:42 +01:00 |
|
snipe
|
0c933bcc5d
|
Cleaned up controllers, use form requests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-18 00:25:42 +01:00 |
|
snipe
|
7f412ec3f5
|
Missing string
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:14:41 +01:00 |
|
Godfrey M
|
5bb47e290f
|
validates percentage on store and new depreciations
|
2024-07-16 13:07:12 -07:00 |
|
snipe
|
70d95877d8
|
Translations for license checkout errors
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:02:58 +01:00 |
|
Godfrey M
|
48821f8391
|
updates transformer, api controller
|
2024-07-16 12:58:23 -07:00 |
|
Godfrey M
|
aaa2858337
|
battling with handling depreciation percentage and amount
|
2024-07-16 12:25:19 -07:00 |
|
snipe
|
35160f88e0
|
Corrected return type
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 16:09:08 +01:00 |
|
snipe
|
d21ebc6f0d
|
Fixed return type
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-12 11:04:56 +01:00 |
|
snipe
|
c2fe3b5459
|
Use the observer to delete associated files and detach users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 17:00:38 +01:00 |
|
snipe
|
00d7b36c36
|
Eager load suppliers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:22:22 +01:00 |
|
snipe
|
b10441c928
|
Detach associated pivot records
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:01:18 +01:00 |
|
snipe
|
9676d934d2
|
Drop the with users on the create checkout screen
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 16:00:08 +01:00 |
|
snipe
|
abd79219dd
|
Use form request to check for valid category
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 15:26:24 +01:00 |
|
snipe
|
82743abadc
|
Cleans up the consumables index controller
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-11 14:15:18 +01:00 |
|
spencerrlongg
|
6932a63217
|
make some naming a little clearer
|
2024-07-09 16:32:44 -05:00 |
|
snipe
|
1a1ccd6bdc
|
Type constrains one more time - who thought this was a good idea?
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 19:50:58 +01:00 |
|
snipe
|
34e1ff88db
|
Added StreamedResponse
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 13:41:50 +01:00 |
|
snipe
|
8a547dab20
|
Fixed type constraint
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 13:35:57 +01:00 |
|
snipe
|
5597992d63
|
Fixed API key missing translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 13:17:46 +01:00 |
|
snipe
|
595408d21f
|
On more binaryfile response
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 11:54:07 +01:00 |
|
snipe
|
491a0f3959
|
One more typehint
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-09 11:47:53 +01:00 |
|
snipe
|
bf060d43a7
|
Fixed typehint on assets controller
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 22:02:11 +01:00 |
|
snipe
|
9b838cedd1
|
Fixed typehint on asset model files
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 22:00:45 +01:00 |
|
snipe
|
9c304f238a
|
Merge pull request #15029 from snipe/fixes/small_docblock_fixes
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
|
2024-07-08 17:43:50 +01:00 |
|
snipe
|
202f5077de
|
Removed return
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 17:41:20 +01:00 |
|
snipe
|
eba24b9242
|
Removed custom fieldsets on auditing - it’s not used
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-08 13:19:05 +01:00 |
|
snipe
|
1d65781d8d
|
More type-hinting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 07:07:20 +01:00 |
|
snipe
|
2a796fdc09
|
Format error
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 03:23:48 +01:00 |
|
snipe
|
5ebcc3b1a0
|
More type hinting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 02:36:55 +01:00 |
|
snipe
|
96d1aea54a
|
More cleanup
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 00:54:50 +01:00 |
|
snipe
|
7215746d7a
|
Prevent users from editing category types if there are still items
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-05 00:23:02 +01:00 |
|
snipe
|
d3b62aa918
|
Few more
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 22:52:49 +01:00 |
|
snipe
|
a1eafc108d
|
Moar typehinting
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 22:37:58 +01:00 |
|
snipe
|
ef56f599d2
|
Use asset model request
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 21:52:29 +01:00 |
|
snipe
|
c570759370
|
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 21:14:58 +01:00 |
|
snipe
|
cc6f1cd585
|
Added asset model request :(
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:50:11 +01:00 |
|
snipe
|
ae9085b11f
|
Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:49:22 +01:00 |
|
snipe
|
e98284fff5
|
Modernized helpers and use statements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:48:35 +01:00 |
|
snipe
|
3f20e29901
|
Moved gthe settings for remote loading to the branding section
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 16:55:47 +01:00 |
|
snipe
|
2f3be267b3
|
Added some logic around deleting images
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 16:33:22 +01:00 |
|
snipe
|
9fe26ba814
|
Reverted the validation - might have an impact on quickstart setup
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 13:25:39 +01:00 |
|