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 |
|
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 |
|
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 |
|
snipe
|
70d95877d8
|
Translations for license checkout errors
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-16 21:02:58 +01: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 |
|