508 commits

Author	SHA1	Message	Date
snipe	9db0b038a5	Updated translation strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-08 15:29:28 -07:00
snipe	095dd3ecf2	Added configuration, PAT test strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:28 -07:00
Godfrey M	e150ab58e9	reworded trans	2022-08-02 10:31:06 -07:00
Godfrey M	ff080a2d8f	replace checkboxes with radiobuttons	2022-08-02 10:27:55 -07:00
Godfrey M	842dafefec	adds options to include Deleted assets to custom asset reports	2022-08-01 14:52:12 -07:00
snipe	25cc46e416	Fixed button string ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 18:01:41 -07:00
snipe	32010d5387	Updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:27 -07:00
snipe	b7c7e6c623	Added/updated language strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:56:58 -07:00
snipe	0ccd7e09de	Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include ... adds a checkbox to exclude archived assets from custom reports	2022-07-12 12:59:18 -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	75844c5942	adds a checkbox to exclude archived assets from custom reports	2022-07-11 09:56:58 -07:00
snipe	ef17fd41f7	Merge branch 'develop' into develop	2022-07-05 16:26:53 -07:00
snipe	dae53a1128	Updated translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-05 16:18:53 -07:00
Daniel Reeder	7772ef22db	Quick typo fix	2022-07-04 21:57:54 +00:00
snipe	b910db0617	Fixed #11393 - reject acceptance if no file is present ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 21:01:58 -07:00
snipe	df1e2687d6	Updated languages ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 17:35:02 -07:00
Godfrey M	e471aa8639	adds button to email user list of assets from profile	2022-06-29 11:15:15 -07:00
snipe	ed95adb45c	Show model files on hardware page ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 16:17:46 -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
snipe	8c85d7bc97	Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating ... Adds validation to custom fields' default values	2022-06-24 18:11:16 -07:00
snipe	657039882c	Added purge and backup strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:48:46 -07:00
snipe	77bf28bcb6	Disallow purge ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 20:11:43 -07:00
snipe	86d2c2b153	Small naming changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:11:59 -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
snipe	2f258a3e3d	Make the strings match ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 18:48:22 -07:00
snipe	1b6df232aa	Updated string ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 18:41:02 -07:00
snipe	de048e1009	Updated language ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:59 -07:00
snipe	d4c53945d9	Tweaked language ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:19:49 -07:00
snipe	21875100b6	Fixed missing password.token string and checked for user existing before trying to reset ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:15:38 -07:00
snipe	6ea722d41e	Merge pull request #11271 from inietov/fixes/bulk_delete_not_checking_assignedto_type ... Fix typo in language files	2022-06-13 19:24:08 -07:00
Godfrey M	c8bc0eff11	fixes translation references in the users ldap blade	2022-06-08 09:52:55 -07: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	514db05770	Merge remote-tracking branch 'origin/develop'	2022-06-03 13:29:04 -07:00
snipe	7ca617f077	Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap ... Added explicit “Example:” text in placeholders	2022-06-03 13:28:40 -07:00
snipe	54f828743e	Merge remote-tracking branch 'origin/develop'	2022-06-03 12:54:13 -07:00
snipe	3071a83ae0	Added the validation strings for user creation password options ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 12:00:56 -07:00
snipe	1c4864a3cc	Added explicit “Example:” text in placeholders ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 11:25:18 -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	5d83516659	Fixed typoe on maintenance screen ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-24 13:15:01 -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	891009dc67	Nicer formatting for buttons in bulk user edit ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 15:35:57 -07:00
snipe	0f9559c1ff	Fixed #11124 - updated maintenance page ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 19:01:37 -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	3a31104b5c	Fixed #11052 - add file sizes to upload displays ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 19:33:14 -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
Godfrey M	33b1ab3658	prevents values for assets being negative through validation	2022-05-10 16:19:06 -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
snipe	2982d78899	Added translation for no assets selected ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:42:02 -07:00
snipe	caef98d36d	Patched #11025 to develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 02:06:12 -07:00
snipe	784bf4d784	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js	2022-05-06 01:52:43 -07:00
snipe	c0e9393092	Fixed #10890 - use translation strings in user asset printout ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 01:30:58 -07:00
snipe	c01f0880ef	Changed language string ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-05 10:52:57 -07:00
snipe	9aac1cbba4	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php	2022-04-28 17:49:06 +01: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
snipe	5fba8202d6	Updated translations ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-11 15:40:58 +01:00
snipe	bdabbbd4e9	Logout user when their activated status is switched to off ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 13:44:53 +01:00
snipe	b5f3a357e2	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync ... This looks good, thanks!	2022-03-29 12:06:01 +01:00
Godfrey Martinez	fe6a6740db	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -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
Godfrey M	e1a6a2afc6	adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet	2022-03-10 12:15:50 -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	43c1949092	Add remote option to user ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -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	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	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	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
snipe	ddfa5776c5	Updated language strings ... This absolutely sucks. Something changed in CrowdIn or something else, which results in this push being *thousands* of files because someone somewhere decided that `return [];` was vastly inferior to `return array();` I'll try to fix it. :( FML Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:27:29 -08:00
snipe	da47f62d17	Added strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:20:38 -08:00
snipe	224d0b2fd2	Small language file additions ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:21:00 -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
Alex Janes	edef640d35	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
Wächtler, Yannick	f906dbd81e	Added missed translation strings, fixed the column width for the date selector (too small in certain languages)	2022-01-10 09:21:23 +01:00
Nuraeil	5bb2f6fa0f	Merge branch 'develop' into added-localized-strings	2022-01-09 17:40:54 +01:00
snipe	0f5bb0e65d	Localize bakcup restore strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-07 16:50:19 -08: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
Alex Janes	5fe2083688	Adjusted the phrasing around auto-incrementing asset tags.	2021-12-31 16:33:30 -05:00
Alex Janes	2e5820e29d	small phrase change	2021-12-20 23:31:10 -05:00
Alex Janes	b01a4468c7	refactored from bulkcheckin to quickscancheckin	2021-12-20 23:27:36 -05:00
Alex Janes	55b8d080b9	more lang changes	2021-12-20 19:39:06 -05:00
Alex Janes	fcc9815c6e	Revert "Added phrase to all language files to prevent errors (translation still needs to happen)" ... This reverts commit 87ef37b0b4.	2021-12-20 18:05:21 -05:00
Alex Janes	cb14abfc54	Revert "fixed zh-CN file format" ... This reverts commit 20f66a1b55.	2021-12-20 18:05:09 -05:00
Alex Janes	20f66a1b55	fixed zh-CN file format	2021-12-20 14:05:13 -05:00
Alex Janes	87ef37b0b4	Added phrase to all language files to prevent errors (translation still needs to happen)	2021-12-19 18:50:55 -05:00