Brady Wetherington
cc5ad456e6
Expose the 'sanitize' system for backup restores to the web GUI
2024-08-14 15:59:21 +01:00
snipe
4a9bd95ed3
Added language support for select2
...
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 18:40:10 +01:00
Marcus Moore
48fc6ca60e
Remove commented code
2024-06-05 11:46:57 -07:00
Marcus Moore
2eaac3d381
Fix select2 re-renders
2024-05-30 16:20:04 -07:00
Marcus Moore
093c6652a8
Update select2 snippet for Livewire 3
2024-05-29 12:58:24 -07:00
Brady Wetherington
8f2843bfcf
Merge branch 'develop' into snipeit_v7_laravel10
...
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
2024-02-21 20:22:28 +00:00
Godfrey M
c4eaae923a
removed vue comments since they do not apply anymore
2024-02-08 15:02:47 -08:00
Godfrey M
ca59bc3c9c
removes if statement that prevents select2-ifying inputs
2024-02-06 12:46:17 -08:00
Marcus Moore
149d159c05
Remove unused bootstrap resources
2023-12-18 11:49:52 -08:00
Marcus Moore
c0ad16f497
Remove unused vendor js files
2023-12-18 11:48:28 -08:00
spencerrlongg
d29f4489de
fix
2023-12-12 14:09:12 -06:00
spencerrlongg
65cbba3c2e
completely kill vue
2023-12-11 18:09:22 -06:00
spencerrlongg
f93e7b91ff
that's all folks
2023-12-06 16:20:30 -06:00
spencerrlongg
3106035ef9
delete, comment
2023-12-05 20:41:34 -06:00
spencerrlongg
36aac328e4
delete vue component
2023-11-15 20:32:22 -06:00
snipe
0bf423cda9
Set modal focus to modal-name field
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 19:16:40 +01:00
snipe
2a638e66f0
Added column re-ordering
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-15 21:53:34 +01:00
Marcus Moore
74c7f106ce
Reset assigned_x values when changing check out to type
2023-09-13 13:43:35 -07:00
snipe
3bd87a2785
Removed iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:52:54 -07:00
snipe
868615d5e7
Removed iCheck from snipeit.js and webpack
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 12:17:31 -07:00
snipe
094859cfe8
Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased
2023-03-07 21:38:04 -08:00
snipe
383b5b43bb
Added a few more jquery options for prevoew flexibility
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 18:54:38 -08:00
snipe
f460d881da
Updated vue
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 14:27:53 -08:00
Brady Wetherington
5cf66851f7
Finalizing the Livewire Importer! Just going to do some testing now
2023-02-28 21:58:02 -08:00
Brady Wetherington
0a085af0a0
Getting the basic wiring of the importer over into Livewire
...
WIP: Wiring up more and more of the actions on the importer
Files now upload okay, a little glitchy on the display-side though
add to readmes so i dont forget
2023-02-27 14:28:59 -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
06ba9356ca
Delete another set of duplicates
2022-09-26 18:57:35 -05:00
Ivan Nieto Vivanco
e034f7b674
Delete another duplicate that somehow has survived
2022-09-26 18:56:24 -05:00
Ivan Nieto Vivanco
4d14243f57
Delete duplicate fields from the importer dropdown menu
2022-09-26 18:51:13 -05:00
snipe
c0868a68fb
Removed console.log cruft
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:44:38 -07:00
snipe
780222d372
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
snipe
89fee23d32
Commented out console log that was pooping up the joint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 08:34:30 -07:00
snipe
8195a664a9
Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop
...
Fixes Importer always update existing values develop
2022-04-05 21:11:24 +01:00
Brady Wetherington
6756dd193e
SCIM integration using the 're-do-the routes' approach, which seems like a dead-end
...
Cleaning up routes to match laravel-scim-server's recommended implementation
Some actually *working* changes for SCIM support?!
Whoops, forgot my route file
Fix public SCIM routes
Removed Ziggy, removed old generated file, yanked Ziggy references
Resolves the first set of comments for SCIM
Ensure all /api routes have baseUrl prepended
Fix the parent:: call to be, uh, actually correct :P
Clarify the route-ordering, as it is quite tricky
This gets it so that users can actually be saved..
Work around the lack of callbacks with some inheritance
Mapped a bunch more fields from SCIM into Snipe-IT's user table
More baseUrl shenanigans since we yanked Ziggy :/
Properly map job title and work with some other necessary attributes
Map more fields...
Finalized basic mapping for core and enterprise namespaces
Latest tuned settings for SCIM config to work with Azure (and others)
2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco
1a448cc4b6
Take the values from the importer form to configure the used importer
2022-03-29 17:31:43 -06:00
snipe
54d6a4d978
Fixed #10825 - selectlists in modals b0rked
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 08:23:50 -07: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
Ivan Nieto Vivanco
6d79c9f3e2
Save the default values for custom fields with same format than Assets do for actual values
2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco
a36957dd77
Finish the implementation of custom fields default values for checkboxes
2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco
2f3499e4b9
Show checkboxes a little less assy, actually save the data checked by them
2022-02-09 10:49:10 -06:00
Ivan Nieto Vivanco
796a0ebdaa
Add initial support for default values in checkboxes customfields
2022-02-07 22:17:40 -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
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
949fe2a14a
Adds last_audit_date and next_audit_date in the asset importer
2022-01-13 15:14:20 -06:00
snipe
312200bf44
Removed duplicate "department" entry in importer, pulls #10460 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-21 13:37:20 -08:00
Ivan Nieto Vivanco
e03a8cc721
Delete an extra entry for Departments when importing Users via GUI
2021-12-21 14:42:51 -06:00
