58 Commits

Author SHA1 Message Date
d30b6fc27c Merge ../BusinessAppTemplate 2019-03-19 17:16:05 -06:00
53e158b553 Update FontAwesome 5.6.0 -> 5.7.2 2019-03-19 17:12:45 -06:00
474047ab34 Update Bootstrap 4.1.3 -> 4.3.1 2019-03-19 17:11:54 -06:00
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
2019-01-04 17:57:08 -07:00
e0802f582b Remove unneeded index.css 2018-12-26 16:22:09 -07:00
32cd18933d Update FontAwesome from 5.3.1 to 5.6.0 2018-12-11 21:39:25 -07:00
aa56348658 Merge BusinessAppTemplate 2018-09-25 13:08:14 -06:00
47539de2d7 Fix bootstrap font URL 2018-09-25 13:07:54 -06:00
193c671b8d Merge BusinessAppTemplate 2018-09-25 12:59:17 -06:00
12aea4a2e2 Update Bootstrap (https://github.com/thomaspark/bootswatch/issues/861) 2018-09-25 12:54:45 -06:00
9a5aefbeb5 Add image uploading for items (close #8) 2018-09-22 02:41:38 -06:00
75d8811477 Merge ../BusinessAppTemplate 2018-09-21 17:36:39 -06:00
c36c365a1b Update Bootstrap and FontAwesome 2018-09-21 16:38:34 -06:00
f2d3c199ab Merge BusinessAppTemplate
# Conflicts:
#	composer.lock
#	lang/en_us.php
#	lib/login.php
#	mobile/index.php
2018-09-07 18:29:25 -06:00
80d0a017ed Update Bootstrap to 4.1.3 2018-09-07 15:11:43 -06:00
a17f51b72d Update FontAwesome 5.1.0 to 5.3.1 2018-09-07 15:09:04 -06:00
a485f6c35b Merge BusinessAppTemplate 2018-06-29 15:36:59 -06:00
963fbfbf00 Upgrade FontAwesome to 5.1.0 2018-06-29 14:58:54 -06:00
63d6430b4d Merge https://source.netsyms.com/Business/BusinessAppTemplate 2018-05-21 18:27:09 -06:00
8e65d4c98d Use bundled Roboto font 2018-05-21 18:26:25 -06:00
24a78449c7 Merge BusinessAppTemplate 2018-05-15 13:46:16 -06:00
58a991cbd0 Update FontAwesome to 5.0.13 2018-05-13 00:29:09 -06:00
1fb0f42eb2 Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 2018-05-05 12:22:28 -06:00
4bab466169 Fix #1 2018-05-05 12:21:26 -06:00
d4070b36b9 Update FontAwesome 5.0.10 => 5.0.12, update Materia Bootstrap 2018-05-04 18:17:49 -06:00
e007195080 Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 2018-04-16 17:01:04 -06:00
2461fec102 Update FontAwesome to 5.0.10 2018-04-16 14:21:23 -06:00
fa6924eb08 Update bootstrap.min.css with upstream bugfix from Bootswatch (https://github.com/thomaspark/bootswatch/issues/819) 2018-04-16 14:18:33 -06:00
046f965fee Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 2018-04-13 01:46:30 -06:00
64c3d47c32 Add Roboto font files 2018-04-13 01:42:02 -06:00
6a7ea5eeb7 Upgrade to Bootstrap 4.1 2018-04-13 01:38:41 -06:00
ca09f9d346 Add item cost and sale price fields 2018-04-10 01:25:07 -06:00
d10c6214a6 Switch to Mozilla Public License 2.0 for code consistency 2018-04-09 19:18:19 -06:00
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
2018-04-08 16:28:31 -06:00
0691dd51f1 Remove unused CSS 2018-01-30 22:33:17 -07:00
453f97706e Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 2018-01-29 00:37:39 -07:00
e155ebe165 Update material-color submodule 2018-01-28 21:06:20 -07:00
ee47026c0e Adjust alerts 2018-01-27 22:06:53 -07:00
eefa7ab00f Improve mobile app compatibility 2018-01-27 22:04:01 -07:00
121a49e9e0 Upgrade to Bootstrap 4.0, FontAwesome 5.0, and jQuery 3.3.1 2018-01-27 19:18:38 -07:00
623c5e2f01 Fully implement MPL-2.0 license 2017-12-16 13:32:58 -07:00
6c8d33d2f2 Refactor and enforce Content-Security-Policy 2017-11-13 16:16:49 -07:00
5dae7bc168 Refactor and enforce Content-Security-Policy 2017-11-13 16:14:40 -07:00
f54e84440e Convert material-color CSS to submodule 2017-11-07 15:31:55 -07:00
c0a93fb666 Convert material-color CSS to submodule 2017-11-07 15:21:14 -07:00
9e8cffa394 Add mobile barcode scan buttons 2017-07-05 00:03:33 -06:00
54cedab640 Move menu button around on mobile 2017-07-01 00:30:24 -06:00
2770e96a8a Move menu button around on mobile 2017-07-01 00:16:47 -06:00
cf4bcfc315 App now works. TODO: add edit permissions 2017-05-17 23:09:51 -06:00
2284117cfc add JS to remove &msg=xyz from URL, update material-color to v1.2 2017-05-15 11:48:24 -06:00