Commit Graph
5 Commits
Author SHA1 Message Date
jnm fa51dd25f3 Merge pull request #24 from spacemunkay/denney-reset-password
Denney reset password
2013-05-30 19:13:49 -07:00
jnm a18e34c8f1 Merge pull request #22 from spacemunkay/denney-color-picker
Denney color picker
2013-05-30 17:21:35 -07:00
jnm 3c90c13c3b Merge pull request #15 from spacemunkay/denney-add-users-roles
Changing UserRole to UserRoleJoin
2013-05-23 18:03:59 -07:00
jnm 19adc354a1 Merge pull request #18 from spacemunkay/denney-check-in
Denney check in
2013-05-23 18:01:07 -07:00
jnm ac9e5718c7 Merge pull request #14 from spacemunkay/jnm-cancan
cancan
2013-04-11 18:18:52 -07:00