worktime
Merge branch 'moonrise' of https://github.com/Groarq/tablica
Merge branch 'moonrise' of https://github.com/Groarq/tablica
Merge branch 'master' of https://github.com/Groarq/tablica
week contoler only for accepted
conflict fix
Merge branch 'master' of https://github.com/Groarq/tablica
Some changes in users controller
Some changes in users controller
Fixed conflicts and problems with user controller
redirect after manual generating
redirect after manual generating
Fixed raport model
Fixes in raport model
check
working on userscontroller
Merge branch 'master' of https://github.com/Groarq/tablica into moonrise
time picker in default work request
small fix
Trying to fix pdf showing in heroku