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
..
alerts.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
api.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
asset_tags.blade.php	Merge master into develop	2022-01-12 20:51:33 -08:00
backups.blade.php	Merge branch 'develop' into added-localized-strings	2022-01-09 17:40:54 +01:00
barcodes.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
branding.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
general.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
index.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
labels.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
ldap.blade.php	Merge pull request #10264 from nuraeil/added-localized-strings	2022-01-10 14:48:52 -08:00
localization.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
logins.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
phpinfo.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
purge-form.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
purge.blade.php	Reformat all view files. (#3105)	2016-12-27 12:03:47 -08:00
saml.blade.php	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
security.blade.php	Added localized strings for admin/settings	2021-11-19 15:23:48 +01:00
slack.blade.php	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