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
..
bootstrap	Added resources	2020-04-22 07:15:24 -07:00
components	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
extensions	Updated more fa icons	2021-09-26 01:11:08 -07:00
locale	Added resources	2020-04-22 07:15:24 -07:00
plugins	Updated more fa icons	2021-09-26 01:11:08 -07:00
app.js	Removed vendor.js from setup blade	2020-04-22 07:15:12 -07:00
bootstrap-js.js	Fixed missing </h3 tags	2020-03-31 23:36:56 -07:00
bootstrap-table-locale-all.js	Added resources	2020-04-22 07:15:24 -07:00
bootstrap-table-locale-all.min.js	Added resources	2020-04-22 07:15:24 -07:00
bootstrap-table.css	Added resources	2020-04-22 07:15:24 -07:00
bootstrap-table.js	Added resources	2020-04-22 07:15:24 -07:00
bootstrap-table.min.css	Added resources	2020-04-22 07:15:24 -07:00
bootstrap-table.min.js	Added resources	2020-04-22 07:15:24 -07:00
bootstrap.datepicker.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
bootstrap.js	Fixed font awesome caret	2021-09-25 23:17:35 -07:00
bootstrap.min.js	Fixed missing </h3 tags	2020-03-31 23:36:56 -07:00
dashboard.js	Added resources	2020-04-22 07:15:24 -07:00
dashboard2.js	Added resources	2020-04-22 07:15:24 -07:00
demo.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
ekko-lightbox.js	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
ekko-lightbox.min.js	Switched to h2 from h4	2020-04-01 03:51:08 -07:00
FileSaver.min.js	Added resources	2020-04-22 07:15:24 -07:00
html5.js	Added resources	2020-04-22 07:15:24 -07:00
html5shiv.js	Added resources	2020-04-22 07:15:24 -07:00
jquery.dragtable.js	Added resources	2020-04-22 07:15:24 -07:00
jquery.fileupload.js	Added resources	2020-04-22 07:15:24 -07:00
jquery.iframe-transport.js	Added resources	2020-04-22 07:15:24 -07:00
jquery.js	Added resources	2020-04-22 07:15:24 -07:00
jquery.typeahead.min.js	Added resources	2020-04-22 07:15:24 -07:00
jquery.ui.widget.js	Added resources	2020-04-22 07:15:24 -07:00
jspdf.min.js	Added resources	2020-04-22 07:15:24 -07:00
jspdf.plugin.autotable.js	Added resources	2020-04-22 07:15:24 -07:00
signature_pad.js	Fixing assets :(	2020-04-21 03:07:11 -07:00
snipeit.js	Updated snipeit.js with "restore" modal code	2021-11-09 22:39:33 -08:00
snipeit_modals.js	Updated more fa icons	2021-09-26 01:11:08 -07:00
vue.js	Most of the basics are working, but not done and lots of debug messages are about	2021-10-04 22:06:48 -07:00