DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/resources/views
History
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
2022-03-03 21:59:38 -08:00
..
accessories Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08: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 Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
consumables Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08: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 Fixes 10708: change size of fa-hdd to 2x 2022-02-24 11:05:40 +01: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 Prevents showing double values 2022-02-25 08:19:46 +01: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 Fixed #10436 on master, applies #10449 2022-02-22 21:06:54 -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