Commit Graph

11 Commits (master)

Author SHA1 Message Date
Skylar Ittner e1837a22fe Merge ../BusinessAppTemplate
# Conflicts:
#	README.md
#	api.php
#	index.php
#	langs/en/core.json
#	langs/en/titles.json
#	mobile/index.php
#	required.php
#	settings.template.php
5 years ago
Skylar Ittner f1a85f47fd Add comment 5 years ago
Skylar Ittner 5b7ab65946 Make better API system, use new AccountHub API 5 years ago
Skylar Ittner f2d3c199ab Merge BusinessAppTemplate
# Conflicts:
#	composer.lock
#	lang/en_us.php
#	lib/login.php
#	mobile/index.php
6 years ago
Skylar Ittner 1271317eb9 Rewrite to use classes, aligning with AccountHub 2.0 6 years ago
Skylar Ittner 046f965fee Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 6 years ago
Skylar Ittner d10c6214a6 Switch to Mozilla Public License 2.0 for code consistency 6 years ago
Skylar Ittner 0593f4c6d4 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/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
Skylar Ittner 623c5e2f01 Fully implement MPL-2.0 license 6 years ago
Skylar Ittner 66269b6221 Branding++ 7 years ago
Skylar Ittner 0b811feccb Add api.php 7 years ago