Created branch and made a few basic changes
Created branch and made a few basic changes
alot of work done on approval page but we still need to get reviewing the timesheet and submitting it.
Now showing the timesheet when a user row is selected.
WITH DAVIS. We got the functionality of approval working but we still need to integrate with the LDAP apis
Merge branch 'master' into approvePage

Conflicts:
	client/main.html
	client/main.js
Merge branch 'master' into approvePage
Merge pull request #15 from lanceriechel/kulczajr

Kulczajr
Changed the time string to fix issue.

Made it so new time sheets will be created for every user at 12:00 am Sunday morning instead of 12:00 am Monday Morning.
Emails are now pulled from LDAP and added to the meteor.users collection.  In addition, with the help of Lucas, I redid how a user is checked if they are an admin or manager.  Previously I hacked it together using an unused field, but now the LDAPsearch query checks if the users are part of the correct usergroup.
Merge pull request #16 from lanceriechel/LDAPgroups

Emails are now pulled from LDAP and added to the meteor.users collection...
Merge pull request #14 from lanceriechel/approvePage

Merging approvePage with master.
Made a few basic changes such as filtering pages by role and refactoring main.html
added the scientia favicon for the page
Made some good progress on rejection/approval of timesheets.  Currently an approved project on a timesheet will stay locked, and a rejected project  will be unlocked on the timesheet with a message written by the manager.  Also, completely approved and submitted timesheets will no longer appear on the active timesheet selection page.  Still need to fix the fact that you cannot add a row to a submitted timesheet if it is rejected and that an employee can switch a row to a project that has already been submitted and not rejected.
did some preliminary work on email reminders. Need to make this more versitile.
did some preliminary work on email reminders. Need to make this more versitile.
Fixed a bug where deleting rows was changing other rows projectID- it took me ages to track down.  Also more progress on rejecting/approval workflow
got approval and rejection of timesheets workflow completely working.
Merge pull request #17 from lanceriechel/rejectTLance

Reject t lance merge