snipe
2c5a0d370c
Clean up API byserial and bytag, allow deleted param
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:33:56 +00:00
snipe
bcbe517446
Added ability to include deleted items in tag search endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:18:09 +00:00
lukasfehling
d9a9bd1c0d
Added a api endpoint for sending email notifications to users with their assigned assets
2022-11-15 18:17:51 +01:00
snipe
9a5d431962
Allow searching firectly for asset tag and serial
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-15 17:13:26 +00:00
snipe
56c4fa7c27
Override display settings if field is encrypted
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-14 22:41:31 +00:00
snipe
1e34398c99
Permissions check on the field itself
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-10 17:19:12 +00:00
snipe
1fa624420e
Removed unneeded relationships
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-10 16:46:49 +00:00
snipe
52dc5aa4ba
Added field to controller and tranformer
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-08 15:26:59 +00:00
snipe
04b6f023ae
Use new upload string
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-03 13:57:50 -07:00
snipe
3c7d63c060
Disallow uploads if app is locked
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-03 13:52:23 -07:00
snipe
eb81c290dc
Accessory file upload
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:50:39 -07:00
snipe
97aeb1fcec
Use the generic file uploads strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:31:23 -07:00
snipe
f1cb7ee410
Fixed some translations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:28:39 -07:00
snipe
84c0f50266
Added ComponentFilesController
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:10:04 -07:00
snipe
2106b64da6
Fixed some layout issues
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:06:49 -07:00
snipe
25f69a7bd2
Added consumable methods for uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 17:52:28 -07:00
snipe
7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp
...
Fixed (?) method name?
2022-10-26 17:39:11 -07:00
snipe
c1eee2cc72
Corrected string for invalid current password
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 12:18:29 -07:00
snipe
12c7223bcd
Renamed column back to assets_count for legacy
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 09:39:03 -07:00
snipe
28b0d8cf0f
Null expected_checkin on user bulk checkin and delete
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 00:54:37 -07:00
snipe
e670ffe349
Added Assets Assigned to tab
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 00:16:06 -07:00
snipe
4eed2baa31
Added default tab to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-20 19:06:58 -07:00
Godfrey M
f2d4a61e3c
removes dead space
2022-10-18 15:31:37 -07:00
Godfrey M
3f25a1bf61
removes dead code
2022-10-18 15:25:38 -07:00
Godfrey M
f9ac447dd1
adds default group to LDAP
2022-10-18 15:18:09 -07:00
snipe
98f2e0271b
Merge pull request #11942 from nh314/develop
...
Correct comparison logic
2022-10-12 10:55:29 -07:00
snipe
0312ecf09d
Sets nullable attribute on validation
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-12 10:30:47 -07:00
Phan Nguyen
8ff109e9da
Correct comparison logic
...
Comparison operator should be greater than or equal
2022-10-08 12:54:15 +07:00
snipe
14b7319b63
Added start/end to sortable columns
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 17:07:07 -07:00
snipe
f7a9be92ca
Store data for start and end
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:58:26 -07:00
snipe
56ba8a7e24
Added API select fields and filters
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:58:16 -07:00
snipe
bcebc1e33b
Stylistic refactoring
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 16:37:33 -07:00
snipe
891b5b2882
Added routes, language
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 15:45:25 -07:00
Ivan Nieto Vivanco
25c10c3819
Filter non-asset items from download unaccepted assets report
2022-10-03 18:12:30 -05:00
snipe
b07c4caa37
Extra whitespace
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-30 11:47:27 -07:00
snipe
5a7e35c0e8
Made a conditional escape according to .env
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-30 09:48:43 -07:00
snipe
bae200edd7
Use EscapeFormula() in CSV export
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-30 09:29:17 -07:00
snipe
70c766e8b3
Added setting to choose dashboard type
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 04:16:46 -07:00
snipe
0b2ce7be07
Fixed #11521 - switch to using status meta from status label name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 03:48:58 -07:00
Ivan Nieto Vivanco
c0f83a7927
Delete not necessary conditional
2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco
5a1062f0f4
Delete debugging symbols (just kidding, it's just a dd() function)
2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco
c32676596c
Redirect correctly if not enough license seats exists to be checkout
2022-09-20 18:55:53 -05:00
snipe
dcab1381e7
Check for licenses.files permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-16 14:00:27 -07:00
Ivan Nieto Vivanco
41b75704e3
Removes format when changing to custom fields elements that doesn't need it
2022-09-15 11:21:02 -05:00
snipe
3192a68b06
Pulled assetlog from custom report controller
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-14 18:17:52 -07:00
Godfrey M
9b448227f7
tinkering to no avail
2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco
3aff97ace1
Remove the previous user hashed password
2022-09-06 18:43:35 -05:00
snipe
ae505ef44d
Literally have no idea how this ever worked
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-31 19:20:35 -07:00
Godfrey M
193b31e427
select options working, testing sync then done
2022-08-31 12:58:33 -07:00
snipe
dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance
...
Send notifications when Acceptance Assets actions occur [sc-9917]
2022-08-30 12:14:58 -07:00
Godfrey M
0c362e8b57
gets the groups selector to appear but options are blank
2022-08-29 12:09:56 -07:00
snipe
96ec96ff7f
Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule
...
Fixed Validation error when empty default customfield values
2022-08-25 17:54:04 -07:00
Ivan Nieto Vivanco
0d4e9c183b
Save correct id in action log if the bulk-checkin is of type license
2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco
1ff2d15c4a
Replace 'required' rule with 'nullable' to allow blank default customfields values
2022-08-25 18:16:50 -05:00
Godfrey M
fc6fefdb4e
adds migration, variables, checkbox,working on groups
2022-08-25 15:19:38 -07:00
snipe
482a7b2a3a
Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500
...
Fixed 500 error when sending unaccepted assets reminder
2022-08-25 14:00:00 -07:00
snipe
6fde72a693
Log user out of other devices when they change their password
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-25 12:24:26 -07:00
Ivan Nieto Vivanco
6e85c2e5cb
Delete unused import
2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco
30d0125cbd
Remove the rule 'required' for default values, if custom field is obligatory
2022-08-24 16:18:11 -05:00
Peace
94bbf2bf2f
fixed translation string for canceled requests
2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco
e5cc6ec972
Fixes error 500 if checkout_acceptances table have a created_at null column
2022-08-17 22:02:13 -05:00
snipe
91e824c5b0
Check for nullifying checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:25:07 -07:00
Ivan Nieto Vivanco
a33ca39237
Figure out declined notifications
2022-08-11 16:00:21 -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
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
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
snipe
9acfceba29
Added relations to report search
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 23:50:10 -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
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
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
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
snipe
6428dc5cd2
Removed duplicate supplier_id
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-13 13:08:15 -07: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
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
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
Nathan Butler
0617480f73
Asset checkinbytag now consistent with existingAPI
...
This is a non-breaking change to the checkinbytag endpoint to bring it
inline with the usage/formatting of the other bytag endpoints that
currently exist - using the URL path to define the asset_tag instead of
passing it through as a url query.
Both methods will work, but the URL Path method will take precidence if
it is used (the query will be ignored if included)
2022-06-30 09:23:52 +10: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
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
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
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
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
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
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
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
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
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
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
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
mikeroq
d60af478ad
Added website field that was missing from update and store method.
2022-06-17 08:09:39 -05: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
dd9c9520fb
Correctly filter by category_id
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 20:42:21 -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
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
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
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
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
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
4eab5fd075
Removed older comments
...
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
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
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
a771984619
Add an early return if for some reason the import record is not found
2022-05-18 06:15:46 -05:00
Brady Wetherington
b4a0d33ba8
Reduce logging further; we know the main error condition now
2022-05-17 19:57:42 -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
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
Johnson Yi
4401dab8d6
fix saml slo for logout
2022-05-14 11:59:34 +00: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
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
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
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
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
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
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
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
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
Ivan Nieto Vivanco
6529a75683
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:12:02 -05:00
Ivan Nieto Vivanco
b5378eff64
Fix several typos
2022-04-05 16:12:31 -05:00
snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
snipe
7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets
...
Fix #10810 unaccepted assets
2022-03-29 12:10:37 +01:00
snipe
b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync
...
This looks good, thanks!
2022-03-29 12:06:01 +01:00
snipe
639409fb3f
Backporting #10829 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-25 13:00:16 +00:00
Godfrey M
a1429ce86b
removed manager_name from user files
2022-03-24 11:47:13 -07:00
Godfrey M
c1f8252388
adds manager field to LDAP sync
2022-03-24 11:24:39 -07:00
Godfrey M
55680762de
Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync
2022-03-22 16:33:58 -07:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
Godfrey M
3e01981576
clean up
2022-03-22 10:07:08 -07:00
Godfrey M
62352ef1a1
completes accessory eula agreement blade
2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco
319d816002
Update in the license seat the user that the asset with that license have assigned
2022-03-21 15:06:43 -06:00
Godfrey M
4956eb0410
WIP: needs to be tested. adds ldap_manager field to ldap sync
2022-03-21 11:15:39 -07:00
Godfrey M
220df9710e
adds most of the fields for an accessory eula agreement pdf
2022-03-21 09:18:29 -07:00
snipe
df60729140
Fixed #10769 - redirect user back to due for audit page
...
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.
Signed-off-by: snipe <snipe@snipe.net>
2022-03-21 14:27:18 +00:00
snipe
e04ae63d02
Apply the fix to API controller too :(
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:12:48 +00:00
snipe
7db252ade3
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-19 23:11:42 +00:00
Godfrey M
b2e78e3382
formats most of the pdf blade
2022-03-16 15:53:32 -07:00