DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-28 14:10:51 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
snipe-it/resources/views
History
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
..
accessories Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
account adds most of the fields for an accessory eula agreement pdf 2022-03-21 09:18:29 -07:00
asset_maintenances
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
depreciations Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
errors
groups Added localized strings for groups 2021-11-02 12:03:41 +01:00
hardware Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 2022-03-22 10:10:56 -07: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 SCIM integration using the 're-do-the routes' approach, which seems like a dead-end 2022-04-05 20:26:37 +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
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
partials This disables the display of HTML content during exports, without enabling XSS attacks 2022-04-07 16:37:32 +01:00
reports Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01:00
settings WIP: needs to be tested. adds ldap_manager field to ldap sync 2022-03-21 11:15:39 -07: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 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 2022-04-28 17:49:06 +01: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