23 Commits

Author SHA1 Message Date
d30b6fc27c Merge ../BusinessAppTemplate 2019-03-19 17:16:05 -06:00
289aaeaa9f Minor text changes 2019-03-01 23:37:06 -07: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
a559901ac0 Redirect to AccountHub for user login 2018-12-22 16:57:45 -07:00
cd100535ac Add readonly item view (close #13) 2018-10-06 00:43:58 -06:00
e1045eed9e Replace cat and loc search boxes with select dropdowns (#11) 2018-10-05 00:28:38 -06:00
9a5aefbeb5 Add image uploading for items (close #8) 2018-09-22 02:41:38 -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
046f965fee Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 2018-04-13 01:46:30 -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
623c5e2f01 Fully implement MPL-2.0 license 2017-12-16 13:32:58 -07:00
496b213a88 Fix Business/CommonBugs#1 (expired session logout error) 2017-10-10 12:34:36 -06:00
f9ac6937b8 Fix Business/CommonBugs#1 (expired session logout error) 2017-10-10 12:34:25 -06:00
4ee1992d5a Close #3 2017-09-15 14:00:45 -06:00
f3899029f7 Add desired quantity tracking (Close #2) 2017-09-05 22:38:38 -06:00
b2bf79a2f1 Add permissions checks 2017-05-28 23:46:28 -06:00
cf4bcfc315 App now works. TODO: add edit permissions 2017-05-17 23:09:51 -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
e28d3a93ac Clean up clutter and unneeded code 2017-04-26 00:46:36 -06:00
16cbf2a5f1 Create template based on SSO code 2017-04-25 12:09:06 -06:00