Commit Graph

62 Commits (master)

Author SHA1 Message Date
Skylar Ittner a697f263cf Merge AppTemplate 4 years ago
Skylar Ittner 26b16ccbe6 Missed a spot 4 years ago
Skylar Ittner 367062b76c Update FontAwesome version 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 d30b6fc27c Merge ../BusinessAppTemplate 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 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 e0802f582b Remove unneeded index.css 5 years ago
Skylar Ittner 32cd18933d Update FontAwesome from 5.3.1 to 5.6.0 5 years ago
Skylar Ittner aa56348658 Merge BusinessAppTemplate 6 years ago
Skylar Ittner 47539de2d7 Fix bootstrap font URL 6 years ago
Skylar Ittner 193c671b8d Merge BusinessAppTemplate 6 years ago
Skylar Ittner 12aea4a2e2 Update Bootstrap (https://github.com/thomaspark/bootswatch/issues/861) 6 years ago
Skylar Ittner 9a5aefbeb5 Add image uploading for items (close #8) 6 years ago
Skylar Ittner 75d8811477 Merge ../BusinessAppTemplate 6 years ago
Skylar Ittner c36c365a1b Update Bootstrap and FontAwesome 6 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 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 a485f6c35b Merge BusinessAppTemplate 6 years ago
Skylar Ittner 963fbfbf00 Upgrade FontAwesome to 5.1.0 6 years ago
Skylar Ittner 63d6430b4d Merge https://source.netsyms.com/Business/BusinessAppTemplate 6 years ago
Skylar Ittner 8e65d4c98d Use bundled Roboto font 6 years ago
Skylar Ittner 24a78449c7 Merge BusinessAppTemplate 6 years ago
Skylar Ittner 58a991cbd0 Update FontAwesome to 5.0.13 6 years ago
Skylar Ittner 1fb0f42eb2 Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 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 e007195080 Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 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 046f965fee Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 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 ca09f9d346 Add item cost and sale price fields 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 0691dd51f1 Remove unused CSS 6 years ago
Skylar Ittner 453f97706e Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 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 623c5e2f01 Fully implement MPL-2.0 license 6 years ago
Skylar Ittner 6c8d33d2f2 Refactor and enforce Content-Security-Policy 7 years ago
Skylar Ittner 5dae7bc168 Refactor and enforce Content-Security-Policy 7 years ago
Skylar Ittner f54e84440e Convert material-color CSS to submodule 7 years ago
Skylar Ittner c0a93fb666 Convert material-color CSS to submodule 7 years ago
Skylar Ittner 9e8cffa394 Add mobile barcode scan buttons 7 years ago