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
..
accessories	Add additional info on accessories view page	2021-09-26 03:59:04 -07:00
account	Removed extra spaces	2022-01-12 23:18:39 -08:00
asset_maintenances	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
auth	First steps at getting dusk working	2021-11-30 20:09:29 -08:00
categories	Merge master down into develop	2021-12-16 14:26:24 -08:00
companies	Added localized strings for admin/companies	2021-11-02 10:23:15 +01:00
components	Delete extra character remaining from previous tests :(	2021-12-14 12:32:30 -06:00
consumables	Use Helper alias	2021-09-28 19:44:55 -07:00
custom_fields	Added localization strings for partials, added file structure	2021-11-19 12:12:11 +01:00
departments	Add a hidden field to handle departments inside Full Company Support config	2021-07-29 13:28:57 -05:00
depreciations	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
errors	More fa icons	2021-09-24 07:21:30 -07:00
groups	Added localized strings for groups	2021-11-02 12:03:41 +01:00
hardware	Fixed double div in current purchase value	2022-01-12 22:26:56 -08:00
importer	Added localized strings for improter, added en structure	2021-11-02 14:09:22 +01:00
kits	Added localized strings for kits	2021-11-02 14:25:21 +01:00
layouts	merge	2021-12-17 00:14:36 +01:00
licenses	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
livewire	Merge branch 'develop' into remove_old_ldap	2022-01-03 12:56:58 -08:00
locations	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
manufacturers	Updated more fa icons	2021-09-26 01:11:08 -07:00
modals	Merge pull request #9 from snipe/develop	2022-01-04 10:48:51 +01:00
models	Add an early return if the model id is not set (for new Asset Models)	2022-01-21 11:45:45 -06:00
notifications	Fixed audit email template (applies #10592 to master)	2022-02-01 17:27:32 -08:00
paginator	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
partials	Merge master into develop	2022-01-12 20:51:33 -08:00
reports	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
settings	Merge master into develop	2022-01-12 20:51:33 -08:00
setup	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
statuslabels	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
suppliers	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
users	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
vendor	Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them	2021-11-19 15:32:13 +01:00
dashboard.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
notifications.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