Commit Graph

8 Commits (master)

Author SHA1 Message Date
Skylar Ittner f1f682780c Merge BusinessAppTemplate
# Conflicts:
#	.gitignore
#	README.md
#	action.php
#	api.php
#	app.php
#	composer.json
#	composer.lock
#	index.php
#	langs/en/core.json
#	langs/en/titles.json
#	langs/messages.php
#	lib/Exceptions.lib.php
#	lib/Login.lib.php
#	lib/Notifications.lib.php
#	lib/Strings.lib.php
#	lib/User.lib.php
#	mobile/index.php
#	nbproject/project.properties
#	nbproject/project.xml
#	pages.php
#	pages/home.php
#	required.php
#	settings.template.php
#	static/css/bootstrap.min.css
#	static/img/logo.svg
#	static/js/app.js
5 years ago
Skylar Ittner fec5e13415 Fix "server error" message with incorrect username 6 years ago
Skylar Ittner b561e14282 Add TaskFloor Messages app 7 years ago
Skylar Ittner d6df9d582c User name in navbar now links to Portal home 7 years ago
Skylar Ittner ee4899de80 Improve error handling, add password changing, add taskfloor tasks module 7 years ago
Skylar Ittner 71347c33f1 Update readme 7 years ago
Skylar Ittner 16cbf2a5f1 Create template based on SSO code 7 years ago
Skylar Ittner b16da81513 Frist 7 years ago