Commit Graph

37 Commits

Author SHA1 Message Date
bedd80d555 Updating user index with new layout 2014-04-10 20:47:25 -07:00
13e72fef23 Fixing issue #19 and also styling homepage 2014-04-10 19:45:29 -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
8425aaecd2 Adding pictures to resources 2014-02-14 01:09:16 -07:00
3d97e92eb7 Adding resource category edit abilities 2014-02-14 00:02:11 -07:00
2c4cd4a020 Mooooore resources 2014-02-09 05:01:52 -07:00
a2cbcac798 More resource tweaks 2014-02-09 04:32:45 -07:00
23dcb0715c More resource adding 2014-02-09 03:42:17 -07:00
e16e35e098 Massive chmod/chown 2014-02-09 00:56:48 -07:00
8060f76cca Adjusting icon and adding meta tag for icon 2013-12-29 22:28:54 -07:00
6157280655 Changing door access tablet interface 2013-12-29 21:56:47 -07:00
41a8431be5 Adding direct door access commands and interface 2013-12-02 02:03:40 -07:00
d61289abaf Adding analytics, adjusting door log issues 2013-10-04 02:59:41 -07:00
42679aa410 Updating settings & fixing auth of objects through other objects cancan bug? 2013-09-28 19:31:28 -07:00
2c204a8f9d Adding wysiwyg and settings 2013-09-28 04:59:19 -07:00
59b6e3c838 Updating nav 2013-08-26 22:12:45 -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
1239d6682b Added mailer to notify on new user 2013-02-01 04:44:05 -07:00
43e2cdba78 Finished mac filtering, display, permissions, etc 2013-02-01 03:37:30 -07:00
37106f65e0 Added the logo 2013-01-26 02:40:30 -07:00
1865123201 Lots of styling; avatars, payment methods, and more. 2013-01-26 02:21:41 -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
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
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
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