snipe
|
ce33deed86
|
Remove unused use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:14:34 +01:00 |
|
snipe
|
1e6c172f18
|
Removed unusued use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:14:20 +01:00 |
|
snipe
|
a1ce9b9285
|
Added query scope for ordering by admin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:50 +01:00 |
|
snipe
|
6ec3693030
|
Load admin on actionlog
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:34 +01:00 |
|
snipe
|
71729f0b16
|
Load admin and model on assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-10 17:00:20 +01:00 |
|
snipe
|
f76fbe75e0
|
Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging
Fixed accessories and consumables not being logged correctly during bulk check-in
|
2024-08-08 10:43:59 +01:00 |
|
snipe
|
8094f3c0e1
|
Merge pull request #15245 from spencerrlongg/bug/acceptance_issue
Fixed Issue with Acceptances Being Created
|
2024-08-08 01:22:34 +01:00 |
|
spencerrlongg
|
2412333152
|
added conditional to listener
|
2024-08-07 16:53:06 -05:00 |
|
Marcus Moore
|
d03baa4613
|
Make diff cleaner
|
2024-08-07 13:29:45 -07:00 |
|
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
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
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
|
bee80fcf8a
|
Remove global scope when counting check outs
|
2024-08-06 12:16:06 -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 |
|
snipe
|
31a2765b30
|
Merge pull request #15145 from Godmartinz/purge-storage
Added user storage files to purge command
|
2024-07-31 10:16:08 +01:00 |
|
spencerrlongg
|
437ddc01b4
|
removed extraneous $request->validate() arguments
|
2024-07-30 16:26:24 -05:00 |
|
Godfrey M
|
f19899543d
|
changed error to info
|
2024-07-30 09:18:17 -07:00 |
|
snipe
|
3a2611f8e1
|
Merge pull request #14565 from spencerrlongg/bug/sc-23936
Checks that custom fields exist before saving
|
2024-07-30 11:36:55 +01:00 |
|
Godfrey M
|
53ad312700
|
added missing closing bracket
|
2024-07-29 15:17:32 -07:00 |
|
Godfrey M
|
89d375daad
|
add indents
|
2024-07-29 15:15:41 -07:00 |
|
Godfrey M
|
d46f9776fe
|
remove text
|
2024-07-29 15:14:58 -07:00 |
|
Godfrey M
|
f9a47c8a9f
|
adds a try catch
|
2024-07-29 15:12:48 -07:00 |
|
Godfrey M
|
e395ee1878
|
adds a try catch
|
2024-07-29 15:12:32 -07:00 |
|
snipe
|
4c5b82ae37
|
Merge pull request #15188 from Godmartinz/1d_barcode_select_bug
Fixed 1d barcode targeting.
|
2024-07-29 20:00:21 +01:00 |
|
Spencer Long
|
fd7082c30f
|
Merge branch 'develop' into bug/sc-23936
|
2024-07-29 14:00:00 -05:00 |
|
Godfrey M
|
86049624c7
|
retargeted new label engine to correct 1d column
|
2024-07-29 10:42:26 -07: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
|
c6e709cd36
|
Added parameters
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 12:45:06 +01:00 |
|