|
accec4edb1
|
Merge branch 'csv'
Conflicts:
app/models/user_certification.rb
app/views/user_certifications/index.html.erb
app/views/user_certifications/show.html.erb
|
2013-08-28 08:21:28 -07:00 |
|
|
18bc427eb3
|
Adding quick-add buttons to user profiles
|
2013-08-26 23:01:43 -07:00 |
|
|
98be42e9f9
|
Fixing nil errors
|
2013-08-26 22:11:04 -07:00 |
|
|
4067477cd4
|
Updating icons, fixing user cert nil error
|
2013-08-26 22:05:53 -07:00 |
|
|
a1ef8a5fd5
|
User cert tweaks (handling nulls)
|
2013-08-24 02:23:12 -07:00 |
|
|
653fcc3112
|
Fine tuned abilities and updated how membership is tracked
|
2013-01-25 06:01:02 -07:00 |
|
|
6e77b2bf68
|
Adding user_certifications relation, and paperclip gem
|
2013-01-25 03:50:53 -07:00 |
|