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
Brady Wetherington
4e8ae8a162
Fix extraneous wildcard query in requestable asset search
2022-01-13 16:32:40 -08:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# 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/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin
2022-01-11 16:40:20 -05:00
snipe
ea83567e7d
Merge pull request #10494 from exula/fix/increase_max_licenses
...
Fixed #7824
2022-01-10 15:04:47 -08:00
snipe
d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings
...
Added #10242 : Improved localized strings
2022-01-10 14:48:52 -08:00
Brad
81084fa717
Fixed #7824
...
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.
This commit allievates those pain points
- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
2022-01-10 14:03:28 -05:00
Wächtler, Yannick
04d649122b
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
2022-01-06 12:35:37 +01:00
Brady Wetherington
95c30cae8d
Some duplicate imports at the top of the Settings file
2022-01-03 13:53:53 -08:00
Brady Wetherington
3c7f2e89ec
Merge branch 'develop' into remove_old_ldap
...
Had to re-do the composer install because the conflicts were too complicated.
2022-01-03 12:56:58 -08:00
snipe
bad6b862ca
assets_count doesnt exist as a column
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-30 12:59:16 -08:00
Alex Janes
7acb559069
corrected issue with asset not found errors
2021-12-20 19:55:00 -05:00
Alex Janes
2b5aca183c
removed unnecessary additional data call from api method
2021-12-19 19:21:58 -05:00
Alex Janes
14b21a6e95
removed some whitespace
2021-12-19 19:17:32 -05:00
Alex Janes
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
Alex Janes
29da4f4325
Removed a bunch of redundant code I created from the API
2021-12-19 18:39:57 -05:00
Alex Janes
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
snipe
398180dc59
Small merge unmagling
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:38:04 -08:00
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
91f087258b
Merge branch 'develop' into remove_old_ldap
2021-11-09 18:33:41 -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
Brady Wetherington
b0417e5bd7
Finish pulling out the AdLdap2-based LDAP remnants that were still in the system
2021-11-03 15:22:06 -07:00
Brady Wetherington
4dda28de9e
WIP: cleaning up LDAP
2021-10-28 18:19:50 -07: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
snipe
593e1234a5
Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api
...
Fixed #9671 : wrap OR queries in sub-condition in checkedout search
2021-07-27 14:39:10 -07:00
Ivan Nieto Vivanco
38a2a0c1ee
Add the pertinent filters in Accessories and Consumables controllers
2021-07-26 12:59:15 -05:00
snipe
5f842d02ef
Fixed namespace
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:24:40 -07:00
Petri Asikainen
f753404197
missed this when rebasing
2021-07-15 12:26:14 +03:00
Petri Asikainen
5d999d2572
legacy image_source support for store
2021-07-15 12:26:14 +03:00
Petri Asikainen
2fc3ff671e
hand legacy image_source field
2021-07-15 12:26:14 +03:00
Petri Asikainen
89cc84f1d9
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-15 12:26:14 +03:00
Petri Asikainen
f24138da44
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-15 12:26:14 +03:00
Petri Asikainen
a76b36cad9
Handle image_source with ConvertBase64ToFiles
2021-07-15 12:26:14 +03:00
Petri Asikainen
23f77b2894
Fixed case again
2021-07-15 12:26:14 +03:00
Petri Asikainen
6173aaa25c
fixed capitalization
2021-07-15 12:26:13 +03:00
Petri Asikainen
91af3f2661
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
4191dd39ea
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
2f3501bdc2
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f1b8ce0a1b
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
6a21660c14
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
64c8767e81
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
0e7af80806
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
e95b15d553
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
bb269e0e5f
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
60f13c8d79
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
5081ca3512
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
b4380c8012
Support images and multipart requests
2021-07-15 12:26:13 +03:00
Petri Asikainen
f6766c5f23
Support images and multipart requests
2021-07-15 12:26:07 +03:00
Petri Asikainen
8bbbb06c5e
testing image upload via api
2021-07-15 12:24:25 +03:00
Petri Asikainen
febf1ec20f
Support legacy image_source property
2021-07-14 13:09:50 +03:00
Petri Asikainen
7b12668af4
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-07-13 17:23:44 +03:00
snipe
f785c3e759
Default to 1 if no qty is passed
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 16:04:52 -07:00
Petri Asikainen
41deabf998
hand legacy image_source field
2021-07-07 09:33:48 +03:00
Petri Asikainen
7a424649c8
convert image_source field
...
This reverts commit b2d3ba7410
2021-07-07 09:24:24 +03:00
Petri Asikainen
b2d3ba7410
Revert "Handle image_source with ConvertBase64ToFiles"
...
This reverts commit 168d7f7004
2021-07-07 09:20:38 +03:00
Petri Asikainen
168d7f7004
Handle image_source with ConvertBase64ToFiles
2021-07-07 09:08:37 +03:00
Mark Brule
f706c87cbc
wrap OR queries in sub-condition
2021-07-06 20:43:17 +00:00
Tobias Regnery
9e1d7ffb5d
Fix scope of departments for FullMultipleCompanySupport
...
If a user tries to view or edit a department from a different company
with FullMultipleCompanySupport enabled, there is a 403 error displayed.
Apply the correct company scope in order to only display the departments
from the own company in the departments view.
Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
2021-07-06 09:45:46 +02:00
Petri Asikainen
e275c9ee90
Fixed case again
2021-07-06 07:10:03 +03:00
Petri Asikainen
347e742e88
merged current upstream/develop
2021-06-30 12:02:05 +03:00
snipe
868419b35b
Components checkin/checkout via API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-30 01:02:44 -07:00
Petri Asikainen
6048acc95d
fixed capitalization
2021-06-30 06:36:12 +03:00
Petri Asikainen
b0aa26e6cb
Support images and multipart requests
2021-06-29 14:25:20 +03:00
Petri Asikainen
b49733832c
Support images and multipart requests
2021-06-29 12:29:17 +03:00
Petri Asikainen
8c0be3aa87
Support images and multipart requests
2021-06-29 12:29:07 +03:00
Petri Asikainen
a936744e2e
Support images and multipart requests
2021-06-29 12:28:52 +03:00
Petri Asikainen
f9da83bc46
Support images and multipart requests
2021-06-29 12:28:42 +03:00
Petri Asikainen
fc8498972e
Support images and multipart requests
2021-06-29 12:28:32 +03:00
Petri Asikainen
4ba75291e4
Support images and multipart requests
2021-06-29 12:27:18 +03:00
Petri Asikainen
a7b1e31776
Support images and multipart requests
2021-06-29 12:27:08 +03:00
Petri Asikainen
604a0b6df1
Support images and multipart requests
2021-06-29 12:26:59 +03:00
Petri Asikainen
4ed9788a0e
Support images and multipart requests
2021-06-29 12:26:45 +03:00
Petri Asikainen
e8a4059db9
Support images and multipart requests
2021-06-29 12:26:24 +03:00
Petri Asikainen
aa402bf896
Support images and multipart requests
2021-06-29 12:26:15 +03:00
Petri Asikainen
8d4219759e
Support images and multipart requests
2021-06-29 12:25:47 +03:00
snipe
a016f4ecd0
Applies PR #9761 to integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:11:22 -07:00
snipe
a4fd0c9c6d
Fixed #9745 - added searchable, sortable notes field to status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:52:57 -07:00
Petri Asikainen
e0c5205e9b
save images
2021-06-28 08:11:33 +03:00
Petri Asikainen
695bf1e15f
save images
2021-06-28 07:58:08 +03:00
Petri Asikainen
0e2efb6573
Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads
2021-06-27 14:38:55 +03:00
snipe
e44a25126d
Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification
...
Fixes #9666 Asset checkin via api doesn't send notification.
2021-06-23 14:35:07 -07:00
Petri Asikainen
491a788cd0
testing image upload via api
2021-06-23 11:22:41 +03:00
Laravel Shift
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
Travis Miller
4f6b1bb12d
Fixed #9680 : Use Eloquent’s withCount method to count Statuslabel assets
2021-06-09 11:52:04 -05:00
Ivan Nieto Vivanco
bb227cafb2
Added event to trigger the notification.
2021-06-08 13:16:13 -05:00
Marc Leuser
4030789786
fix LicenseSeatsController method documentation ( #9584 )
...
in an attempt to get the automatic API reference generation to work
2021-05-14 16:14:32 -07:00
markbrule
6c1553167d
issue #9422 - pivot ID was being used as a user_id ( #9512 )
2021-05-04 22:27:01 -07:00
Steven
82f73eb9e2
Added user locale to REST API GET /api/users response; ( #9486 )
...
* Clearer reporting on import
Signed-off-by: snipe <snipe@snipe.net>
* Try adding text/x-Algol68 to import
Signed-off-by: snipe <snipe@snipe.net>
* Added user locale to REST API GET /api/users response;
Co-authored-by: snipe <snipe@snipe.net>
2021-04-23 12:09:00 -07:00
Ivan Nieto Vivanco
36bc47c61c
Handle regex format when assigned from API ( #9443 )
2021-04-20 14:44:47 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
snipe
e47e2e3754
Fixed #9404 - include note in accessory API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 10:57:30 -07:00
snipe
df72f92bc0
Brings PR #6744 up to parity with previous changes - Set custom field's default value when creating a new asset using the API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 20:16:06 -07:00
Marc Leuser
90b7d34c69
Added #6695 : add API endpoint for license seats ( #8058 )
...
* remove miselading comment line
* added dedicated API endpoint for license seats
* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway
* reduce amount of IFs
* add sanity checks to show()
* fix goofed logging logic
* add tests for action log entries
2021-03-29 19:41:26 -07:00
snipe
9f3a8a43cc
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
2021-03-17 19:41:02 -07:00
snipe
8fd8e716ac
Changed debug level on bad LDAP connection ( #9314 )
...
* Changed debug level on bad LDAP connection
TODO:
Unfuck all of this. It’s a mess and it really doesn’t work the way we think it does. AdLdap library strikes again. :(
Signed-off-by: snipe <snipe@snipe.net>
* Improved phrasing
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 19:24:28 -07:00
snipe
f164f0ea60
Fixed #9266 - set a colors_array variable even if other conditions are not met
2021-03-09 21:04:32 -08:00
Ivan Nieto Vivanco
ab7dd90602
Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. ( #9210 )
2021-02-26 12:56:04 -08:00
snipe
f37d5d3d03
Fixed #9085 - asset models not showing proper pagination
...
Huge thanks to @inietov for catching this one
2021-02-25 16:43:38 -08:00
Brady Wetherington
462f8c791f
Hotfix to develop to yank extraneous e() ( #9080 )
2021-02-02 16:44:54 -08:00
Brady Wetherington
9a224a07ba
Modified how we do Select2 dynamic drop-down menus to be more secure ( #9079 )
...
* Modified how we do Select2 dynamic drop-down menus to be more secure
As noted by the author of select2, the more-secure way of creating
rich Select-dropdowns is to use jquery to create HTML snippets and
carefully modify text attributes within there. This prevents any
XSS from being brought to the page. As a side-effect, the extra
escaping that we had to do in all of the internal selectlist calls
is now no longer necessary, and has been removed. Rebased and
squashed from the original.
* Rebuilt all assets, but this still feels like it's too much stuff in here.
* Whoops, need to run that in dev, not prod
2021-02-02 15:55:21 -08:00
snipe
fdb5b3baf1
Depreciation detail view fixes [ch15776] ( #9059 )
...
* Allow sorting by months for depreciation list view
* Added dataTableLayout to standardize the list display table
* Implement the dataTableLayout() on the list view blade
* Split the view into tabs so we can combine asset depreciations and license depreciations
* Updated depreciation view to use tabbed interface for assets and licenses
* Added asset models to depreciation details page
* Make asset model category sortable
* Added cateory as allowed to be sorted on
* Added category sort scope
* Removed offset variable
* Small fixes to asset modes display in depreciation to bulk edit models
2021-01-27 17:44:05 -08:00
snipe
0031fab0fe
Added termination date, depreciation in license column selection [ch14505] ( #9052 )
2021-01-27 01:34:32 -08:00
Evgeny
d8bb69533c
To eliminate 12/24hours ambiguity fix. This fix prevents loss of time accuracy. ( #8887 )
...
Its a tiny fix to eliminate 12/24hours ambiguity. Fix prevents time accuracy loss in field "last_audit_date" for assets.
2021-01-26 12:22:59 -08:00
snipe
b27aeb1952
Added LDAP flag in users API for #8741
2020-12-02 11:01:05 -08:00
Brady Wetherington
93cf8d4e0a
Forward-port of the old LDAP sync system ( #8801 )
...
* Forward-port of the old LDAP sync system
* Need to rename the class to avoid classname conflicts
* Make 'classic' LDAP sync not add surrounding parens to filters that already have them
* Re-work Test LDAP button to return 10 sample users
* Remove useless debugging code
2020-11-30 17:11:44 -08:00
snipe
c66f8c04c8
For for deleted user API
2020-11-18 14:57:44 -08:00
snipe
551e28eec9
Fixed #8749 - added more default colors to prevent missing index in pie chart math
2020-11-18 07:06:14 -08:00
snipe
2ea805b7ed
Added search/sort by Location OU, added to listing
2020-11-17 22:17:07 -08:00
Brady Wetherington
a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) ( #8757 )
...
* Start work on re-adding back the "Test LDAP logins" feature to develop
* Add back-end method to allow LDAP test users to try to log in.
2020-11-16 21:23:08 -08:00
snipe
c451fde466
Fixed exception namespace
2020-11-12 14:27:59 -08:00
snipe
044dfe2620
Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard
2020-11-10 00:54:39 -08:00
snipe
f42bd3a144
Fixed #8613 - Added deleted_at to user API response, added all=true to include deleted and not-deleted in one call
2020-10-26 14:58:45 -07:00
snipe
b9330cf6b1
Fixed #8613 - 500 error on deleted users API call
2020-10-26 14:55:18 -07:00
snipe
2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes
...
Fixes #8462 - move accessory notes into pivot table
2020-10-23 14:19:51 -07:00
snipe
68cfbaab2e
Fixed signature issue on accepted assets - related to #8577
...
I have no idea how this ever worked? We didn’t rename that fieldname recently.
2020-10-22 23:20:55 -07:00
snipe
66ac5d05ad
Started migration to normalize note
2020-10-22 23:18:14 -07:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07:00
snipe
ed3afd1e2e
Removed debugging
2020-09-15 23:19:52 -07:00
snipe
7736f12eb4
Switch to Guzzle for the Slack test
2020-09-15 23:05:27 -07:00
Brady Wetherington
f3f7d714a6
Fix ldap test button for php 7.4 (suppressing errors)
2020-09-09 14:18:05 -07:00
snipe
69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller
2020-09-03 19:47:15 -07:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
snipe
db385b5f6b
Fixed assetmodels selectlist
2020-08-26 02:32:39 -07:00
Daniel Meltzer
f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense.
2020-05-23 15:24:10 -04:00
Daniel Meltzer
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
snipe
730632e2eb
Apply PR #8043 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 22:57:55 -07:00
snipe
85712a1960
Only override fieldset_id with custom_fieldset_id if it’s present
...
This is mostly to support prior versions. I have NFC why we did this in the first place. I’m sure I had a stellar reason, but couldn’t tell you what it is today.
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 20:59:42 -07:00
snipe
b488cffc7e
Merge pull request #8006 from dmeltzer/api-test-fixes
...
Test fixes pt 2.
2020-04-30 17:46:25 -07:00
snipe
82e02490fd
Removed duplicate update method (per #7997 )
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:23:56 -07:00
Daniel Meltzer
1f8c3cc670
Test fixes.
2020-04-29 11:03:07 -04:00
snipe
f66ce02756
Added debugging logs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:46:02 -07:00
snipe
cdd0e405be
Fixed weird merge
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:12:29 -07:00
snipe
b725e788ec
Applied new selectlist search to locations
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:39:41 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
197a84be94
Commented out rtd_location_id override - why did we do that?
2020-04-09 14:17:39 -07:00
snipe
b4fa4c77d7
Check for rtd_location_id before trying to assign
2020-04-09 14:14:30 -07:00
snipe
f8a72db696
Changed LDAP 600 to 500, clearer error messages on LDAP test
2020-04-09 09:55:44 -07:00
snipe
79232fc434
Fixed #7947 - Added rtd_location_id to API search
2020-04-08 11:00:04 -07:00
snipe
893944403e
Check for location_id being set before trying to set it on checkout via API
2020-04-06 15:54:40 -07:00
snipe
54fd8f81ff
Added permissions on user api ( #7883 )
...
* Add permissions to user edit API
* Add user permissions on user create/update API endpoint
2020-03-06 15:28:46 -08:00
Godfrey Martinez
0e0fe967e4
BadMethodCallException Method update does [ch10544] ( #7804 )
2020-02-10 19:27:23 -08:00
snipe
3361b859c0
Changes offset to use the actual item count as override instead of 0 ( #7788 )
2020-02-04 12:32:24 -08:00
snipe
89e2a3ae3c
Fixed #7752 - reformat /api/v1/users/me to use transformer
2020-01-30 13:12:43 -08:00
snipe
56582614b6
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-01-22 16:07:46 -08:00
Ivan Nieto
313cacdb71
Select Import File fails in Develop [ch10598] ( #7718 )
...
* Delete an unused import, then replace a deprecated facade with the needed one for uploading files
* Added the needed use for the Request Facade
2020-01-17 16:12:51 -08:00
snipe
324da7c0c8
Include correct license, asset, etc count on user show API call
2019-12-19 18:09:53 -08:00
snipe
779fc6d195
Added license endpoint for users
2019-12-19 18:00:36 -08:00
snipe
159acf6788
Removed extra space
2019-12-19 17:47:50 -08:00
snipe
c31e150935
Use $request->input over Request::get()
2019-12-11 11:09:54 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
ff57f10e9f
Fix for searching on child location names ( #7646 )
...
* Fix for child locations
* Reverts temp changes to indenter
2019-12-06 13:14:10 -08:00
herroworrd
3fbfb0c658
Add requestable to asset model api results ( #7577 )
...
Nice, thanks!
2019-12-06 10:33:06 -08:00
snipe
ff8d98c97c
Update child assets to reflect asset parent location ( #7458 )
2019-12-04 16:19:25 -08:00
snipe
704c696711
Fixed parse error in settings controller
2019-12-04 14:54:36 -08:00
snipe
88cf456386
Adding Dept to license seats ( #7609 )
...
* Adding Dept to license seats
* Added query scope to order by department
* Make license seat department sortable
* Disable license seat internal search - this never actually worked
2019-11-21 22:03:56 -08:00
snipe
5065164c40
Bumped Carbon version
2019-11-21 13:14:18 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
Marián Skrip
53eae6fbfd
Fix issues with update permission naming ( #7493 )
...
This solves an issue when admin would be able to create and delete
categories but not edit them.
2019-10-28 11:44:48 -07:00
Alexandr Hacicheant
a90149940a
Update UsersController.php ( #7528 )
...
Returned missed bracket after merge master to develop
2019-10-28 11:43:29 -07:00
snipe
0769f585ea
Disallow locations from being their own parents
2019-10-21 15:45:05 -07:00
snipe
22d2ad9248
Fixes nested location selectlist ( #7483 )
...
* Rename child locations method
* Use Ajax dropdown for locations selectlist for edit/create
* Removed locations database call on edit/create blades for faster loading
* Updated locations controller to use the new iterator
* Increase pagination on locations controller to 500
We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.
* Fixed the else to make codacy happy
* Improve the design and performance of the nested location selectlist (#7484 )
* Improve the design and performance of the nested location selectlist
* Fixed parse errors
* Removed debugging code/comments
2019-10-02 03:56:56 -07:00
snipe
c68c0e1208
Account for limit if none is passed in the request
2019-09-03 20:28:49 -07:00
snipe
c256536d21
Math is hard
2019-09-03 14:29:58 -07:00
snipe
b8f7cd81eb
Limit API request results per page ( #7405 )
2019-09-03 14:02:08 -07:00
snipe
6d66d7e215
Removed withErrors on JSON response
2019-08-22 21:36:47 -07:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
e7b0ee2539
Added accessories checkout/checkin API endpoint
2019-08-02 15:08:26 -07:00
snipe
ab86e42b2e
Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
2019-07-26 12:37:38 -07:00
snipe
250a797339
Fixed #7250 - permission issue for API fieldsets and fields endpoints
...
This applies the change from #7294 to master
2019-07-24 11:00:42 -07:00
Marián Skrip
8a1f6b74e8
Fix permission issue for API fieldsets and fields endpoints ( #7294 )
...
Close snipe/snipe-it#7250
2019-07-24 10:57:09 -07:00
snipe
444e250609
Fixed countable() strings on user destroy
2019-07-17 17:51:13 -07:00
snipe
b4b6d6b571
Comment clarification on #7186
2019-07-15 15:31:09 -07:00
snipe
8c73a47afb
Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
2019-07-15 15:27:02 -07:00
snipe
f82ffe378c
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-07-15 14:11:18 -07:00
snipe
984c2a8fd4
Better log message for bad LDAP connection
2019-07-15 14:10:57 -07:00
Ivan Nieto
d409be6d43
Fix #6910 : Add logic to manipulate the eloquent query. ( #7006 )
...
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
2019-07-15 13:02:44 -07:00
vicleos
c6039cbc1d
Vicleos fix storage namespace ( #6901 )
...
* Update CompaniesController.php
fixed companies destroy error
* fix Storage namespace loss
2019-05-30 19:10:04 -07:00
snipe
56576d9e45
Fixed more camel-casing -> snake-casing
2019-05-24 16:01:12 -07:00
snipe
d5c3ee5ed0
Only try to get fieldset if model is valid
2019-05-24 15:44:54 -07:00
snipe
d596ced0a0
Fixed free_seats_count variable name
...
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
2019-05-24 15:44:18 -07:00
snipe
93bf541ce7
Fixed missed consumables_count withCount() statement
2019-05-24 14:21:53 -07:00
snipe
c5a23e8f5e
Fixed bug where sorting by company name in Users API did not work
...
Fixes [ch9200]
2019-05-24 13:37:20 -07:00
snipe
2d036c64e9
Change ->has() to ->filled()
2019-05-23 17:39:50 -07:00
snipe
4be8ba9f17
Updated withCount to use manual naming
2019-05-22 00:52:51 -07:00
snipe
0358d13ddb
Fixed #7044 - API update deleted custom fields if they are not re-presented
2019-05-20 11:49:18 -07:00
snipe
9eb7b668d1
Fixed #6880 - correctly encrypt encrypted fields via the API
2019-05-15 19:33:30 -07:00
snipe
888bdbdb68
Added ability to update groups via API
...
Fixes [ch9139]
2019-05-15 16:39:34 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
407445456a
Merge branch 'features/6204_email_audit-alerts' into develop
...
# Conflicts:
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/LicensesController.php
# composer.json
# composer.lock
# config/version.php
# resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits ( #6992 )
...
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
2019-05-05 22:32:52 -04:00
snipe
e4a298ca2a
Added scope for both overdue and upcoming
2019-05-05 22:13:30 -04:00
snipe
0f0ffd39a8
Added ability to pass audit specs to main API asset search method
2019-05-05 19:19:56 -04:00
snipe
dc73dbfbfd
Fixed #6911 - note must be a string on license checkin
2019-05-02 15:20:47 -07:00
Ivan Nieto
b1f96448af
Remove old redundant code in LicensesController, added an offset to AccessoriesController for pagination to work correctly ( #6847 )
2019-04-02 10:13:58 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
snipe
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list ( #6822 )
...
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced
I also updated the language in the user’s listing table to clarify what “activated” means
* Added login enabled info to user view
* Clarified comments
* Added info about 2FA on user profile
Because why not
* Added nowrap to table, and added 2FA reset for superadmins
2019-03-18 11:59:02 -07:00
snipe
7b33f95e83
Fixes/import permissions mask ( #6826 )
...
* Check for empty headers in import
* Added import permission
* Fixed model path in docblock
* Added import gate to default blade
* Check if the user is an admin OR idf they have import permissions
* Walked back that admin permission
Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
2019-03-18 11:58:08 -07:00
Marián Skrip
8d63533205
Add write-only image_source field for asset create/edit API endpoint ( #6146 )
...
`image_source` should contain base64 encoded image data with mime-type.
2019-03-13 21:00:40 -07:00
Ivan Nieto
8c65214b1f
Ignore the soft deleted assets in the eloquent query ( #6824 )
2019-03-13 20:14:30 -07:00
Martin Meredith
e3e0d57f56
Minor code cleanup bits and bobs ( #6805 )
...
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
snipe
858d382e26
Changed logging to info level for LDAP
2019-03-13 15:14:03 -07:00
snipe
1b0d855c00
Added translation, removed commented out code
2019-03-13 12:15:48 -07:00
snipe
61afdeac2e
Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop
2019-03-08 16:18:48 -08:00
snipe
5293cb30bd
Merge branch 'fixes/only_present_image_url_if_image_present_in_profile_api' into develop
2019-03-05 23:54:08 -08:00
snipe
6d98bd6846
Fixed error if item requested or request was deleted ( #6786 )
...
ch628
2019-03-05 23:47:36 -08:00
snipe
0b0813b260
Fixed error if item requested or request was deleted
...
ch628
2019-03-05 23:46:40 -08:00
snipe
28a450ea25
Added ability to do full name search in user dropdown selectlist ( #6784 )
2019-03-05 21:13:39 -08:00
snipe
6696685d0b
Merge branch 'fixes/full_name_search_user_selectlist' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# routes/api.php
2019-03-05 20:57:10 -08:00
snipe
f065bd7784
Added ability to do full name search in user dropdown selectlist
2019-03-05 20:40:05 -08:00
snipe
288cc01c41
Merge branch 'features/accessories_users' into develop
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# config/version.php
# routes/api.php
2019-03-01 17:30:03 -08:00
snipe
9575cd2651
Add accessories endpoint to user API ( #6775 )
2019-03-01 17:21:03 -08:00
snipe
348c13f318
Add accessories endpoint to user API
2019-03-01 16:31:22 -08:00
Dmitrii Minaev
16bb784e78
Codestyle & bug fixes
2019-02-28 01:37:58 +03:00
Dmitrii Minaev
d3c320e56f
Code comments and format
2019-02-23 22:44:03 +03:00
Dmitrii Minaev
5f3a0bdea5
app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php
...
add accessories and consumables tables
add selectlist api to:
app\Http\Controllers\Api\AccessoriesController.php
app\Http\Controllers\Api\ConsumablesController.php
app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
2019-02-19 22:19:00 +03:00
snipe
0242b3ec74
Handled JS cookie offset issue on the server side
...
We may want to handle this via the blades instead, as I’m not sure if API users will run into weirdness here.
2019-02-14 15:01:34 -08:00
snipe
b26fbf986f
Fixed issue where offset could be greater than total items, resulting in “No results” confusion
2019-02-14 14:49:08 -08:00
snipe
5c9b1ed43a
Fixed #6676 - consumables API not respecting category id
2019-02-14 14:48:43 -08:00
snipe
cd333fa93b
Fixed wonky merge :(
2019-02-13 06:52:36 -08:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
f1fa5bdaa9
Fixed (develop) #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:56:13 -08:00
snipe
aa1e06f021
One more time…. Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:46:19 -08:00
snipe
30b1cfabf5
Fixed dumb formatting
2019-02-13 04:45:21 -08:00
snipe
e75d22ab73
Revert "Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets"
...
This reverts commit b1e17743b8
2019-02-13 04:44:19 -08:00
snipe
b1e17743b8
Fixed #6704 - don’t apply gate to $arrays collection, just check that they can view assets
2019-02-13 04:35:55 -08:00
snipe
b317fb8d83
Fixed #6367 - pass table name and column_id to scopeCompanyables
2019-02-13 01:29:53 -08:00
snipe
e2c0f01a10
Fixed #6367 - pass table name and column_id to scopeCompanyables
...
Solves error: Integrity constraint violation: 1052 Column 'company_id' in where clause is ambiguous
2019-02-13 01:26:11 -08:00
snipe
8e358faebc
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API
2019-02-12 22:15:32 -08:00
snipe
90cddb7aee
Fixed #6113 - use $asset->fill vs filled() to allow blanking values via API ( #6693 )
...
Need to confirm that re-enabling `\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,` won’t mangle anything. I know we ran into some issues when testing a long time ago, but not sure those issues apply anymore, and I can’t remember what they were.
2019-02-12 22:08:38 -08:00
snipe
4fd469e07b
Prevent editing special users demo mode
2019-02-04 19:13:55 -08:00
snipe
4fe63d2966
Fixed #6633 - return 200 status code on asset API
2019-02-04 18:59:49 -08:00
snipe
971fcf5800
Fixed #6633 - return 200 status code
2019-02-04 18:58:28 -08:00
snipe
d1fe7abb18
Replaced custom deleted query scopes with onlyTrashed()
2019-01-24 14:47:44 -08:00
bricelabelle
5281713fd9
Added #6617 : View licenses checked out to an asset with the hardware API ( #6621 )
2019-01-22 14:47:40 -08:00
NMathar
66f557d436
add user license api endpoint fix #6241 ( #6616 )
2019-01-22 13:48:15 -08:00
Steffen
1de9087427
LDAP fixes ( #6533 )
...
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder
* php 7.3 collect() fix (undefined variable)
* Fix travis ci
* Add iCheck png files to webpack config (inconsistency for css <> png) and blue.png to public folder
* php 7.3 collect() fix (undefined variable)
* change LDAP implementation from model to (singleton) service
* Re-apply check for content in ldap_server variable before parsing
* Update LDAP implementation
* Switch iCheck to minimal as referenced in js
* Don't init on load but on first access via init (returns ldap enabled status)
* Re-Enable notifications
* Re-add missing test target php versions
* Only init() once (singleton class, so ldap variable is already set)
2019-01-10 13:20:43 -08:00
Ivan Nieto
876ff2ef72
Fixes #6341 . Some style changes in this fix. ( #6492 )
2018-12-14 18:08:33 -08:00
Wes Hulette
34246ee4ef
[WIP] v5 Develop: New LDAP implementation ( #6352 )
...
* Fixed missing oauth tables during setup.
* WIP New LDAP implementation
* WIP New LDAP implementation
* WIP New LDAP implementation
Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP
* WIP New LDAP implementation
Added Adldap2 to handle ldap intergration.
* Updated per PR quality review
* Added specific LDAP settings method
* Corrected version number
* Added return documentation
* Added imports
* Changed class to be injected into controller
* Updated with PR suggestions
2018-12-06 14:05:43 -08:00
Ivan Nieto
f91e340178
Fixes #6341 . Adding condition that checks offset of licenses seats when the user looks other page than the first. ( #6392 )
2018-12-05 18:09:54 -08:00
Minaev Dmitriy
79d979f47f
Full kits manipulation without users intagration
2018-11-06 19:27:28 +03:00
snipe
8f22cf7c3c
Added dept update API endpoint
2018-10-31 14:31:57 -07:00
Minaev Dmitriy
9d5cd27575
New save mechanic
2018-10-31 16:06:38 +03:00
Minaev Dmitriy
f1f7694835
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2018-10-19 19:00:53 +03:00
Minaev Dmitriy
0e66c3cb56
Predefined kits test
2018-10-19 17:30:25 +03:00
snipe
d4fa81301d
Check if user can see assets in statuslabels gate
2018-10-09 16:34:12 -07:00
snipe
84848fabd7
Fixed #6284 - missing checkout information on Status Labels API assets endpoint
2018-10-03 10:30:24 -07:00
snipe
79367642b1
[WIP] Added #5957 - Flysystem support ( #6262 )
...
* Added AWS url to example env
* Upgrader - added check for new storage path and attempt to move
* Ignore symlink
* Updated paths for models
* Moved copy methods
* Added AWS_URL support
For some reasin, Flysystem was generating the wrong AWS url (with a region included)
* Switch to Flysystem for image uploads
* Nicer display of image preview
* Updated image preview on edit blades to use Flysystem
* Twiddled some more paths
* Working filesystems config
* Updated Asset Models and Departments to use Flysystem
* Janky workaround for differing S3/local urls/paths
* Try to smartly use S3 as public disk if S3 is configured
* Use public disk Storage options for public files
* Additional transformer edits for Flysystem
* Removed debugging
* Added missing use Storage directive
* Updated seeders to use Flysystem
* Default logo
* Set a default width
We can potentially override this in settings later
* Use Flysystem for logo upload
* Update downloadFile to use Flysystem
* Updated AssetFilesController to use Flysystem
* Updated acceptance signatures to use Flysystem
* Updated signature view to use Flysystem
This isn’t working 100% yet
* Use Flysystem facade for displaying asset image
* Set assets path
Should clean all these up when we’re done here
* Added Rackspace support for Flysystem
* Added Flysystem migrator console command
* Added use Storage directive for categories
* Added user avatars to Flysystem
* Added profile avatar to Flysystem
* Added the option to delete local files with the migrator
* Added a check to prevent people from trying to move from local to local
* Fixed the selectlists for Flysystem
* Fixed the getImageUrl method to reflect Flysystem
* Fixed AWS copy process
* Fixed models path
* More selectlist updates for Flysystem
* Updated example .envs with updated env variable names
* *sigh*
* Updated non-asset getImageUrl() methods to use Flysystem
* Removed S3 hardcoding
* Use Flysystem in email headers
* Fixed typo
* Removed camera support from asset file upload
We’ll find a way to add this in later (and add that support to all of the other image uploads as well)
* Fixed path for categories
* WIP - Switched to standard handleImages for asset upload.
This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now.
* Fixed css URL error
* Updated Debugbar to latest version (#6265 )
v3.2 adds support for Laravel 5.7
* Fixed: Missing CSS file in basic.blade.php (#6264 )
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
* Updated composer lock
* Added AWS_BUCKET_ROOT as env variable
* Use nicer image preview for logo upload
* Removed AssetRequest form request
* Removed asset form request, moved custom field validation into model
* Added additional help text for logo upload
* Increased the size of the image resize - should make this a setting tho
* Few more formatting tweaks to logo section of branding blade preview
* Use Flysystem for asset/license file uploads
* Use Flysystem for removing images from models that have been deleted
* Enable backups to use Flysystem
This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3
* Use Flysystem to download license files
* Updated audits to use Flysystem
2018-09-29 21:33:52 -07:00
snipe
eea65a3f26
Fixed manufacturers item count
2018-09-28 12:03:27 -07:00
