Ivan Nieto Vivanco
d2c486bb1e
Create the mail template for the acceptance
2022-08-11 15:28:30 -05:00
Godfrey M
814992eb7d
allows company and location ids to be null
2022-08-11 12:47:40 -07:00
Ivan Nieto Vivanco
267997f0a6
Customize the notifications with the needed data
2022-08-11 14:01:11 -05:00
Ivan Nieto Vivanco
0172fe6403
Add Notifiable trait to the CheckoutAcceptance Model
2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco
509bbbc685
Create Notifications classes for accepted and declined and add some necesary lang strings
2022-08-11 13:01:21 -05:00
Ivan Nieto Vivanco
8cee5060af
Remove unused DB statement
2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco
a7de97f060
Found a better place for the where condition
2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco
c1074000f9
Add a concat to search for full name when the relationship search in the users table
2022-08-10 18:27:28 -05:00
snipe
ef099aa644
Reverted notes to note since pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 16:09:56 -07:00
snipe
acd666fdf5
Added notes to user consumables tab
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:34:07 -07:00
snipe
512348cc5a
Added withInput()
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:15:09 -07:00
snipe
e3293151a2
Added note on checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:04:59 -07:00
snipe
3ec77724d8
Added note pivot
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:04:34 -07:00
snipe
024a014298
Changed notes to note
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:04:19 -07:00
snipe
c1e5d03340
Added pivot for note
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 15:03:41 -07:00
snipe
e7c47408a7
Derp
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 13:57:42 -07:00
snipe
637604dfaf
Fixed #8928 - add URL and ID to custom asset report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 13:51:47 -07:00
Brady Wetherington
b6adfa294c
Fixed the active flag to be as it was in later v5 releases
...
Originally implemented here:
https://github.com/snipe/snipe-it/pull/10610/files
2022-08-10 12:55:30 -07:00
Godfrey M
92e6ea96b2
if eol is missing from asset model monthly depreciation will be recalculated
2022-08-09 15:05:15 -07:00
snipe
bc4032c2cd
Merge pull request #11617 from inietov/fixes/components_wrong_remaining_inventory
...
Fixed wrong calculation of assigned components
2022-08-05 18:05:21 -07:00
Ivan Nieto Vivanco
c055c91739
Change db query for an existing method
2022-08-04 09:20:20 -05:00
Ivan Nieto Vivanco
ea8f12579d
Calculate the proper amount of assigned components
2022-08-04 07:58:25 -05:00
snipe
5f93d7b3be
Merge pull request #11615 from inietov/fixes/autoincrement_in_importer
...
Fix auto incrementing in CSV importer [sc-19366]
2022-08-03 17:50:23 -07:00
Ivan Nieto Vivanco
9f0ecba9b9
Add autoincrementing asset tags to the import if the CSV column is empty
2022-08-03 12:48:48 -05:00
snipe
9acfceba29
Added relations to report search
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 23:50:10 -07:00
snipe
20fcf7a1e9
Added configuration change to maintenance types
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 20:19:43 -07:00
snipe
cc92d342ea
Added deleted at value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:58:37 -07:00
snipe
02caa13222
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:58:30 -07:00
snipe
975b4dee2f
Added deleted header
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:58:17 -07:00
snipe
87bed9b294
Fixed typo in code comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:24:46 -07:00
snipe
ac72b69ece
Update method name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:12:28 -07:00
snipe
8e18ce74b2
Update method name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 19:12:18 -07:00
snipe
1b657ee995
Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout
...
Error 404 fixed on submitting without mandatory field
2022-08-02 17:19:22 -07:00
snipe
71facb1850
Merge pull request #11596 from snipe/fixes/unique_undeleted_for_custom_fields
...
Use unique_undeleted instead of unique for custom fields
2022-08-02 17:16:12 -07:00
snipe
e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports
...
Adds options to include Deleted assets to custom asset reports
2022-08-02 10:33:57 -07:00
Godfrey M
ff080a2d8f
replace checkboxes with radiobuttons
2022-08-02 10:27:55 -07:00
vishalkumar183
96b40a5edd
Error 404 fixed on sumitting witout mandtory field
2022-08-02 18:44:16 +05:30
Katharina Drexel
8596c54d6a
Fixing query order (otherwise you run into app_key exception before anonymous ldap applied).
...
Signed-off-by: Katharina Drexel <katharina.drexel@bfh.ch>
2022-08-02 14:24:00 +02:00
snipe
0fdbd410b6
Use unique_undeleted instead of unique for custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 17:10:39 -07:00
snipe
af7ccf3beb
Handle logout route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:17:40 -07:00
snipe
53ff28d2b0
Handle consumables route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:07:56 -07:00
snipe
4a4636bd03
Handle accessories route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 16:06:28 -07:00
snipe
b035003546
Handled hardware route names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-01 15:59:54 -07:00
Godfrey M
842dafefec
adds options to include Deleted assets to custom asset reports
2022-08-01 14:52:12 -07:00
snipe
78097df7ff
Aplpies current time to checkin date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-21 21:45:25 -07:00
snipe
7313bca403
Checkin without deleting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 17:57:19 -07:00
Katharina Drexel
9d627936e6
Fixed #11509 : Allow LDAP anonymous bind.
2022-07-20 17:24:20 +02:00
snipe
6428dc5cd2
Removed duplicate supplier_id
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-13 13:08:15 -07:00
mikeroq
f21824a8e2
Changed comparing the action type from translated in presenter to actual value
2022-07-12 17:59:03 -05:00
snipe
0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include
...
adds a checkbox to exclude archived assets from custom reports
2022-07-12 12:59:18 -07:00
Godfrey M
27039325f3
removed comments, because I forgot
2022-07-12 12:41:07 -07:00
Godfrey M
58c54cc3dc
uses notArchived scope instead now
2022-07-12 12:20:11 -07:00
Godfrey M
48349071ed
accounts for status_id as well
2022-07-12 09:46:44 -07:00
mikeroq
5efe45226d
Fixes Email List of All Assigned being "successful" when the user has no email
...
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
2022-07-11 20:02:10 -05:00
snipe
bb091760af
Fixedd unclosed brace
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-11 17:11:28 -07:00
Godfrey M
309229619b
fixes the order expiring assets are listed in notifications
2022-07-11 12:25:38 -07:00
Godfrey M
75844c5942
adds a checkbox to exclude archived assets from custom reports
2022-07-11 09:56:58 -07:00
snipe
2518e2f0ee
Removed > 300
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-08 17:09:56 -07:00
snipe
43e370f35a
Move migrations further up
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-08 16:40:51 -07:00
snipe
ee4f355e49
Changed logging to debug
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 17:58:45 -07:00
mikeroq
be8869978d
Added import for Setting model
2022-07-04 07:29:01 -05:00
snipe
92d46edca3
Cleaned up logging output
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 13:33:58 -07:00
snipe
45c616639c
Replicates #11444
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-01 11:21:02 -07:00
snipe
4e547a3639
Fixed typos :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:06:36 -07:00
snipe
b910db0617
Fixed #11393 - reject acceptance if no file is present
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 21:01:58 -07:00
snipe
25cb32ca6a
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 18:51:44 -07:00
snipe
e366caf3d1
Merge pull request #11438 from uberbrady/backout_linear_depreciation_math
...
Revert a change in our Linear Depreciation math
2022-06-30 18:38:03 -07:00
Brady Wetherington
f72aa2415f
Revert a change in our Linear Depreciation math; I think the old algorithm was correct
2022-06-30 18:24:45 -07:00
snipe
4edba064d5
Removed duplicate model column in depreciation report
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 18:17:30 -07:00
snipe
1a423a252b
Derp
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 15:22:58 -07:00
snipe
7591f3f092
Added auth filter check regex
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 15:15:49 -07:00
snipe
2cace3c73a
Added LDAP warnings on page load
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 15:08:12 -07:00
snipe
656efc5f92
Fixed missing trans()
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 14:20:15 -07:00
snipe
2262ef818e
Merge pull request #11427 from Godmartinz/email_users_list
...
[feature] adds button to email user list of assets from profile
2022-06-29 15:25:18 -07:00
Brady Wetherington
2451bb9a2b
Make SCIM be more tolerant of missing fields
2022-06-29 14:48:59 -07:00
Godfrey M
cd9d2d0cec
adds docblock
2022-06-29 13:01:29 -07:00
Godfrey M
e471aa8639
adds button to email user list of assets from profile
2022-06-29 11:15:15 -07:00
snipe
5af6330398
Merge pull request #11417 from ntbutler-nbcs/master
...
[Feature] - Add checkoutByTag API endpoint for assets
2022-06-29 05:03:01 -07:00
snipe
daaf8713d8
Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop
2022-06-29 04:58:26 -07:00
snipe
5b02d9ed06
Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/account/accept/create.blade.php
2022-06-29 04:58:13 -07:00
snipe
b04cf20735
Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop
...
Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]
2022-06-29 04:34:51 -07:00
Nathan Butler
e28e7e37b8
Removed unneeded checks when searching for asset
2022-06-29 17:49:50 +10:00
snipe
b590f29f33
Attempt a download via API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:59:13 -07:00
snipe
1debdc47cf
Backups endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:30:17 -07:00
snipe
53bc15900b
Formatted show api
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:23:55 -07:00
snipe
90fe7af863
Small refactor
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:18:16 -07:00
snipe
67ad24af08
Return token ID in cli
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:13:25 -07:00
Nathan Butler
67e9b7795a
Added asset checkoutByTag API endpoint
2022-06-29 16:11:57 +10:00
snipe
52332bc9ed
Include token ID in payload
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 23:10:56 -07:00
snipe
a711e608c9
Changed siganture to be clearer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:26:37 -07:00
snipe
2f7c04362e
Make -kkey-only a flag
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:20:55 -07:00
snipe
9b6fd7e19a
Set $accessTokenName
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:11:46 -07:00
snipe
9680b02bce
Check that the user has permission to create their own API keys
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:09:18 -07:00
snipe
e7de7d1716
Show user info as well
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:06:46 -07:00
snipe
112f147596
Console script to generate API tokens
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 22:04:39 -07:00
snipe
413487de80
Made method naming consistent
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 21:32:12 -07:00
snipe
1158fa9ea8
Added personal access tokens to api
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 21:29:15 -07:00
snipe
3df9260ca8
Added additional filters for api indexes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 19:59:45 -07:00
snipe
71c8050883
Added additional search filters for location API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 19:07:11 -07:00
snipe
c90ed9f25f
Allow models uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 15:50:07 -07:00
snipe
d8d12d4590
Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync
...
Add a new `--filter` option to Artisan ldap-sync command
2022-06-28 09:50:48 -07:00
Brady Wetherington
be3388d647
Add a new --filter
option to Artisan ldap-sync command
2022-06-27 19:49:59 -07:00
snipe
94e723a88f
Merge pull request #11404 from snipe/features/fix_transliteration
...
Fixed custom field transliteration
2022-06-27 17:42:02 -07:00
snipe
14d8fb66aa
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value
...
Only care about the custom field's converted name when updating the custom field itself
2022-06-27 17:36:26 -07:00
snipe
bf08e73f8f
Removed comments and server side cookie info
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 16:36:09 -07:00
snipe
52bd7d0d68
Merge remote-tracking branch 'origin/develop'
2022-06-27 14:25:38 -07:00
snipe
baad3b9d58
Only care about the converted name when updating the custom field itself
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 14:17:07 -07:00
snipe
131edb611e
Refine output and checks
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 13:54:21 -07:00
snipe
bee694e605
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 09:57:20 -07:00
snipe
d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset
...
Fixes #8155 - improve the workflow during asset creation
2022-06-24 18:53:07 -07:00
snipe
8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating
...
Adds validation to custom fields' default values
2022-06-24 18:11:16 -07:00
snipe
d167d2a10f
Disallow backup deletion and log attempt if not allowed
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-24 15:49:22 -07:00
snipe
77bf28bcb6
Disallow purge
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 20:11:43 -07:00
snipe
86d2c2b153
Small naming changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 19:11:59 -07:00
snipe
f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users
...
Added created_by to users
2022-06-23 18:48:42 -07:00
snipe
0bc3ca5c42
Fixed comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:44:27 -07:00
snipe
9fd3541520
Missed on createdBy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:42:22 -07:00
snipe
3e559044b2
Changed method and scope names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:41:13 -07:00
snipe
1c25057e42
Merge pull request #11379 from Godmartinz/license_acceptance_eula
...
adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf
2022-06-23 18:26:19 -07:00
snipe
9c9f5be6fe
Do not show the creating admin by default in list view
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:28:34 -07:00
snipe
d8daec2e0a
Added created_by results to user index API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:19:30 -07:00
snipe
c9b81d65f1
Save the user id who is creating the user
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:19:08 -07:00
snipe
7f05029089
Added created_by to API output
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:18:31 -07:00
snipe
23c50ea9a5
Added admihn scopes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:18:11 -07:00
snipe
2e5e8f363b
Added admin to oresenter
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:18:04 -07:00
snipe
daf6c72005
Fleshed out comments on new scope
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 16:02:54 -07:00
snipe
d45d322b54
Use scoped query for asset count
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 13:43:23 -07:00
Godfrey M
b0897a1fc9
adds acceptance for consumables and components
2022-06-23 11:52:35 -07:00
Godfrey M
d00b469001
fixed the search for the license
2022-06-23 11:33:36 -07:00
Godfrey M
df76e6eacf
adds eula blade for licenses and fixes assigned_to for dom_pdf
2022-06-23 11:15:15 -07:00
Ivan Nieto Vivanco
7976401aa2
Add error message when the default customfield values can't be validated
2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco
321367b974
Adds validation to custom fields' default values
2022-06-22 21:06:07 -05:00
snipe
89c234b1c2
Merge pull request #11358 from snipe/fixes/missing_token_lang
...
Fixed missing password.token string and checked for user existing before attempting to send reset email
2022-06-22 11:15:08 -07:00
snipe
135fdae209
Merge pull request #11337 from mikeroq/fixes/user_edit_website_missing
...
Fixed #11332 Added website field that was missing from update and store method.
2022-06-22 10:16:38 -07:00
snipe
a7dc6162fa
Simplify password attempts rate limiting
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 09:11:24 -07:00
snipe
1c1f3dc42c
Added password requests cleanup to scheduler
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:35:16 -07:00
snipe
a5b857c753
Return error if token is incorrect
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:30:51 -07:00
snipe
a31bca1798
Check that the user is activated before letting them reset their password
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:48:02 -07:00
snipe
7f8fc7add9
Make SAML debugging less noisy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 17:57:17 -07:00
snipe
6bc525bc25
Merge pull request #11352 from inietov/fixes/assets_transformer_date_customfields_fixes
...
Fixed #11335 Assets transformer date customfields issues
2022-06-21 17:56:17 -07:00
snipe
f4f400ed87
Handle workflow better for invalid users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 16:13:43 -07:00
snipe
a49ccf0863
Removed unused rules
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 16:13:26 -07:00
snipe
300879847f
Added a few comments to make it clearer what’s happening
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 14:33:10 -07:00
snipe
21875100b6
Fixed missing password.token string and checked for user existing before trying to reset
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 14:15:38 -07:00
snipe
675f42401c
Fixed #11343 - ability to null asset name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 10:57:39 -07:00
Ivan Nieto Vivanco
3a5c09c424
Used the getFormattedDateObject() function with the expected parameters
2022-06-20 19:58:51 -05:00
mikeroq
d60af478ad
Added website field that was missing from update and store method.
2022-06-17 08:09:39 -05:00
Mike Roquemore
8a27ef30d5
Missing total argument on transformDeprecations method
...
Removed duplicate array key on transformDeprecation method
2022-06-15 21:52:15 -05:00
snipe
af66f83a3d
Check for blank (not null) values i asset transformer date
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 13:42:30 -07:00
snipe
74bc06cc49
Removed debugging code
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 02:07:58 -07:00
snipe
07bc2fd742
Added maintenance scope for ordering by supplier
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:11:43 -07:00
snipe
a57a6486e7
Only add http:// if the url variable isn’t blank
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:11:13 -07:00
snipe
a33276cb3d
Additional filters on maintenances UI
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:10:48 -07:00
snipe
954b54f914
Removed duplicated $allowed_columns
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 15:06:04 -07:00
snipe
bff34063cd
Merge pull request #11309 from uberbrady/ldap_troubleshooter_improvements
...
Fixed SC-19104 - fixes to ldap:troubleshoot artisan command
2022-06-14 12:24:24 -07:00
Brady Wetherington
1e685ca835
Fixed SC-19104 - fixes to ldap:troubleshoot artisan command
2022-06-14 12:18:42 -07:00
snipe
c3b644797e
Merge pull request #11169 from inietov/fixes/user_update_from_import_location_in_assets
...
Fixes Asset location doesn't change when assigned user's location change via importer
2022-06-14 11:44:26 -07:00
Ivan Nieto Vivanco
50c008ead5
Adds check in condition that format custom dates
2022-06-14 01:37:15 -05:00
snipe
dd9c9520fb
Correctly filter by category_id
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 20:42:21 -07:00
snipe
92bb8fac32
Removed log statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 19:49:14 -07:00
snipe
20a0c4e3b5
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields
...
Fixes #8143 Date localization not working on custom fields
2022-06-13 19:47:20 -07:00
snipe
0153a37cd7
Merge pull request #11264 from snipe/fixes/set_default_ldap_version
...
Fixed default ldap version if not specified
2022-06-13 17:14:57 -07:00
snipe
4c11041477
Fixed regression: missing restore option for assets via API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-09 17:17:38 -07:00
Ivan Nieto Vivanco
f8718ffc1e
Fixes observer fails when creating and assigning asset
2022-06-09 18:08:04 -05:00
Ivan Nieto Vivanco
0c3972d7b7
Add spaces to the code for consistency
2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco
4a0eb2b3f1
Add element type of customfield to API response
2022-06-09 12:57:20 -05:00
snipe
728338bfa8
Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop
...
Fixes Accessories total quantity shows a negative number for develop branch
2022-06-08 10:53:57 -07:00
Ivan Nieto Vivanco
740f27198f
Evaluate if a custom field is a Date to present it with the correct format
2022-06-07 18:00:46 -05:00
snipe
5458676ead
Default to v3 of LDAP on settings save
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 21:00:22 -07:00
snipe
8337628323
Set elvis operator to ensure ldap version is 3 if null
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 20:57:18 -07:00
snipe
7faaa4ce24
Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed
...
Fixes log update action even if no changes are made to assets [sc-19131]
2022-06-06 20:06:19 -07:00
snipe
e0102ddbf0
Fixes #11093 Return true/false for custom fields/fieldsets required in API
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 20:03:20 -07:00
Ivan Nieto Vivanco
1030ad9a27
Early returns if no change is made in the Asset so the 'update' action doesn't log
2022-06-06 22:00:05 -05:00
snipe
8333c80b7a
Added address2 to column selector for locations listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-06 19:31:08 -07:00
Ivan Nieto Vivanco
f977c53ecb
Fixes some issues in the asset observer
2022-06-06 19:14:32 -05:00
snipe
7c77e03c5a
Initial rework of locations display
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 18:08:15 -07:00
snipe
133da6569b
Merge pull request #11252 from snipe/fixes/locations_improvements
...
Fixes/locations improvements
2022-06-05 17:05:25 -07:00
snipe
dba06a3a9e
Check for valid location before trying to print
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 16:56:15 -07:00
snipe
07b1062fb2
Better handle API calls to nonexistent users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 16:55:23 -07:00
snipe
d31f185cce
Display the actual value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:36:52 -07:00
snipe
5901182885
Removed stray character
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:30:34 -07:00
snipe
f033aeda83
Fixed typo in comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:28:00 -07:00
snipe
53f9e2bc7a
Wrap the Carbon method in a try/catch to prevent crashing on bad data
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 15:25:39 -07:00
snipe
910fc08406
Dropped log level to warn on SAML error
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-02 17:07:49 -07:00
Achmad Fienan Rahardianto
fe65de1207
implements cookie to maintain display preference
2022-06-01 11:54:05 +07:00
Ivan Nieto Vivanco
eb34cf7917
Evaluates if logo is uploaded before export PDF
2022-05-31 15:59:01 -05:00
Ivan Nieto Vivanco
37f9cca5ec
Minor stylistic change
2022-05-28 08:11:13 -05:00
Ivan Nieto Vivanco
e0050bc844
Don't let a license to be checked out to a non-existent target
2022-05-26 18:06:53 -05:00
Ivan Nieto Vivanco
1f6ab340a6
Give a more descriptive name to variable
2022-05-25 18:53:17 -05:00
Ivan Nieto Vivanco
f208869aff
Add column to show filenames in Activity Report if the log action is 'uploaded'
2022-05-25 18:50:32 -05:00
Brady Wetherington
8fdedf9441
Downgraded/Removed log statements
2022-05-24 19:30:22 -07:00
Ivan Nieto Vivanco
e0b64a4879
Fixes constraint violation when ordering some columns
2022-05-24 14:00:23 -05:00
Brady Wetherington
5130a86854
Google client-side TLS auth works better with null as context(?)
2022-05-23 20:31:43 -07:00
snipe
8333089278
Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs
...
Accept asset/accessory improvements and fixes
2022-05-23 12:59:01 -07:00
snipe
70344cc02e
Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow
...
Fixed #11129 - settings treeview won't stay active.
2022-05-23 12:55:11 -07:00
Godfrey M
160a147a58
removed line breaks and deadspace
2022-05-23 09:35:19 -07:00
snipe
bd384d3f10
Small formatting fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
ad8143b0bd
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
625f120813
Removed unused cases
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
b7eb72fe49
Rough refactor of the acceptance controller
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
afb3843fad
Added sig and filename to acceptedCheckout method
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
8e85d316c9
Removed stored_eula_file from API transformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
ebd3c11129
Added singleton
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
75acb0f28a
Added sig and eula pdf to checkout_acceptance
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
eb5f33e815
Removed logging statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
adbac82c30
Removed stored_eula_file from actionlog
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
e467ce912b
Added some debugging and comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
4eab5fd075
Removed older comments
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
d0e8a4ca09
Added some comments for clarity
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
snipe
266a9e5328
Removed stored_eula_file from controller
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
Ivan Nieto Vivanco
52901f50eb
Add date to checkout action when importing assets
2022-05-19 17:38:10 -05:00
Ivan Nieto Vivanco
340c59969c
Add query to update assigned assets location when importing users
2022-05-19 13:34:50 -05:00
Ivan Nieto Vivanco
5d29f77d60
Initialize result variable so return don't crash
2022-05-19 12:47:12 -05:00
snipe
4669bb54fe
Small fixes for asset tag regeneration script
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 17:14:22 -07:00
snipe
f609146c29
Corrected field name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 15:37:10 -07:00
snipe
891009dc67
Nicer formatting for buttons in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 15:35:57 -07:00
snipe
014a32b050
Run migrations after restore
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 14:12:17 -07:00
Godfrey M
23891054dc
removed dead space and unused namespace
2022-05-18 13:11:20 -07:00
Godfrey M
cfc4c58da3
fixes the Settings Tree menu to remain active when opened
2022-05-18 13:06:06 -07:00
Ivan Nieto Vivanco
1453b36484
Add filter to only get Assets for the unaccepted assets report
2022-05-18 14:46:48 -05:00
Ivan Nieto Vivanco
32111a863b
Call User::generateFormattedNameFromFullName() in the UserImporter
2022-05-18 13:02:44 -05:00
snipe
b7b21689f2
Merge remote-tracking branch 'origin/develop'
2022-05-18 04:25:23 -07:00
Ivan Nieto Vivanco
a771984619
Add an early return if for some reason the import record is not found
2022-05-18 06:15:46 -05:00
snipe
71828d5461
One more trim…. sigh..
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:53:42 -07:00
snipe
d9817ec696
Added a trim
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:51:53 -07:00
snipe
33ded3f18a
More debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:48:09 -07:00
snipe
004d567253
Added some debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 03:31:00 -07:00
Brady Wetherington
b4a0d33ba8
Reduce logging further; we know the main error condition now
2022-05-17 19:57:42 -07:00
Brady Wetherington
4e65a8d755
Reduce SAML debugging output to actual error conditions
2022-05-17 19:54:14 -07:00
snipe
11db243514
Merge pull request #11135 from uberbrady/improve_restore_erroring
...
Do some better erroring if you can't launch the mysql binary
2022-05-17 18:16:40 -07:00
Brady Wetherington
d391980b06
Do some better erroring if you can't launch the mysql binary
2022-05-17 17:01:23 -07:00
snipe
a8eb138ae0
Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect
...
Fixes #11096 Backup created_at time is incorrect
2022-05-17 14:39:19 -07:00
Ivan Nieto Vivanco
72493d54aa
Show the date and time as the user select in their settings
2022-05-17 16:36:05 -05:00
Ivan Nieto Vivanco
91c7a89f93
Change to use the date() function instead of Helper::getFormattedDateObject()
2022-05-17 16:24:52 -05:00
snipe
11f540daaf
Added debug line
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 09:41:35 -07:00
snipe
0dfc98a493
Force db:wipe
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 04:27:48 -07:00
snipe
7a1b17ff6a
Backslash log:: (we shouldn’t have to do this tho?)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 15:59:41 -07:00
snipe
d4f7b5f80c
Fixed #11100 for individual users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 12:07:18 -07:00
snipe
64b582c657
Merge pull request #11108 from uberbrady/fix_ldap_first_login_password
...
Pass the password along directly instead of retrieving it from the In…
2022-05-16 11:01:35 -07:00
Brady Wetherington
6c86a28d18
Pass the password along directly instead of retrieving it from the Input or Request
2022-05-16 10:58:27 -07:00
Brady Wetherington
b05d85ab0a
Fix bulk-user reset-password links
2022-05-16 10:38:12 -07:00
snipe
1c32dcae9f
Add login note to demo resetter
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-15 10:20:03 -07:00
Brady Wetherington
f608e4586c
Only set manager ID when the lookup succeeds.
2022-05-15 09:25:28 -07:00
Johnson Yi
4401dab8d6
fix saml slo for logout
2022-05-14 11:59:34 +00:00
snipe
3a31104b5c
Fixed #11052 - add file sizes to upload displays
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 19:33:14 -07:00
snipe
333aa05809
Added missing use statement
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 16:46:13 -07:00
snipe
c5ec3efc70
Merge pull request #11065 from snipe/fixes/double_encoding_for_custom_fields
...
Fixed #11014 - double encoding for custom fields
2022-05-13 16:12:24 -07:00
Brady Wetherington
0ddb0f2c81
Switch the barcode backend to SVG, and fix the two-factor middleware
2022-05-13 14:22:27 -07:00
snipe
6fc222a648
Fixed #11014 - Removed double escaping on custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:45:00 -07:00
snipe
deb2d958d8
Sets maxlength of user fields to 191
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 04:54:12 -07:00
snipe
ef1eb15a91
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/permissions.php
2022-05-12 09:31:42 -07:00
snipe
c52faaf23d
Added checkout to permissions check
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-11 19:02:23 -07:00
snipe
446e44deb6
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative
...
Fixed validation for purchase cost allowed to be negative
2022-05-10 17:36:01 -07:00
snipe
780222d372
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
Godfrey M
2c1f368828
adds validation for all purchase costs variables
2022-05-10 16:26:06 -07:00
Godfrey M
33b1ab3658
prevents values for assets being negative through validation
2022-05-10 16:19:06 -07:00
snipe
f4650c65db
Clearer phrasing for log
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 13:00:48 -07:00
snipe
d3830a44d8
Added more verbose messaging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:40:50 -07:00
snipe
5869b6ed0c
And still more debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:38:46 -07:00
snipe
4fccf4ddc4
Few more log lines
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:27:42 -07:00
snipe
646166b2b6
Removed debug line
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:16:07 -07:00
snipe
f4e737eaf3
More SAML debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:14:22 -07:00
snipe
f572eaa421
Added debugging for SAML login
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 12:07:07 -07:00
snipe
dc8669121d
Added license seat ID to the UI
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-09 10:59:06 -07:00
snipe
dfd4d54433
Fixed route name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 15:46:25 -07:00
snipe
220f94faee
Check that the session key exists
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:10:47 -07:00
snipe
22ec3c1398
Use error style instead of warn/info when nothing was selected
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:52 -07:00
snipe
caf17d4f25
Fixed wrong variable name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:41:32 -07:00
snipe
e1b24bb763
Added a comment
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:30:21 -07:00
snipe
adc017db23
Added checkbox to audit listing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:16:13 -07:00
snipe
76213ec3d9
Create a session on bulk actions, store it for redirect, then delete it
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:14:08 -07:00
snipe
243739e9c3
Added missing gate for bulk checkout
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:13:36 -07:00
snipe
784bf4d784
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
2022-05-06 01:52:43 -07:00
snipe
b20921cb62
Removed duplicate session regenerate
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 21:35:05 -07:00
snipe
0939591efb
Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop
...
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop
2022-05-05 13:28:00 -07:00
snipe
a859eac4a0
Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null
...
Fixes QueryException Integrity constraint violation: Column 'order' cannot be null
2022-05-05 13:27:45 -07:00
snipe
953b3a8d6e
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
...
Merge master into develop for RC 6.0.0-8
2022-05-05 10:53:17 -07:00
snipe
5c78a15835
Removed dupe lines from merge conflict
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-03 12:56:29 -07:00
Ivan Nieto Vivanco
37805509da
Adds an integer casting to the order input field so it cannot be null
2022-05-01 15:27:05 -05:00
Ivan Nieto Vivanco
01232d9a54
Adds an integer casting to the order input field so it cannot be null
2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco
ac8da55270
Evaluate if an item still exists before trying to get its name in the report
2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco
1cbbf8f976
Evaluate if an item still exists before trying to get its name in the report
2022-05-01 13:11:05 -05:00
Johnson Yi
92fe1287ea
Do not saml login automatically after normal logout
2022-04-29 15:35:08 +00:00
snipe
9aac1cbba4
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
snipe
2e9cf8fa87
Added access gate to the requested assets index
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-28 15:45:37 +01:00
snipe
f623d05d0c
Escape checkout target name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-24 15:27:11 +01:00
Godfrey M
91694064fb
fixes double updates from action log and history
2022-04-18 11:30:24 -07:00
snipe
b2087a9947
Adds validator to make sure the status ID is deployable
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 13:06:55 +01:00
snipe
6b1329133b
Adds status ID to asset checkout API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 13:06:35 +01:00
snipe
698c7f4904
Fixes potential XSS vuln in user requestable results
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 12:22:20 +01:00
snipe
1441cf9f4f
Ports #10494 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-12 21:04:57 +01:00
snipe
7b891f0952
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations
...
Fixes Bulk user edit not updating checked out asset locations
2022-04-07 19:41:01 +01:00
snipe
8218b5ef47
Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop
...
Fixes Bulk user edit not updating checked out asset locations
2022-04-07 19:40:42 +01:00
snipe
b73542664b
Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am
...
Fixed #10866 - Checkin time always shows 12am
2022-04-07 19:40:11 +01:00
Godfrey M
3eb7a87a66
fixes action_date for check-in not including H:i:s
2022-04-07 11:24:12 -07:00
Godfrey M
1325628039
fixes typo
2022-04-07 11:18:16 -07:00
Godfrey M
8498082f21
fixes typo
2022-04-07 11:16:40 -07:00
Godfrey M
6dc45c189b
removed deadspace
2022-04-07 11:10:36 -07:00
Godfrey M
5d0a1ebb7a
fixes action_date for check-in not including H:i:s
2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco
e1927aa154
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:23:49 -05:00