Commit Graph

23 Commits (master)

Author SHA1 Message Date
Skylar Ittner d30b6fc27c Merge ../BusinessAppTemplate 5 years ago
Skylar Ittner 289aaeaa9f Minor text changes 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 a559901ac0 Redirect to AccountHub for user login 5 years ago
Skylar Ittner cd100535ac Add readonly item view (close #13) 6 years ago
Skylar Ittner e1045eed9e Replace cat and loc search boxes with select dropdowns (#11) 6 years ago
Skylar Ittner 9a5aefbeb5 Add image uploading for items (close #8) 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 046f965fee Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 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 623c5e2f01 Fully implement MPL-2.0 license 6 years ago
Skylar Ittner 496b213a88 Fix Business/CommonBugs#1 (expired session logout error) 7 years ago
Skylar Ittner f9ac6937b8 Fix Business/CommonBugs#1 (expired session logout error) 7 years ago
Skylar Ittner 4ee1992d5a Close #3 7 years ago
Skylar Ittner f3899029f7 Add desired quantity tracking (Close #2) 7 years ago
Skylar Ittner b2bf79a2f1 Add permissions checks 7 years ago
Skylar Ittner cf4bcfc315 App now works. TODO: add edit permissions 7 years ago
Skylar Ittner b883368578 Copy from BusinessAppTemplate @ e8c9cd56e2 7 years ago
Skylar Ittner 427390cbc4 Add a bit of cleanup and comments 7 years ago
Skylar Ittner e28d3a93ac Clean up clutter and unneeded code 7 years ago
Skylar Ittner 16cbf2a5f1 Create template based on SSO code 7 years ago