Will Bradley 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

..

cards

Adding quick-add buttons to user profiles

2013-08-26 23:01:43 -07:00

certifications

De-duplicating cert view

2013-08-26 22:32:08 -07:00

devise

Added nice front page stuff, fixing sqlite issues, adding user payments to profiles

2013-02-14 00:29:22 -07:00

door_logs

Lots of styling; avatars, payment methods, and more.

2013-01-26 02:21:41 -07:00

home

Finalized payments and CSVs and inactivity

2013-08-28 08:19:01 -07:00

ipns

Switching to RVM, View tweaks

2013-08-28 05:15:50 -07:00

layouts

Updating nav

2013-08-26 22:12:45 -07:00

mac_logs

Added mac logs, improved mac editing/viewing

2013-02-01 00:06:13 -07:00

macs

IPN improvements

2013-08-28 03:18:47 -07:00

payments

Switching to RVM, View tweaks

2013-08-28 05:15:50 -07:00

paypal_csvs

Switching to RVM, View tweaks

2013-08-28 05:15:50 -07:00

user_certifications

Merge branch 'csv'

2013-08-28 08:21:28 -07:00

user_mailer

Adding payments

2013-02-12 01:58:17 -07:00

users

Finalized payments and CSVs and inactivity

2013-08-28 08:19:01 -07:00