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 407445456a Merge branch 'features/6204_email_audit-alerts' into develop 
# Conflicts:
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/LicensesController.php
#	composer.json
#	composer.lock
#	config/version.php
#	resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
..
accessories More help text updates 2018-10-04 21:14:45 -07:00
account Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
asset_maintenances Create asset maintenance - Added orange bar for required asset to edit view (#5520) 2018-05-16 19:23:23 -07:00
auth Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
categories More help text updates 2018-10-04 21:14:45 -07:00
companies More help text updates 2018-10-04 21:14:45 -07:00
components Remove company select option if the user is not an admin and FCS is enabled 2018-10-05 07:30:42 -07:00
consumables More help text updates 2018-10-04 21:14:45 -07:00
custom_fields Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381) 2018-12-06 20:05:04 -08:00
departments More help text updates 2018-10-04 21:14:45 -07:00
depreciations More help text updates 2018-10-04 21:14:45 -07:00
errors Nicer formatting on 503 2017-10-28 07:01:45 -07:00
groups Fixed weird display for self options 2018-07-24 12:41:58 -07:00
hardware Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
importer Import page is blank [ch90] (#6636) 2019-01-24 15:34:50 -08:00
kits Added translation, removed commented out code 2019-03-13 12:15:48 -07:00
layouts Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
licenses Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
locations Pass variable to edit-form to determine whether we should have a top submit button 2018-10-04 21:19:25 -07:00
manufacturers [WIP] Added #5957 - Flysystem support (#6262) 2018-09-29 21:33:52 -07:00
modals Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop 2019-03-08 16:18:48 -08:00
models Fixes #6794: Fix URLs to access some 'missing' images (#6795) 2019-03-08 12:47:37 -08:00
notifications Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
paginator Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00
partials Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
reports Added asset tag to maintenances report 2019-02-13 07:09:16 -08:00
settings Removed help text for email images (since we embed them by default now) 2019-04-02 18:22:31 -07:00
setup Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop 2019-02-13 23:02:21 -08:00
statuslabels Added: #6246 - CSS Cleanup (#6247) 2018-09-28 14:09:48 -07:00
suppliers Fixes #6794: Fix URLs to access some 'missing' images (#6795) 2019-03-08 12:47:37 -08:00
users Fix double-encoding issue? 2019-03-20 04:12:03 -07:00
vendor Added ability to upload favicon and email logo 2018-12-05 19:56:12 -08:00
dashboard.blade.php Remove test data for Pie (#6793) 2019-03-08 12:46:47 -08:00
notifications.blade.php Kits checkout. But only with models. 2018-11-13 20:33:32 +03:00