Commit Graph

28 Commits

Author SHA1 Message Date
5acb3cd272 Updating payment graph 2013-09-28 03:33:36 -07:00
16e5e8d584 Adding payment graph 2013-09-28 02:42:30 -07:00
8820dc4986 Adding activity and form fields for user profiles 2013-08-29 02:27:48 -07:00
25c0d1e1cb Finalized payments and CSVs and inactivity 2013-08-28 08:19:01 -07:00
211d79cbcd Adding csv import 2013-08-28 04:25:54 -07:00
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -07:00
eb782f11d5 Adding IPN validation 2013-08-24 03:40:34 -07:00
ec4cf4dea9 Adding IPNs 2013-08-24 02:18:37 -07:00
75e4907a9c Usability tweaks, creating merges, fixing issues 2013-05-23 23:25:09 -07:00
ed75ea0e90 Adding payments 2013-02-12 01:58:17 -07:00
f3498ddcac Added mac logs, improved mac editing/viewing 2013-02-01 00:06:13 -07:00
048ce52111 Renaming pamela to macs 2013-01-31 20:48:27 -07:00
a7e999614c Adding pamela but I'm dumb and messed up routing 2013-01-31 20:33:40 -07:00
1865123201 Lots of styling; avatars, payment methods, and more. 2013-01-26 02:21:41 -07:00
3d00bbed03 Finishing touches on abilities and registration form 2013-01-25 13:47:44 -07:00
7cadcabdce Updated routes and user form to avoid user-create conflicts with devise 2013-01-25 07:11:22 -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
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
dc0586045f Created auto-download ability 2012-09-16 03:24:54 -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
99f24fe144 Reinstalled devise to user model and migration 2012-09-02 04:12:26 -07:00
62fb513491 Installed Devise and created a home controller/route 2012-09-02 02:57:34 -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