Commit Graph

37 Commits

Author SHA1 Message Date
a2cbcac798 More resource tweaks 2014-02-09 04:32:45 -07:00
e61895d20f Chmod 2014-02-09 02:09:03 -07:00
58926cf3ab Updating resources 2014-02-09 02:08:08 -07:00
e16e35e098 Massive chmod/chown 2014-02-09 00:56:48 -07:00
1d0e8721e1 Adding resources (imported from old toolshare) 2014-02-09 00:54:03 -07:00
56450cf319 Adding postal code to users 2014-02-08 21:06:07 -07:00
92c3a6d2be Adding db seed, fixing migration issues 2014-02-08 19:13:45 -07:00
9e08a0d036 Updated stats and privacy 2013-09-28 18:55:22 -07:00
2c204a8f9d Adding wysiwyg and settings 2013-09-28 04:59:19 -07:00
530f4834ca Changing user exit reason to fulltext 2013-09-24 23:14:50 -07:00
df0e91c4ee Migrations and tweaks to facilitate sqlite-postgres switch 2013-09-22 00:50:41 -07:00
880488c73e Adding social and exit reasons 2013-08-29 01:23:21 -07:00
10a1e4eb84 Switching to RVM, View tweaks 2013-08-28 05:15:50 -07:00
211d79cbcd Adding csv import 2013-08-28 04:25:54 -07:00
f111769b20 Remove debug, update schema 2013-08-24 03:43:43 -07:00
ec4cf4dea9 Adding IPNs 2013-08-24 02:18:37 -07:00
ed75ea0e90 Adding payments 2013-02-12 01:58:17 -07:00
63913c0be3 Forgot migration from previous commit. Also added links to home page 2013-02-09 04:01:21 -07:00
ac66cb0cbe Added "how did you hear about us" to user. 2013-02-09 03:47:07 -07:00
04764af983 Got macs working 2013-01-31 22:39:33 -07:00
a7e999614c Adding pamela but I'm dumb and messed up routing 2013-01-31 20:33:40 -07:00
3d00bbed03 Finishing touches on abilities and registration form 2013-01-25 13:47:44 -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
cc3857604b Updated door logs to work with new schema 2012-12-15 20:37:44 -07:00
Matthew Shepard
4ad622e906 Added registration fields to users table 2012-10-16 14:46:21 -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
33a9363b0d Adding admin role and devise views 2012-09-03 20:34:40 -07:00
99f24fe144 Reinstalled devise to user model and migration 2012-09-02 04:12:26 -07:00
e4ff40e5a1 Surprise Rails app! 2012-08-30 23:54:25 -07:00
7f623cf2ec Remove db seeds 2012-08-30 23:38:13 -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