|
|
04764af983
|
Got macs working
|
2013-01-31 22:39:33 -07:00 |
|
|
|
998558cd30
|
Figured out mac saving issue
|
2013-01-31 21:25:54 -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 |
|
|
|
6673573e36
|
Updated front page stats to fix dupes
|
2013-01-31 19:15:35 -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 |
|
|
|
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 |
|
|
|
7193ec832c
|
Making user certs collapsible, adding a recompilation script
|
2013-01-25 20:31:23 -07:00 |
|
|
|
c547af5391
|
Updated permissions for deletion and styling for hidden items
|
2013-01-25 18:21:42 -07:00 |
|
|
|
3d00bbed03
|
Finishing touches on abilities and registration form
|
2013-01-25 13:47:44 -07:00 |
|
|
|
2327340b71
|
More UI tweaks and sorting
|
2013-01-25 11:11:39 -07:00 |
|
|
|
0b6975a655
|
Minor UI tweaks
|
2013-01-25 09:28:32 -07:00 |
|
|
|
95374a8c1f
|
Moving password field and fixing a nil error in appcontroller
|
2013-01-25 08:45:43 -07:00 |
|
|
|
6d0a7b165a
|
Made some changes to the css and asset compiling settings
|
2013-01-25 07:48:13 -07:00 |
|
|
|
bb7b2aeca5
|
Updated some more form styling
|
2013-01-25 07:23:06 -07:00 |
|
|
|
7cadcabdce
|
Updated routes and user form to avoid user-create conflicts with devise
|
2013-01-25 07:11:22 -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 |
|
|
|
fe283b051f
|
Allowing nil waiver/orientation dates, adjusting permissions of users
|
2013-01-25 01:49:32 -07:00 |
|
|
|
d44ae6a69f
|
Halfway done with adding new user fields
|
2013-01-10 23:11:41 -07:00 |
|
|
|
cc3857604b
|
Updated door logs to work with new schema
|
2012-12-15 20:37:44 -07:00 |
|
Matthew Shepard
|
0b5978d4ef
|
Add active status to user show/edit.
|
2012-10-16 22:59:35 -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 |
|
|
|
ccd432a67d
|
Changed timezone to Arizona, added log guide
|
2012-09-16 21:01:21 -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 |
|
|
|
5174b4c50c
|
Added password change option
|
2012-09-16 02:27:01 -07:00 |
|
|
|
cd4f689400
|
Getting mailer working
|
2012-09-15 23:43:19 -07:00 |
|
|
|
daa202131c
|
Reversed order of door log, added date column
|
2012-09-15 22:52:17 -07:00 |
|
|
|
ed8d284619
|
Added card number interpretation to log
|
2012-09-15 21:41:11 -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 |
|
|
|
33a9363b0d
|
Adding admin role and devise views
|
2012-09-03 20:34:40 -07:00 |
|
|
|
72f5a1202a
|
Added notice and alert to application layout
|
2012-09-02 02:59:29 -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 |
|
