Commit Graph

31 Commits

Author SHA1 Message Date
cac59e9de5 Finishing contracts, changing from s3.yml to .env 2014-03-02 19:06:39 -07:00
2c4cd4a020 Mooooore resources 2014-02-09 05:01:52 -07:00
e16e35e098 Massive chmod/chown 2014-02-09 00:56:48 -07:00
008ceaed9e Updating emailer 2013-10-06 05:51:41 -07:00
c5e02a51be Making it possible for users to easily register existing MACs 2013-09-23 18:51:22 -07:00
37aba522cf Profile tweaks 2013-08-29 01:42:26 -07:00
d1ba469767 Adjusting profile display 2013-08-29 01:38:40 -07:00
880488c73e Adding social and exit reasons 2013-08-29 01:23:21 -07:00
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -07:00
18bc427eb3 Adding quick-add buttons to user profiles 2013-08-26 23:01:43 -07:00
20a007cac5 Instructors can delete their own certs; hidden users are hidden in drop-downs; admins can see last user login; prepping for postgres 2013-05-03 00:16:02 -07:00
cefd4b3878 Added nice front page stuff, fixing sqlite issues, adding user payments to profiles 2013-02-14 00:29:22 -07:00
ed75ea0e90 Adding payments 2013-02-12 01:58:17 -07:00
ac66cb0cbe Added "how did you hear about us" to user. 2013-02-09 03:47:07 -07:00
1865123201 Lots of styling; avatars, payment methods, and more. 2013-01-26 02:21:41 -07:00
2327340b71 More UI tweaks and sorting 2013-01-25 11:11:39 -07:00
bb7b2aeca5 Updated some more form styling 2013-01-25 07:23:06 -07:00
63b1b05010 Updating styling, fixing some errors, and adding cert logging 2013-01-25 06:52:19 -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
43d949dc1d Adding certifications; messed up adding certification_users so not staging those 2013-01-25 03:12:25 -07:00
Matthew Shepard
0b5978d4ef Add active status to user show/edit. 2012-10-16 22:59:35 -07:00
d1ef1e7db9 Recreated user forms, updated abilities, linked cards and users 2012-10-14 06:23:35 -07:00
0254f9aa2c Moved card stuff from users model to new card model 2012-10-14 05:46:19 -07:00
0bc5858101 Merged more conflicts 2012-09-15 17:44:30 -07:00
d3b8ad7222 Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface
Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/door_logs_controller.rb
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/door_logs/download.html.erb
	app/views/door_logs/show.html.erb
	app/views/layouts/application.html.erb
	app/views/users/show.html.erb
	app/views/users/upload.html.erb
	app/views/users/upload_all.html.erb
	config/environments/development.rb
	config/environments/production.rb
	config/routes.rb
	db/schema.rb
2012-09-15 17:34:55 -07:00
1e4dcfd9f3 Finished adding user profile stuff 2012-09-03 21:56:37 -07:00
72f5a1202a Added notice and alert to application layout 2012-09-02 02:59:29 -07:00
e4ff40e5a1 Surprise Rails app! 2012-08-30 23:54:25 -07:00
8b775d9172 Got door logs working 2012-08-24 23:28:00 -07:00
b28efe046c Got uploading working 2012-08-24 21:14:51 -07:00