|
|
d2434be109
|
Moving spaceapi endpoint and OAC door status checking here
|
2013-12-01 19:32:08 -07:00 |
|
|
|
02b997b838
|
Adding mac history graph
|
2013-10-26 03:22:03 -07:00 |
|
|
|
008ceaed9e
|
Updating emailer
|
2013-10-06 05:51:41 -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 |
|
|
|
d61289abaf
|
Adding analytics, adjusting door log issues
|
2013-10-04 02:59:41 -07:00 |
|
|
|
f11d5ebe1e
|
Adding individual statistics/data-dumps
|
2013-10-02 04:31:10 -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 |
|
|
|
5acb3cd272
|
Updating payment graph
|
2013-09-28 03:33:36 -07:00 |
|
|
|
16e5e8d584
|
Adding payment graph
|
2013-09-28 02:42:30 -07:00 |
|
|
|
df0e91c4ee
|
Migrations and tweaks to facilitate sqlite-postgres switch
|
2013-09-22 00:50:41 -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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
6d0a7b165a
|
Made some changes to the css and asset compiling settings
|
2013-01-25 07:48:13 -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 |
|
|
|
257c1e5a8b
|
Updated email address
|
2012-12-01 23:09: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 |
|
|
|
cd4f689400
|
Getting mailer working
|
2012-09-15 23:43:19 -07:00 |
|
|
|
f3443a3a82
|
Fixed merge conflict with mailer url, need to remove this from git as well
|
2012-09-15 21:44:06 -07:00 |
|
|
|
1f74d13ba7
|
Created readme and made config.yml.example match Open_Access_Control_Ethernet
|
2012-09-15 20:50:03 -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 |
|
|
|
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 |
|
|
|
6df97cc3a7
|
Updated gitignore and production env to work on hsl-web
|
2012-09-02 02:40:41 -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 |
|
