Commit Graph

33 Commits

Author SHA1 Message Date
16c75b2d0f Fixing issue #19 for realsies (oriented by tracking) 2014-04-10 20:10:04 -07:00
3cd6c59df0 More contract tweaks 2014-03-02 21:48:49 -07:00
03a0588073 Creating sweet user summary page 2014-02-14 03:48:03 -07:00
d943adc458 Creating user summary page 2014-02-14 02:12:13 -07:00
e16e35e098 Massive chmod/chown 2014-02-09 00:56:48 -07:00
cbadcc5c73 Fixing user-emailing abilities 2013-12-13 03:34:52 -07:00
15836b4f4e Adding zombie report 2013-10-06 05:17:24 -07:00
57e6ac1fc5 Adding user email feature 2013-10-06 04:09:56 -07:00
04bab84293 Adding new member report 2013-10-05 19:53:31 -07:00
ec139a97a8 Separating certs into columns 2013-09-23 20:24:38 -07:00
cad46e45c5 Adding users without cards report, fixing mac registration for existing macs 2013-09-23 18:34:18 -07:00
c61b8ac8d4 Adding recent users report 2013-08-29 02:50:05 -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
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -07:00
75e4907a9c Usability tweaks, creating merges, fixing issues 2013-05-23 23:25:09 -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
e9c648d36e Updating style and ordering of user index 2013-01-25 21:11:01 -07:00
2327340b71 More UI tweaks and sorting 2013-01-25 11:11:39 -07:00
653fcc3112 Fine tuned abilities and updated how membership is tracked 2013-01-25 06:01:02 -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
daa202131c Reversed order of door log, added date column 2012-09-15 22:52:17 -07:00
921ba21a40 Had to modify door log model and add config.yml to avoid storing password in git 2012-09-15 20:41:17 -07:00
93e77b692f Got abilities working on index; next need to separate users from members from cards. 2012-09-15 18:41:55 -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
03d99741e5 Trying to get ability filtering down but failing on collections 2012-09-03 23:20:00 -07:00
f3a05d64c1 Adding ability authorizing in cancan 2012-09-02 04:45:42 -07:00
8c36b67cfb Require user account 2012-09-02 04:19:13 -07:00
e4ff40e5a1 Surprise Rails app! 2012-08-30 23:54:25 -07:00
b28efe046c Got uploading working 2012-08-24 21:14:51 -07:00