Jason Denney
|
03abb963ac
|
Merging Master
|
12 years ago |
Jason Denney
|
cd41735cee
|
Bug in User#completed_build_bikes query. inner
|
12 years ago |
Jason Denney
|
0f89cf057a
|
Display User roles by username, then full name
Also set the default_fields_for_forms
|
12 years ago |
Jason Denney
|
8172b04805
|
|
12 years ago |
Jason Denney
|
9cb4ed42dc
|
Update README.md
|
12 years ago |
Jason Denney
|
7c85e2901f
|
Changes needed to run in produciton
|
12 years ago |
Jason Denney
|
2c548ff63c
|
User#completed_build_bikes method, and stats page list
|
12 years ago |
Jason Denney
|
1defca3668
|
Fixing some bike logs permissions
|
12 years ago |
Jason Denney
|
88d3160e29
|
Fixing logs add_in_form and search
|
12 years ago |
Jason Denney
|
edff478204
|
Reordering Admin tab panel, putting logs last
|
12 years ago |
Jason Denney
|
84ca3a6f96
|
Search form requires :field_label when overriding default_fields_for_forms
|
12 years ago |
Jason Denney
|
51caa93afa
|
Some js wasn't getting loaded at login. and other fixes
|
12 years ago |
jnm
|
7a935c250b
|
Merge pull request #27 from spacemunkay/denney-fix-some-cancan
Fixing some cancan permission issues… i think
|
12 years ago |
Jason Denney
|
854c8efaa9
|
only admins can see checkins
|
12 years ago |
Jason Denney
|
b450baa3dc
|
merging master
|
12 years ago |
jnm
|
fa51dd25f3
|
Merge pull request #24 from spacemunkay/denney-reset-password
Denney reset password
|
12 years ago |
Jason Denney
|
c9e94d8e30
|
Merge pull request #21 from spacemunkay/denney-new-user-form
Denney new user form
|
12 years ago |
John N. Milner
|
c5b16139f5
|
Merge branch 'master' into denney-new-user-form
Conflicts:
db/schema.rb
|
12 years ago |
Jason Denney
|
6d76385d11
|
Merge pull request #20 from spacemunkay/jnm-check-ins-view
New view to show the current day's check ins
|
12 years ago |
Jason Denney
|
f6f932f63a
|
Fixing some cancan permission issues… i think
|
12 years ago |
jnm
|
a18e34c8f1
|
Merge pull request #22 from spacemunkay/denney-color-picker
Denney color picker
|
12 years ago |
John N. Milner
|
b25a4520f9
|
Correct log criteria for Check Ins view
|
12 years ago |
John N. Milner
|
adeca0e08a
|
Corrected Check Ins view to show the checked-in user, not the user who logged the check in
|
12 years ago |
Jason Denney
|
db1732f7bf
|
Bug in user_stats queries
|
12 years ago |
Jason Denney
|
d5662284ab
|
Added link for users to update email/password
|
12 years ago |
Jason Denney
|
0ef4e81474
|
Added reset password action column to users comp.
|
12 years ago |
Jason Denney
|
761ab81b56
|
Added reset password api method
|
12 years ago |
Jason Denney
|
687cb33974
|
Added color blocks to grid view
|
12 years ago |
Jason Denney
|
7f029f2a83
|
Removing commented js
|
12 years ago |
Jason Denney
|
c7974c52e8
|
Adding color picker for bikes view/forms
|
12 years ago |
Jason Denney
|
8c864e2006
|
Measurements will be in inches for the time being
|
12 years ago |
Jason Denney
|
6d2e7686d6
|
Remove unneeded if
|
12 years ago |
Jason Denney
|
9021294c4b
|
Auth by username instead of email
Added username to User table/model
|
12 years ago |
Jason Denney
|
a07d6345e8
|
Mildly better looking signup page w/ errors.
|
12 years ago |
Jason Denney
|
db6b7ff7da
|
Adjusting how javascript is loaded
Now js is loaded per controller
|
12 years ago |
Jason Denney
|
75734a075c
|
Moving new_user.js to devise/registrations.s
|
12 years ago |
Jason Denney
|
73bb35de88
|
Moving bootstrap.js
|
12 years ago |
Jason Denney
|
8c5132814f
|
New User Sign up now annoys user to input contact info
|
12 years ago |
Jason Denney
|
2e08f655ea
|
Registration form now remembers field values for nested form errors
|
12 years ago |
John N. Milner
|
b67062fb32
|
New view to show the current day's check ins
|
12 years ago |
jnm
|
3c90c13c3b
|
Merge pull request #15 from spacemunkay/denney-add-users-roles
Changing UserRole to UserRoleJoin
|
12 years ago |
jnm
|
19adc354a1
|
Merge pull request #18 from spacemunkay/denney-check-in
Denney check in
|
12 years ago |
Jason Denney
|
145a731ed2
|
Remove puts
|
12 years ago |
Jason Denney
|
a00c1ed925
|
Finished Checkin/out feature for now
-Checkin/out api methods can be used while signed in
-Added checkout button in Netzke App, which also signs out in addition to checking out.
|
12 years ago |
Jason Denney
|
14973e8334
|
Merge pull request #17 from spacemunkay/denney-bootstrap-css
Add bootstrap css to login page
|
12 years ago |
Jason Denney
|
d7755f00ed
|
Initial stab at check-in feature
|
12 years ago |
Jason Denney
|
c504252541
|
Add bootstrap css to login page
|
12 years ago |
Jason Denney
|
65c8cf8cf1
|
Fix setting default log action
|
12 years ago |
Jason Denney
|
81217f1ea8
|
Give better names to columns, add last name col
|
12 years ago |
Jason Denney
|
bc1eeea16e
|
Make the title of user roles tab
|
12 years ago |