DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/resources/views
History
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
..
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 UI elements for is_unique 2022-02-16 13:47:48 -08: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 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -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 branch 'develop' into features/quickscan_checkin 2022-01-11 16:40:20 -05: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 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08: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 changed model for default currency requirement check 2022-02-07 09:51:35 -08: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 #10659 - wrong translation string reference 2022-02-10 21:03:09 -08:00
vendor 🧑‍🔧 Added 2 breaks in message.blade.php 2022-02-18 10:27:12 +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