45 Commits (master)

Author SHA1 Message Date
Skylar Ittner bc6559417e Merge ../BusinessAppTemplate 6 years ago
Skylar Ittner 963fbfbf00 Upgrade FontAwesome to 5.1.0 6 years ago
Skylar Ittner ae34e741b3 Merge https://source.netsyms.com/Business/BusinessAppTemplate 6 years ago
Skylar Ittner 10575f6f59 Fix another visual bug 6 years ago
Skylar Ittner 272bf40cde Merge https://source.netsyms.com/Business/BusinessAppTemplate 6 years ago
Skylar Ittner 2f9eccf931 Fix bug where clicking close on msg alert didn't remove progress bar 6 years ago
Skylar Ittner 6cf831eaf3 Merge https://source.netsyms.com/Business/BusinessAppTemplate
# Conflicts:
#	static/js/app.js
6 years ago
Skylar Ittner 769d24b4b7 Improve alert fadeout 6 years ago
Skylar Ittner 66aa3d6fdc Make msg alert time out with smooth visual effects 6 years ago
Skylar Ittner 6b7857ceba Merge https://source.netsyms.com/business/businessapptemplate 6 years ago
Skylar Ittner 58a991cbd0 Update FontAwesome to 5.0.13 6 years ago
Skylar Ittner 63d83f7b9f Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate 6 years ago
Skylar Ittner d4070b36b9 Update FontAwesome 5.0.10 => 5.0.12, update Materia Bootstrap 6 years ago
Skylar Ittner 2461fec102 Update FontAwesome to 5.0.10 6 years ago
Skylar Ittner ae47dff2fc Merge Business/BusinessAppTemplate: BS v4.1, include Roboto font 6 years ago
Skylar Ittner 6a7ea5eeb7 Upgrade to Bootstrap 4.1 6 years ago
Skylar Ittner d10c6214a6 Switch to Mozilla Public License 2.0 for code consistency 6 years ago
Skylar Ittner 0d3cc46dca 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 37e6d3e7ce Upgrade to Bootstrap 4.0, FontAwesome 5.0, jQuery 3.3.1 6 years ago
Skylar Ittner 121a49e9e0 Upgrade to Bootstrap 4.0, FontAwesome 5.0, and jQuery 3.3.1 6 years ago
Skylar Ittner 5aae62ddb6 Add jobs export 6 years ago
Skylar Ittner 7e3246c6c0 Add group assignment to jobs 6 years ago
Skylar Ittner 331788c0d3 Add jobs feature (close #4) 6 years ago
Skylar Ittner 37075cb413 Fully implement MPL-2.0 license 6 years ago
Skylar Ittner 724b9b2c37 Refactor deprecated String.trim(str) 6 years ago
Skylar Ittner 30db1512f5 Add timecard editing (close #2) 7 years ago
Skylar Ittner 98ac465396 Enforce permissions in report system 7 years ago
Skylar Ittner a02d96385c Add punches report, check if user assigned to a shift,
add report date filter, attach punches to shift in DB
7 years ago
Skylar Ittner 29fa41666d Add report generation 7 years ago
Skylar Ittner 030a265ed2 Change "show all shifts" checkbox to toolbar button 7 years ago
Skylar Ittner cba85de876 Adjust clock seconds animation 7 years ago
Skylar Ittner f7b0cf0b7f Refactor and enforce Content-Security-Policy 7 years ago
Skylar Ittner 3c71ed88c9 Add shift assignment tool 7 years ago
Skylar Ittner 6eb6c3a0de Add shift editing 7 years ago
Skylar Ittner 37e7d127ce Add shifts table 7 years ago
Skylar Ittner 900e3bb709 Add ability to see punches of managed users 7 years ago
Skylar Ittner 1fb4afc6aa Improve mobile integration, add autocorrect etc. flags to login fields 7 years ago
Skylar Ittner 3a9efd0670 Improve info cards on Punches/History page 7 years ago
Skylar Ittner f5b01d7fa4 Add "Punch Card" page and make the "on/not on the clock" text auto-update 7 years ago
Skylar Ittner d286053ef4 Punch in/out now works 7 years ago
Skylar Ittner 359509732c Add clock and punch in/out buttons, add database, add branding 7 years ago
Skylar Ittner b80d8ffa9b Create from template@0c85643847 7 years ago
Skylar Ittner 2284117cfc add JS to remove &msg=xyz from URL, update material-color to v1.2 7 years ago
Skylar Ittner 427390cbc4 Add a bit of cleanup and comments 7 years ago
Skylar Ittner 16cbf2a5f1 Create template based on SSO code 7 years ago