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
..
account	Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general	2021-11-04 20:15:23 +01:00
admin	Merge master into develop	2022-01-12 20:51:33 -08:00
auth	Removed unused translations	2021-06-29 07:46:27 -07:00
partials/forms	Added localization strings for partials, added file structure	2021-11-19 12:12:11 +01:00
auth.php	Shift core files	2021-06-10 20:16:59 +00:00
button.php	Added localization strings for partials, added file structure	2021-11-19 12:12:11 +01:00
general.php	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
help.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
mail.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
pagination.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
passwords.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
reminders.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
table.php	Added localized strings for reports	2021-11-19 12:39:19 +01:00
validation.php	Removed form request on ajax, cleaned up some other things	2021-12-08 17:58:46 -08:00