snipe
|
345662c5c2
|
Rearrange some of the user creation logic
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-18 16:34:10 -07:00 |
|
|
snipe
|
aedfef78d3
|
Update app/Importer/LocationImporter.php
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
|
2023-04-18 13:26:23 -07:00 |
|
|
snipe
|
a831a34594
|
New field mapping
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:47:26 -07:00 |
|
|
snipe
|
bcf9188dcd
|
Made default password longer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:47:19 -07:00 |
|
|
snipe
|
c149885ceb
|
Skip the magical user creation if it’s a location
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:47:04 -07:00 |
|
|
snipe
|
1509672463
|
Added location importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-16 07:46:36 -07:00 |
|
Marcus Moore
|
4cbe683a1a
|
Explicitly cast asset tag to string when querying
|
2023-03-29 11:28:04 -07:00 |
|
|
snipe
|
1ccedf6426
|
Merge pull request #12617 from kenchan0130/patch-12249
Fixed #12249: fix csv importer for serial_number field
|
2023-03-07 19:42:23 -08:00 |
|
|
Marcus Moore
|
c80595e05c
|
Ensure asset name is maintained when importing assets that are checked out
|
2023-03-07 11:09:25 -08:00 |
|
Tadayuki Onishi
|
f4675927a0
|
fix csv importer for serial_number filed
Signed-off-by: Tadayuki Onishi <tt.tanishi100@gmail.com>
|
2023-03-07 22:53:02 +09:00 |
|
|
snipe
|
a34cb8b862
|
Check for boolean on requestable
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 17:11:08 -08:00 |
|
|
snipe
|
b46c455e0a
|
Updated mappings.md with byod and vip fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:34 -08:00 |
|
|
snipe
|
304ccaa30e
|
Added byod to asset importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:24 -08:00 |
|
|
snipe
|
f672bdd3b7
|
Added vip to user importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:14 -08:00 |
|
Ivan Nieto Vivanco
|
51efd9b413
|
Adjust the date format for purchase_date field
|
2023-02-24 10:59:31 -06:00 |
|
|
Ivan Nieto Vivanco
|
ddabe7cc9f
|
Added Guard Clause to License Importer to return if no empty seat is found
|
2023-02-07 01:36:55 -06:00 |
|
Godfrey M
|
bbd04f8876
|
adds the rest of the fields for Remote
|
2022-12-06 11:13:24 -08:00 |
|
|
Godfrey M
|
36901d271b
|
adds csvmatch for remote. Im a bit lost though lol
|
2022-12-05 16:28:19 -08:00 |
|
|
Ivan Nieto Vivanco
|
e267f5491a
|
Adds a check for empty location values on import
|
2022-09-19 19:05:48 -05:00 |
|
|
Ivan Nieto Vivanco
|
d51eca20f0
|
Add min_amt field in Consumables and Accessories imports
|
2022-09-12 18:11:48 -05:00 |
|
|
Ivan Nieto Vivanco
|
c59fd7b8da
|
Fix importer field mapping for command line
|
2022-08-24 19:20:23 -05:00 |
|
|
Ivan Nieto Vivanco
|
9f0ecba9b9
|
Add autoincrementing asset tags to the import if the CSV column is empty
|
2022-08-03 12:48:48 -05:00 |
|
|
snipe
|
c3b644797e
|
Merge pull request #11169 from inietov/fixes/user_update_from_import_location_in_assets
Fixes Asset location doesn't change when assigned user's location change via importer
|
2022-06-14 11:44:26 -07:00 |
|
|
Ivan Nieto Vivanco
|
52901f50eb
|
Add date to checkout action when importing assets
|
2022-05-19 17:38:10 -05:00 |
|
|
Ivan Nieto Vivanco
|
340c59969c
|
Add query to update assigned assets location when importing users
|
2022-05-19 13:34:50 -05:00 |
|
|
Ivan Nieto Vivanco
|
32111a863b
|
Call User::generateFormattedNameFromFullName() in the UserImporter
|
2022-05-18 13:02:44 -05:00 |
|
|
snipe
|
a937bd34f6
|
Merge master back down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-29 16:28:43 +01:00 |
|
|
snipe
|
9db8bd782d
|
Merging master down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 18:02:07 +00:00 |
|
|
Ivan Nieto Vivanco
|
cdc0805fc4
|
Sanitize dates input in the importer before saving
|
2022-03-10 12:07:07 -06:00 |
|
|
snipe
|
b876d0abb0
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
|
2022-03-03 21:59:38 -08:00 |
|
|
Ivan Nieto Vivanco
|
64fa7e23fc
|
Separate notes on assets and asset models
|
2022-02-24 16:05:03 -06:00 |
|
|
Ivan Nieto Vivanco
|
577dc6b02c
|
Separate notes on assets and asset models
|
2022-02-24 15:50:59 -06:00 |
|
|
snipe
|
5fded57ec6
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
|
2022-02-01 18:53:05 -08:00 |
|
|
snipe
|
a65fb63b6b
|
Merge pull request #10511 from inietov/features/audit_date_in_importer
Adds audit dates in the asset importer
|
2022-01-27 10:58:53 -08:00 |
|
|
snipe
|
b153138d1e
|
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop
Add Zip field in the User Importer for develop [sc-18556]
|
2022-01-26 16:58:37 -08:00 |
|
|
Ivan Nieto Vivanco
|
55fdc86e02
|
Tweak query in the License Importer to not require a Product Key
|
2022-01-26 17:51:04 -06:00 |
|
|
Ivan Nieto Vivanco
|
450cb8f92f
|
Tweak query in the License Importer to not require a Product Key
|
2022-01-26 17:49:34 -06:00 |
|
|
Ivan Nieto Vivanco
|
c86ed892ab
|
Add Zip field in the User Importer
|
2022-01-19 13:52:15 -06:00 |
|
|
Ivan Nieto Vivanco
|
1fc71a4111
|
Add Zip field in the User Importer
|
2022-01-19 13:35:54 -06:00 |
|
|
Ivan Nieto Vivanco
|
153c30eda8
|
Add to Importer the capacity to search Models only with Model Name since Model Number is not required
|
2022-01-15 04:32:47 -06:00 |
|
|
Ivan Nieto Vivanco
|
58b1db29e2
|
Adds condition to only update the Asset's Model Number if is provided by import file
|
2022-01-15 04:15:38 -06:00 |
|
|
Ivan Nieto Vivanco
|
8bd280b416
|
Add to Importer the capacity to search Models only with Model Name since Model Number is not required
|
2022-01-15 04:12:30 -06:00 |
|
|
Ivan Nieto Vivanco
|
949fe2a14a
|
Adds last_audit_date and next_audit_date in the asset importer
|
2022-01-13 15:14:20 -06: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
|
76cc46c419
|
Merge pull request #9814 from 01ste02/importMinAmt
Improved Consumable Import: Import min_amt for consumables
|
2021-10-28 17:49:44 -07:00 |
|
|
snipe
|
31d49b5c9b
|
Fixed merge error parse error
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 18:11:34 -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 |
|
|
snipe
|
d0acb9fdb4
|
Applies PR #10150 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-30 15:33:00 -07:00 |
|
|
Ivan Nieto Vivanco
|
11aa8971c8
|
Fix error if the Department is also empty
|
2021-09-30 17:20:44 -05:00 |
|
|
Ivan Nieto Vivanco
|
5c7aaaac22
|
Fix error when department is null
|
2021-09-30 16:46:23 -05:00 |
|