2363 commits

Author	SHA1	Message	Date
Ivan Nieto Vivanco	86bd90c564	Show icons in the asset view for boolean customfields	2022-03-09 21:46:19 -06:00
snipe	c817daa4da	Merge pull request #10767 from uberbrady/fix_double_request_datatable ... One attempt to fix the 'datatable double-request' problem.	2022-03-08 20:34:15 -08:00
Ivan Nieto Vivanco	657cfddd3c	Add a condition to show customfields as the user wants in localization settings	2022-03-08 18:28:13 -06:00
Brady Wetherington	8d49d35463	Remove another data-toggle="table" - possibly the last one	2022-03-07 12:52:57 -08:00
Brady Wetherington	6f3e9033c2	One attempt to fix the 'datatable double-request' problem.	2022-03-07 12:52:57 -08:00
snipe	9a358087ec	Add remote user to bulk edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:47:23 -08:00
snipe	06a05e6340	Added remote to view ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:37:28 -08:00
snipe	43c1949092	Add remote option to user ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -08:00
snipe	a9069e65e5	Don’t show groups in menu if there are none yet ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 04:39:39 -08:00
snipe	1400c610a1	Use correct button translation ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 04:22:44 -08:00
snipe	0d787fcc94	Updated language files ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 22:21:44 -08:00
snipe	b876d0abb0	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php	2022-03-03 21:59:38 -08:00
snipe	5266b2c71f	Added notes field to view blades ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:30:27 -08:00
snipe	dc1e0ecdb7	Merge pull request #10739 from insert-waffle/fixes/prevent_double_values_email ... Feature: Prevent showing of double values in a checkin or checkout email	2022-03-02 14:28:22 -08:00
Jens Maes	9b88f650d2	Prevents showing double values ... - If the asset name and tag are the same, the tag does not get shown in an email. - If the model name is the same as the model number (when importing from LanSweeper for example), do not show the model number.	2022-02-25 08:19:46 +01:00
snipe	d243b822e7	Merge pull request #10729 from insert-waffle/fix-10708 ... Fixes 10708: removed line height of manufacturer and changed size of fa-hdd to 2x	2022-02-24 14:46:51 -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
Jens Maes	57e93e4e92	Fixes 10708: change size of fa-hdd to 2x	2022-02-24 11:05:40 +01:00
Jens Maes	c0893c44a3	Fixes 10708: Removed line heigt from manufacturer list item.	2022-02-24 10:29:39 +01:00
snipe	42fcd29200	Fixed #10436 on master, applies #10449 ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 21:06:54 -08:00
snipe	dd5f812d88	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/FixDoubleEscape.php # app/Console/Commands/LdapSync.php # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/CompaniesController.php # app/Http/Controllers/Api/DepartmentsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Models/Loggable.php # app/Providers/AuthServiceProvider.php # config/version.php # database/migrations/2014_11_04_231416_update_group_field_for_reporting.php # database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php # package-lock.json # package.json # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/forms/asset-models/fieldset-default-values.vue # resources/views/hardware/view.blade.php	2022-02-20 13:29:12 -08:00
snipe	34ebc629c2	Remove unusued translation string ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-20 11:15:56 -08:00
snipe	eaf4fefc90	Merge pull request #10700 from insert-waffle/develop ... Fixes #10699: Added 2 breaks in message.blade.php	2022-02-20 11:12:20 -08:00
Jens Maes	e5f6b48115	🧑‍🔧 Added 2 breaks in message.blade.php ... The uploaded logo does not align properly, therefor I added 2 breaks which make sure the site title is BELOW the logo and not next to it.	2022-02-18 10:27:12 +01:00
Ivan Nieto Vivanco	f1ba5c7742	Changed the warning message in the Backups page	2022-02-17 22:47:35 -06:00
snipe	5fe999eb02	Shored up the date math, updated the explanation ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:34:33 -08:00
snipe	13832856f1	Added strings for unique ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:59 -08:00
snipe	824eedf7c2	Added UI elements for is_unique ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:48 -08:00
snipe	05c0819776	Updated language string ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 15:55:42 -08:00
snipe	99541f0bee	Fixed string ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 21:05:23 -08:00
snipe	8b8e93d703	Fixed #10659 - wrong translation string reference ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 21:03:09 -08:00
snipe	d406dc43c2	Check for valid user before trying to present the auditor name ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 20:13:02 -08:00
snipe	2ce44bd4e6	Line break for easier debugging ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 20:06:55 -08:00
snipe	6b25b53462	Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio ... Fixes #10299 Default Values do not allow Checkbox/Radio Buttons	2022-02-09 14:39:46 -08: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	413e44be2f	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco	d71aa859fc	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:43:24 -06:00
Ivan Nieto Vivanco	796a0ebdaa	Add initial support for default values in checkboxes customfields	2022-02-07 22:17:40 -06:00
Godfrey M	5a70bba51b	changed model for default currency requirement check	2022-02-07 09:51:35 -08:00
snipe	8add47739e	Merge pull request #10604 from inietov/fixes/column_activated_cannot_be_null ... Fixes: Column activated cannot be null [sc-18528]	2022-02-02 12:21:31 -08:00
snipe	c0cc90066f	Merge pull request #10605 from inietov/fixes/column_activated_cannot_be_null_develop ... Fixes: Column activated cannot be null for develop [sc-18528]	2022-02-02 12:16:39 -08:00
Ivan Nieto Vivanco	fa2f8409f9	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 14:09:23 -06:00
Ivan Nieto Vivanco	eac8e0bdba	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 13:54:57 -06:00
snipe	ce154a2382	Merge pull request #10455 from adagioajanes/features/quickscan_checkin ... Added #10454: Quick Scan Checkin	2022-02-01 20:19:45 -08:00
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
snipe	2815e0d36e	Fixed audit email template (applies #10592 to master) ... Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 17:27:32 -08:00
Brady Wetherington	eaba560877	We had a markdown failure in the upcoming audits table, this fixes it.	2022-02-01 14:06:01 -08:00