You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ManagePanel/pages
Skylar Ittner 99a852787d Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate
# Conflicts:
#	.gitignore
#	README.md
#	action.php
#	api.php
#	app.php
#	composer.json
#	composer.lock
#	index.php
#	lang/en_us.php
#	lang/messages.php
#	lib/iputils.php
#	lib/login.php
#	lib/userinfo.php
#	mobile/index.php
#	nbproject/project.properties
#	nbproject/project.xml
#	pages.php
#	pages/404.php
#	pages/home.php
#	required.php
#	settings.template.php
#	static/css/app.css
#	static/img/logo.png
#	static/img/logo.svg
#	static/js/app.js
6 years ago
..
404.php Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 6 years ago
authlog.php Minor BS4 adjustments 6 years ago
clearlog.php Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 6 years ago
deluser.php Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 6 years ago
edituser.php Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 6 years ago
export.php Improve design of reports page 6 years ago
groups.php Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 6 years ago
home.php Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 6 years ago
managers.php Minor BS4 adjustments 6 years ago
permissions.php Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 6 years ago
users.php Minor BS4 adjustments 6 years ago