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

..

.gitkeep

Surprise Rails app!

2012-08-30 23:54:25 -07:00

ability.rb

Finalized payments and CSVs and inactivity

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

card.rb

Adding quick-add buttons to user profiles

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

certification.rb

Adding user_certifications relation, and paperclip gem

2013-01-25 03:50:53 -07:00

door_log.rb

Replaced "authok" with "ok" on OAC-Ethernet API, changing to match

2013-02-09 02:08:43 -07:00

ipn.rb

Finalized payments and CSVs and inactivity

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

mac_log.rb

Added mac logs, improved mac editing/viewing

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

mac.rb

Added mac logs, improved mac editing/viewing

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

payment.rb

Finalized payments and CSVs and inactivity

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

paypal_csv.rb

Finalized payments and CSVs and inactivity

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

user_certification.rb

Merge branch 'csv'

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

user.rb

Finalized payments and CSVs and inactivity

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