snipe
|
cb76815e8b
|
Removed if check on assets, since that’s already handled via validation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-07 09:42:31 -07:00 |
|
snipe
|
4c88c751ef
|
Code cleanup, better validation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 22:03:40 -07:00 |
|
snipe
|
0abb993600
|
General cleanup and standardization for component API
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 22:02:57 -07:00 |
|
snipe
|
4840046f44
|
Check for available quantity on consumables before checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 20:38:02 -07:00 |
|
snipe
|
ffdc0d76f7
|
Fixed accessories verifying that enough remain to be checked out
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 18:40:29 -07:00 |
|
snipe
|
383d48fd9c
|
Merge pull request #12787 from Godmartinz/accessory_unavailable_message
Added unavailable message to prevent over-checkout of Accessories
|
2023-04-06 15:05:18 -07:00 |
|
snipe
|
bd4757ad7a
|
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css
Move from iCheck to pure CSS for radio and checkboxes
|
2023-04-06 14:58:33 -07:00 |
|
Godfrey M
|
3d7c55deb3
|
removed an unncessary query
|
2023-04-06 13:06:05 -07:00 |
|
Godfrey M
|
55943d8897
|
uses numRemaining now
|
2023-04-06 10:05:17 -07:00 |
|
snipe
|
161999fbca
|
Fixed #12772 - use the APP_URL config more consistently
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-05 16:05:40 -07:00 |
|
snipe
|
752365aa85
|
Updated support URL
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-05 14:54:40 -07:00 |
|
snipe
|
9af2d0a6de
|
Merge branch 'develop' into features/replace_icheck_with_only_css
|
2023-04-05 13:04:12 -07:00 |
|
Marcus Moore
|
3054d633b0
|
Improve comments and remove unused imports
|
2023-04-05 12:39:41 -07:00 |
|
Marcus Moore
|
3cc3662992
|
Send webhook notifications for accessory checkins when enabled
|
2023-04-05 12:36:24 -07:00 |
|
Marcus Moore
|
6df8f0f35c
|
Merge branch 'develop' into bug/sc-15034
|
2023-04-05 11:49:53 -07:00 |
|
Godfrey M
|
b038fe8f2e
|
adds unavailable message to overcheckout
|
2023-04-05 10:00:39 -07:00 |
|
snipe
|
ead5293ee0
|
Merge pull request #12765 from spencerrlongg/chore/sc-20230
Change protected $dates to casts
|
2023-04-04 01:29:24 -07:00 |
|
snipe
|
8b315a6502
|
Updated contrller to use trans_choice
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-03 18:55:09 -07:00 |
|
Marcus Moore
|
621d8500eb
|
Merge branch 'develop' into bug/sc-15034
|
2023-03-30 16:17:42 -07:00 |
|
snipe
|
cfef9d8cca
|
Merge pull request #12763 from inietov/fixes/call_to_member_function_licenses_on_null
Fixed Call to a Member Function Licenses() on null [sc-20606]
|
2023-03-30 14:20:13 -07:00 |
|
snipe
|
9ca5285781
|
Merge pull request #12762 from spencerrlongg/feature/sc-20304
Bulk Restore from Deleted
|
2023-03-30 12:37:50 -07:00 |
|
slong753
|
0f72554a9f
|
translations for messages
|
2023-03-30 13:57:18 -05:00 |
|
slong753
|
382d849ee1
|
added catch for no assets selected
|
2023-03-30 13:52:29 -05:00 |
|
slong753
|
8c1c0e81b6
|
rm deplicates
|
2023-03-30 13:31:58 -05:00 |
|
snipe
|
10c1e923dc
|
Merge pull request #12764 from marcusmoore/fixes/importer-fix
Fixes potential unwanted overwrites in asset imports
|
2023-03-30 09:40:58 -07:00 |
|
slong753
|
e126a75f7a
|
pretty sure this was it
|
2023-03-29 21:37:26 -05:00 |
|
Ivan Nieto Vivanco
|
d10b7fd6af
|
Use firstorfail on eloquent query to return error if asset is not found
|
2023-03-29 19:11:28 -06:00 |
|
Marcus Moore
|
0998c70a92
|
Remove unneeded import
|
2023-03-29 16:59:26 -07:00 |
|
Marcus Moore
|
9f8b8f6cc1
|
Remove unneeded variable
|
2023-03-29 16:58:55 -07:00 |
|
slong753
|
e4c76f454c
|
this is good, just needs translations done in view
|
2023-03-29 18:24:56 -05:00 |
|
slong753
|
162b70d5a9
|
wireframed, needs a view and should work
|
2023-03-29 17:34:36 -05:00 |
|
Marcus Moore
|
e05546d1fa
|
Display helpful messages when importing assets
|
2023-03-29 13:23:45 -07:00 |
|
Marcus Moore
|
4cbe683a1a
|
Explicitly cast asset tag to string when querying
|
2023-03-29 11:28:04 -07:00 |
|
Dominik Both
|
3271c9dc9f
|
Fix #8208, #8896, #8985, #9789
|
2023-03-29 09:56:34 +02:00 |
|
snipe
|
c9d1274edc
|
Merge pull request #12753 from snipe/fixes/lang_for_group_not_found
Fixes/lang for group not found
|
2023-03-28 16:45:22 -07:00 |
|
snipe
|
32922e6461
|
Use corrected language string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-28 16:39:52 -07:00 |
|
Ivan Nieto Vivanco
|
77d513f80b
|
Assign target variable as the other checkout types
|
2023-03-28 17:25:57 -06:00 |
|
Ivan Nieto Vivanco
|
d70b7dbf41
|
Checks if exist on API checkout
|
2023-03-28 16:12:48 -06:00 |
|
snipe
|
feef06e7bf
|
Changed log level to debug vs info/error
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-28 06:54:41 -07:00 |
|
Marcus Moore
|
362d5b9fd4
|
Merge branch 'develop' into bug/sc-15034
|
2023-03-27 11:46:30 -07:00 |
|
snipe
|
4d1e28ad03
|
Merge pull request #12727 from snipe/fixes/add_json_to_mimes
Fixed #12641 - added JSON to mimes
|
2023-03-24 07:22:30 -07:00 |
|
snipe
|
150a2b572e
|
Use single “accessory” translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-24 07:14:02 -07:00 |
|
snipe
|
6bc0df73e8
|
Merge pull request #12661 from Godmartinz/gh12655_missing_translations
Adds translations for category types to index and edit of categories
|
2023-03-24 07:09:40 -07:00 |
|
snipe
|
16dcc2d3ed
|
Fixed #12641 - add JSON to mimes
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-24 06:57:43 -07:00 |
|
snipe
|
e869b1fd53
|
Fixed #12724 - fieldset not saving on model
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-24 06:11:24 -07:00 |
|
snipe
|
642d1e9f36
|
Merge pull request #12720 from inietov/fixes/undefined_array_key_266
Fixed Undefined array key 266 rollbar 17086
|
2023-03-24 04:50:47 -07:00 |
|
Marcus Moore
|
fa69a580ab
|
Start to scaffold license checkout notification test
|
2023-03-23 17:18:33 -07:00 |
|
Marcus Moore
|
fc043a35d9
|
Fix checkouts for licenses
|
2023-03-23 17:03:48 -07:00 |
|
Marcus Moore
|
2dcf4e3d16
|
Standardize on sending anonymous notifications for asset checkouts
|
2023-03-23 16:31:40 -07:00 |
|
Marcus Moore
|
1f664709ba
|
Merge branch 'develop' into bug/sc-15034
# Conflicts:
# app/Notifications/CheckoutAssetNotification.php
|
2023-03-23 13:04:40 -07:00 |
|