42 Commits

Author SHA1 Message Date
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
cc4a623e1b Merge https://source.netsyms.com/Business/BusinessAppTemplate 2018-06-01 14:28:44 -06:00
10575f6f59 Fix another visual bug 2018-06-01 14:28:30 -06:00
0ef2e64c89 Merge https://source.netsyms.com/Business/BusinessAppTemplate 2018-06-01 14:25:44 -06:00
2f9eccf931 Fix bug where clicking close on msg alert didn't remove progress bar 2018-06-01 14:23:14 -06:00
339770ade7 Merge https://source.netsyms.com/Business/BusinessAppTemplate 2018-06-01 14:04:13 -06:00
769d24b4b7 Improve alert fadeout 2018-06-01 14:04:04 -06:00
0bbe2abec2 Merge https://source.netsyms.com/Business/BusinessAppTemplate 2018-06-01 13:59:53 -06:00
66aa3d6fdc Make msg alert time out with smooth visual effects 2018-06-01 13:59:31 -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
d4070b36b9 Update FontAwesome 5.0.10 => 5.0.12, update Materia Bootstrap 2018-05-04 18:17:49 -06:00
14c6f5c9cc Mostly fix item table width issues 2018-04-16 17:16:03 -06:00
766c959a75 Use a few new icons 2018-04-16 17:07:18 -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
046f965fee Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 2018-04-13 01:46:30 -06:00
6a7ea5eeb7 Upgrade to Bootstrap 4.1 2018-04-13 01:38:41 -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
57ada92175 Icon adjustments, improve action buttons on items page 2018-01-29 00:43:11 -07:00
453f97706e Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 2018-01-29 00:37:39 -07:00
121a49e9e0 Upgrade to Bootstrap 4.0, FontAwesome 5.0, and jQuery 3.3.1 2018-01-27 19:18:38 -07:00
83149dd9eb Code formatting 2017-12-26 17:53:04 -07:00
e57a43217e Improve category display 2017-12-26 16:59:31 -07:00
98aa7d3217 Add reports (close #7) 2017-12-26 16:54:20 -07:00
623c5e2f01 Fully implement MPL-2.0 license 2017-12-16 13:32:58 -07:00
40def2bf70 Add item search box on dashboard (close #6) 2017-12-09 02:10:45 -07:00
ba4b098c14 Add item cloning (closes #5) 2017-11-07 15:34:10 -07:00
f3899029f7 Add desired quantity tracking (Close #2) 2017-09-05 22:38:38 -06:00
9e8cffa394 Add mobile barcode scan buttons 2017-07-05 00:03:33 -06:00
769ea75e82 Item table now loads with AJAX 2017-05-27 20:02:27 -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
b883368578 Copy from BusinessAppTemplate @ e8c9cd56e2 2017-05-14 11:50:09 -06:00
427390cbc4 Add a bit of cleanup and comments 2017-05-07 00:30:25 -06:00
16cbf2a5f1 Create template based on SSO code 2017-04-25 12:09:06 -06:00