ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
224d0b2fd2cc1dc1b454053cd1ef0e70242aae91
snipe-it/resources/views
T
History
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
..
accessories
Add additional info on accessories view page
2021-09-26 03:59:04 -07:00
account
Fixed escaped string
2022-01-12 11:20:31 -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
Added localized strings for depreciations
2021-11-02 11:50:56 +01: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
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
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
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
Added localized strings for notifications
2021-11-02 15:44:57 +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
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