snipe
|
c3d55ee27e
|
Merge master down into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
|
2021-12-16 14:26:24 -08:00 |
|
Brady Wetherington
|
ea71086dfc
|
Yank assetlog from eager-load clause in API query for develop
|
2021-12-10 18:50:34 -08:00 |
|
Brady Wetherington
|
acfb41f129
|
Remove 'actionlog' from the ::with() clause in the asset query API
|
2021-12-10 18:42:56 -08:00 |
|
snipe
|
86afe6c4b1
|
Cleanup slack validation
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 18:03:56 -08:00 |
|
snipe
|
ff97b359ad
|
Removed form request on ajax, cleaned up some other things
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 17:58:46 -08:00 |
|
snipe
|
8c1cd87831
|
Added slacksettingsrequest as use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 15:56:22 -08:00 |
|
snipe
|
ebdbc20740
|
Adds stricter validation for slack endpoints
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-06 11:40:24 -08:00 |
|
snipe
|
f2f8f96991
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
|
2021-11-15 19:24:38 -08:00 |
|
snipe
|
0e21a95817
|
Escape error message in asset autdit apI (same as in v5)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-09 19:39:32 -08:00 |
|
Brady Wetherington
|
3ea209a507
|
Escape asset_tag attribute at controller level for consumption in bulk checkout
|
2021-11-08 20:27:43 -08:00 |
|
snipe
|
ea0d92c439
|
Merge branch 'develop' into fixes/fmcs_departments
|
2021-10-28 18:18:08 -07:00 |
|
snipe
|
645529ba78
|
Merge pull request #9889 from ncareau/api-licenses
Add licenses api parameters and fix a missing variable in license view.
|
2021-10-28 17:20:09 -07:00 |
|
snipe
|
2f9e5f79af
|
Merge pull request #10139 from FliegenKLATSCH/patch-1
API: Do not include deleted items per default on lookup by serial
|
2021-10-28 17:09:20 -07:00 |
|
snipe
|
17bf899a17
|
Set default_label to 0 instead of null in API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-25 20:14:01 -07:00 |
|
snipe
|
aa8f1378c9
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
|
2021-10-20 17:26:41 -07:00 |
|
FliegenKLATSCH
|
24c484303e
|
Do not include deleted assets by default when doing lookup by serial
This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.
|
2021-10-09 08:56:31 +02:00 |
|
snipe
|
b20c841a89
|
Fixed asset models restore
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 19:29:13 -07:00 |
|
Brady Wetherington
|
f3338667c7
|
Create new ParseCurrency helper and use it in the appropriate controllers
|
2021-09-28 18:20:39 -07:00 |
|
NMC
|
c680977791
|
Merge branch 'develop' into api-licenses
|
2021-09-27 15:02:51 -04:00 |
|
snipe
|
d88c0ae5ec
|
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
|
2021-09-26 13:41:52 -07:00 |
|
snipe
|
2f9582ee5c
|
Switched to loadMissing for performance
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-23 17:31:19 -07:00 |
|
snipe
|
3b7ce0091c
|
Load components in the assets API if components=true in API request
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-23 17:23:53 -07:00 |
|
Ivan Nieto Vivanco
|
7dfab3a6e2
|
Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api
|
2021-09-23 15:02:39 -05:00 |
|
snipe
|
61cf9ec009
|
Small conflict handling bits
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-22 00:00:44 -07:00 |
|
snipe
|
e27065fe16
|
Merge branch 'develop-v6-integration' into develop-v6-rc1
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
|
2021-09-21 23:46:50 -07:00 |
|
snipe
|
0763c76a4e
|
Fixed scoping with leftjoin
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 20:54:24 -07:00 |
|
snipe
|
5d32c17a2e
|
Removed comments
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 20:01:36 -07:00 |
|
snipe
|
10ca7cffc3
|
Fixes for query scoping, ordering, and nicer readability
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 19:59:23 -07:00 |
|
snipe
|
61176335d7
|
Improved category_type with strtolower() to make it case insensitive
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-21 15:51:41 -07:00 |
|
Delta5
|
c8c3c7fbbd
|
Fixed issue with incorrect error message
|
2021-09-21 19:45:18 +00:00 |
|
Delta5
|
59302e1d19
|
Add restore to users api endpoint
|
2021-09-21 17:42:26 +00:00 |
|
snipe
|
b331bb33d9
|
Code fixes and a new migration
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 15:37:24 -07:00 |
|
snipe
|
d96f877aa4
|
Default show_in_nav to 0
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-15 11:33:13 -07:00 |
|
snipe
|
80175cffdc
|
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:44:49 -07:00 |
|
snipe
|
2f25eb598b
|
Allow the Assets API controller to handle depreciation reports
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:33:39 -07:00 |
|
snipe
|
4293674f4a
|
Added a few more fields to the users API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-31 12:36:06 -07:00 |
|
snipe
|
aeae681326
|
Fixecd copypasta from state to zip
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-31 12:28:20 -07:00 |
|
snipe
|
4794f93224
|
Added additional fields for user search
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-31 12:24:53 -07:00 |
|
Shanks
|
961e80404a
|
Update AssetsController.php
Fix:When using API CheckIn assets, there will be two CheckIn records in the Activity Report log for each asset.
|
2021-08-24 16:39:58 +08:00 |
|
snipe
|
9687bcb41c
|
Fixed issue where consumables model number was not searchable
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-20 17:30:35 -07:00 |
|
snipe
|
7b447a2f16
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2021-08-18 14:31:38 -07:00 |
|
Ivan Nieto Vivanco
|
f04e23cacb
|
Add a small refactor so we not repeat logic
|
2021-08-18 15:22:53 -05:00 |
|
Ivan Nieto Vivanco
|
4207858a14
|
Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index
Also edit the default color for assets with the Pending label, so it match the color in the docs
|
2021-08-18 14:08:35 -05:00 |
|
snipe
|
b88fde5dae
|
Nicer comment formatting
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 12:07:09 -07:00 |
|
Godfrey M
|
cef0e424e1
|
adds a Floor value for depreciation models
|
2021-08-16 18:14:10 -07:00 |
|
snipe
|
ef687fdc7b
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-14 14:07:04 -07:00 |
|
snipe
|
45caa8a90d
|
Added restore functionalty to asset API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-14 14:06:15 -07:00 |
|
Godfrey M
|
01037cf9cb
|
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
|
2021-08-10 18:26:43 -07:00 |
|
NMC
|
4cfc4aec1d
|
fix false search in api.
|
2021-08-01 15:10:22 -04:00 |
|
NMC
|
976957ddd4
|
Add Maintained filed in licenses view and api. + Expires in API
|
2021-08-01 14:30:16 -04:00 |
|