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
|
675f42401c
|
Fixed #11343 - ability to null asset name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 10:57:39 -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
|
dd9c9520fb
|
Correctly filter by category_id
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 20:42:21 -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
|
07b1062fb2
|
Better handle API calls to nonexistent users
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 16:55:23 -07: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
|
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
|
a771984619
|
Add an early return if for some reason the import record is not found
|
2022-05-18 06:15:46 -05:00 |
|
|
snipe
|
333aa05809
|
Added missing use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 16:46:13 -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
|
646166b2b6
|
Removed debug line
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 12:16:07 -07: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
|
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
|
a937bd34f6
|
Merge master back down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-29 16:28:43 +01:00 |
|
|
snipe
|
639409fb3f
|
Backporting #10829 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-25 13:00:16 +00: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 |
|
|
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
|
7498fe36e9
|
Removed extra space because pedantry
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 16:45:03 +00:00 |
|
|
snipe
|
babf7c064b
|
Added ability to filter status label index endpoint by status type
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 16:38:45 +00:00 |
|
Godfrey M
|
59c583ac74
|
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
|
2022-03-08 16:42:27 -08:00 |
|
|
snipe
|
0dfc27f56e
|
Added remote to allowed_columns for sorting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:44:46 -08:00 |
|
|
snipe
|
43c1949092
|
Add remote option to user
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:35:26 -08:00 |
|
|
snipe
|
b876d0abb0
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
|
2022-03-03 21:59:38 -08:00 |
|
|
snipe
|
9acb5413f6
|
Added notes field to controllers
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 20:29:25 -08:00 |
|
|
snipe
|
08a2fe4edb
|
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api
Features/adds ldap import and assets count to user api
|
2022-03-03 19:15:14 -08:00 |
|
|
snipe
|
6abe8f296b
|
We don’t need the users table here
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 19:12:03 -08:00 |
|
|
snipe
|
a53a67be4a
|
Added consumables, licenses, accessories count filters too
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 19:08:08 -08:00 |
|
|
snipe
|
b72cac3511
|
Adds ldap_import and assets_count filter to user API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 19:03:35 -08:00 |
|
|
snipe
|
c940d36fff
|
Updated maintenance gate in API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 18:49:54 -08:00 |
|
|
snipe
|
dc2e6c2b06
|
Adds consumables endpoint to user API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-22 20:44:34 -08:00 |
|
|
snipe
|
dd5f812d88
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
|
2022-02-20 13:29:12 -08:00 |
|
|
snipe
|
5540069cce
|
Be more specific with deleted license point
Require this value to be "true" speciically to get the deleted list
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:14:04 -08:00 |
|
|
snipe
|
1ad56760ce
|
Adds delete endpoint for licenses
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-16 09:08:50 -08:00 |
|
|
snipe
|
4804e5b3ab
|
Added Asset edit/delete gates to maintenances
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-14 15:34:06 -08:00 |
|
|
snipe
|
2dad27eed6
|
Added additional gate for selectlists
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-11 11:46:14 -08:00 |
|
|
snipe
|
f5ffda8053
|
Ahem.
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-10 22:43:51 -08:00 |
|
Jonathon Reinhart
|
3536d08477
|
Add checkin_at parameter to /hardware/:id/checkin API
Fixes #10552
|
2022-02-08 20:23:09 -05:00 |
|
|
Jonathon Reinhart
|
cd963179fd
|
Fix /hardware/{id}/checkin API response on error
Fixes #10629
|
2022-02-08 01:08:42 -05:00 |
|
|
snipe
|
ce154a2382
|
Merge pull request #10455 from adagioajanes/features/quickscan_checkin
Added #10454: Quick Scan Checkin
|
2022-02-01 20:19:45 -08:00 |
|
|
snipe
|
5fded57ec6
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
|
2022-02-01 18:53:05 -08:00 |
|
|
snipe
|
aa3aa78204
|
Adds Lookup Asset by Custom Field via API [sc-18632]
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-28 09:08:48 -08:00 |
|
|
Ivan Nieto Vivanco
|
f510b9c2a9
|
Add query to filter non-deprecable assets when the Depreciation Report is called
|
2022-01-15 14:21:31 -06:00 |
|
|
Ivan Nieto Vivanco
|
8334ed6f7e
|
Add query to filter non-deprecable assets when the Depreciation Report is called
|
2022-01-15 14:01:19 -06:00 |
|
Brady Wetherington
|
ef463a37d8
|
Make 'pending' assets properly requestable; use requestable scope
|
2022-01-14 12:48:33 -08:00 |
|