239 commits

Author	SHA1	Message	Date
snipe	227fef76ee	Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group ... Adds a permission group selection for directory sync	2022-12-15 11:06:53 -08:00
Godfrey M	2e228ccb0b	redid a few things. should be good now :)	2022-12-15 10:45:42 -08:00
akemidx	f3e57d7dc0	fixing PR	2022-12-13 16:00:59 -05:00
akemi	55f5e7866d	edits for PR	2022-11-29 15:59:36 -05:00
akemi	39e06a8856	Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated	2022-11-28 14:16:22 -05:00
snipe	b95d24b5eb	Additional translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:27:44 +00:00
snipe	e670ffe349	Added Assets Assigned to tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:16:06 -07:00
Godfrey M	f9ac447dd1	adds default group to LDAP	2022-10-18 15:18:09 -07:00
snipe	cfb780b20b	Remove unused files ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:39:10 -07:00
snipe	2ef45afb2b	Removed extraneous files ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-13 12:18:57 -07:00
snipe	5ba01728d9	More text tweaking ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:51:25 -07:00
snipe	ae0eb378e4	Additional clarification ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:43:54 -07:00
snipe	ad8a2387f0	Updated help text to be more clear ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-11 12:38:37 -07:00
snipe	dcab1381e7	Check for licenses.files permissions ... Signed-off-by: snipe <snipe@snipe.net>	2022-09-16 14:00:27 -07:00
Godfrey M	193b31e427	select options working, testing sync then done	2022-08-31 12:58:33 -07:00
Godfrey M	fc6fefdb4e	adds migration, variables, checkbox,working on groups	2022-08-25 15:19:38 -07:00
snipe	2c68ec927a	Use trans_choice for string ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:30:59 -07:00
snipe	095dd3ecf2	Added configuration, PAT test strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:28 -07:00
snipe	32010d5387	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:27 -07:00
mikeroq	5efe45226d	Fixes Email List of All Assigned being "successful" when the user has no email ... Added check in view to disable button if there is no email Added translation for title on disabled button and for email check in controller Fixed missing trans for user not found message	2022-07-11 20:02:10 -05:00
Godfrey M	e471aa8639	adds button to email user list of assets from profile	2022-06-29 11:15:15 -07:00
snipe	9355689dd4	Nicer output for custom fields error ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 11:52:51 -07:00
snipe	d70b36750c	Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset ... Fixes #8155 - improve the workflow during asset creation	2022-06-24 18:53:07 -07:00
Ivan Nieto Vivanco	7976401aa2	Add error message when the default customfield values can't be validated	2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco	44f4f20187	Only fix typo in 'en' file	2022-06-07 19:09:59 -05:00
Ivan Nieto Vivanco	792b18f845	Return language files to previous state	2022-06-07 19:09:03 -05:00
Ivan Nieto Vivanco	064f4b3fc6	Fix typo in language files	2022-06-07 16:30:18 -05:00
snipe	5bc5e9f108	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/lang/en/admin/locations/general.php	2022-06-05 17:14:31 -07:00
snipe	985e683896	Small display improvements ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 16:59:53 -07:00
snipe	2db6cf85a7	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php	2022-05-24 15:10:46 -07:00
snipe	5be7dee3d3	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 15:07:14 -07:00
snipe	67616dbcf4	Updated language strings from activated to able to login ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 13:12:02 -07:00
snipe	5030c7e5ff	Added missing backups help string ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-14 10:24:03 -07:00
snipe	6b27c0311d	Updated help text on groups for more info on deselecting ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:23:12 -07:00
snipe	d5edb0908b	Added translation string to the correct file this time ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 14:07:05 -07:00
Achmad Fienan Rahardianto	dafe353050	Implements #8155 to improve the workflow during asset creation ... - adding 2 options to hide optional information	2022-04-23 14:41:38 +07:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07: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	43c1949092	Add remote option to user ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -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	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
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	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	16fb2213b5	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-28 12:40:03 -08:00
snipe	af2e407543	Normalize array format in en language to the new shitty way ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:30:35 -08:00