Commit Graph

80 Commits (master)

Author SHA1 Message Date
Skylar Ittner 7e1439dd3c Merge AppTemplate 4 years ago
Skylar Ittner 26b16ccbe6 Missed a spot 4 years ago
Skylar Ittner 3c6851e38e Update dependencies 4 years ago
Skylar Ittner 367062b76c Update FontAwesome version 4 years ago
Skylar Ittner 81ad5e653e Merge ../AppTemplate
# Conflicts:
#	README.md
#	composer.lock
#	nbproject/project.xml
4 years ago
Skylar Ittner f27812997f Use FontAwesome CSS+webfont instead of JS, upgrade 5.7.2 to 5.8.1 5 years ago
Skylar Ittner 59136bd8eb Merge ../BusinessAppTemplate
# Conflicts:
#	README.md
#	action.php
#	api/functions.php
#	lib/User.lib.php
#	mobile/index.php
#	pages/form.php
#	settings.template.php
#	static/js/form.js
5 years ago
Skylar Ittner 53e158b553 Update FontAwesome 5.6.0 -> 5.7.2 5 years ago
Skylar Ittner 474047ab34 Update Bootstrap 4.1.3 -> 4.3.1 5 years ago
Skylar Ittner 289aaeaa9f Minor text changes 5 years ago
Skylar Ittner 223a431e8b Merge BusinessAppTemplate 5 years ago
Skylar Ittner e0802f582b Remove unneeded index.css 5 years ago
Skylar Ittner 2836a05f90 Add app icon to login flow 5 years ago
Skylar Ittner 74971a4592 Add new more flexible login flow 5 years ago
Skylar Ittner bb5639c447 Merge BusinessAppTemplate (new settings.php format)
# Conflicts:
#	api.php
#	api/apisettings.php
#	api/index.php
#	app.php
#	index.php
#	langs/en/titles.json
#	lib/Login.lib.php
#	lib/Notifications.lib.php
#	lib/User.lib.php
#	mobile/index.php
#	required.php
#	settings.template.php
5 years ago
Skylar Ittner 61d660be69 Add FormBuilder 5 years ago
Skylar Ittner 32cd18933d Update FontAwesome from 5.3.1 to 5.6.0 5 years ago
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 e714286e5a Close #13 5 years ago
Skylar Ittner 47539de2d7 Fix bootstrap font URL 6 years ago
Skylar Ittner 12aea4a2e2 Update Bootstrap (https://github.com/thomaspark/bootswatch/issues/861) 6 years ago
Skylar Ittner c36c365a1b Update Bootstrap and FontAwesome 6 years ago
Skylar Ittner 8dd7ee6005 Update Bootstrap and FontAwesome 6 years ago
Skylar Ittner 80d0a017ed Update Bootstrap to 4.1.3 6 years ago
Skylar Ittner a17f51b72d Update FontAwesome 5.1.0 to 5.3.1 6 years ago
Skylar Ittner 92162bd1dc Improve app dock/bar 6 years ago
Skylar Ittner 2c0819d8b7 Fix setup.php 6 years ago
Skylar Ittner b23e4bce30 Rewrite a lot of code, close Business/CommonBugs#3, close Business/CommonBugs#4, close #9 6 years ago
Skylar Ittner 963fbfbf00 Upgrade FontAwesome to 5.1.0 6 years ago
Skylar Ittner 10575f6f59 Fix another visual bug 6 years ago
Skylar Ittner 2f9eccf931 Fix bug where clicking close on msg alert didn't remove progress bar 6 years ago
Skylar Ittner 769d24b4b7 Improve alert fadeout 6 years ago
Skylar Ittner 66aa3d6fdc Make msg alert time out with smooth visual effects 6 years ago
Skylar Ittner 8e65d4c98d Use bundled Roboto font 6 years ago
Skylar Ittner 58a991cbd0 Update FontAwesome to 5.0.13 6 years ago
Skylar Ittner 4bab466169 Fix #1 6 years ago
Skylar Ittner d4070b36b9 Update FontAwesome 5.0.10 => 5.0.12, update Materia Bootstrap 6 years ago
Skylar Ittner 2d98c68efd Remove unused old arrow icons 6 years ago
Skylar Ittner 2461fec102 Update FontAwesome to 5.0.10 6 years ago
Skylar Ittner fa6924eb08 Update bootstrap.min.css with upstream bugfix from Bootswatch (https://github.com/thomaspark/bootswatch/issues/819) 6 years ago
Skylar Ittner 64c3d47c32 Add Roboto font files 6 years ago
Skylar Ittner 6a7ea5eeb7 Upgrade to Bootstrap 4.1 6 years ago
Skylar Ittner d10c6214a6 Switch to Mozilla Public License 2.0 for code consistency 6 years ago
Skylar Ittner 0691dd51f1 Remove unused CSS 6 years ago
Skylar Ittner 8441008219 Remove unneeded font files 6 years ago
Skylar Ittner e155ebe165 Update material-color submodule 6 years ago
Skylar Ittner ee47026c0e Adjust alerts 6 years ago
Skylar Ittner eefa7ab00f Improve mobile app compatibility 6 years ago
Skylar Ittner 121a49e9e0 Upgrade to Bootstrap 4.0, FontAwesome 5.0, and jQuery 3.3.1 6 years ago
Skylar Ittner c92d84c739 Fully implement MPL-2.0 license 6 years ago