Commit Graph

106 Commits

Author SHA1 Message Date
3ddfb3442b Tabs with spaces 2013-09-25 21:45:12 -07:00
ec139a97a8 Separating certs into columns 2013-09-23 20:24:38 -07:00
c5e02a51be Making it possible for users to easily register existing MACs 2013-09-23 18:51:22 -07:00
cad46e45c5 Adding users without cards report, fixing mac registration for existing macs 2013-09-23 18:34:18 -07:00
377170d47c Adjusting sql for macs for postgres compatibility 2013-09-22 01:08:05 -07:00
df0e91c4ee Migrations and tweaks to facilitate sqlite-postgres switch 2013-09-22 00:50:41 -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
211d79cbcd Adding csv import 2013-08-28 04:25:54 -07:00
c662be6dc0 IPN improvements 2013-08-28 03:18:47 -07:00
810ff6b034 De-duplicating cert view 2013-08-26 22:32:08 -07:00
125ad76a1c Hacks to allow 1.8.7 2013-08-26 22:07:41 -07:00
f8f11e3d7e Adjust IPN security 2013-08-26 15:34:10 -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
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
3fb774d057 Adding note to macs json feed 2013-02-09 05:05:06 -07:00
1f63709887 Reporting door access logs on each card's page; also card access stats for last 7 days 2013-02-09 03:32:26 -07:00
f1b752a4c4 Updating homepage to display cooler door/mac stats 2013-02-09 02:40:38 -07:00
d156edd683 Updating how macs are stored/viewed 2013-02-09 02:08:29 -07:00
50171effad Allowing JSON 2013-02-01 03:58:26 -07:00
43e2cdba78 Finished mac filtering, display, permissions, etc 2013-02-01 03:37:30 -07:00
f3498ddcac Added mac logs, improved mac editing/viewing 2013-02-01 00:06:13 -07:00
04764af983 Got macs working 2013-01-31 22:39:33 -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
8ab6fa10ea Trying to get dynamic helptext for selecting payment methods 2013-01-25 22:30:05 -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
95374a8c1f Moving password field and fixing a nil error in appcontroller 2013-01-25 08:45:43 -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
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
152d6e4e03 Got auto-detection in logs working, improved user index readability 2012-09-16 02:53:45 -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
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