|
|
8f069cee4d
|
Removing faker
|
2014-04-10 20:13:21 -07:00 |
|
|
|
74d3fc45dd
|
Adding faker
|
2014-04-10 19:19:28 -07:00 |
|
|
|
20594d651c
|
Gemfile updates, schema update
|
2014-03-02 19:17:09 -07:00 |
|
|
|
cac59e9de5
|
Finishing contracts, changing from s3.yml to .env
|
2014-03-02 19:06:39 -07:00 |
|
|
|
1d0e8721e1
|
Adding resources (imported from old toolshare)
|
2014-02-09 00:54:03 -07:00 |
|
|
|
02b997b838
|
Adding mac history graph
|
2013-10-26 03:22:03 -07:00 |
|
|
|
f03ffcd356
|
Adding settings
|
2013-09-28 04:24:24 -07:00 |
|
|
|
df0e91c4ee
|
Migrations and tweaks to facilitate sqlite-postgres switch
|
2013-09-22 00:50:41 -07:00 |
|
|
|
10a1e4eb84
|
Switching to RVM, View tweaks
|
2013-08-28 05:15:50 -07:00 |
|
|
|
125ad76a1c
|
Hacks to allow 1.8.7
|
2013-08-26 22:07:41 -07:00 |
|
|
|
f111769b20
|
Remove debug, update schema
|
2013-08-24 03:43:43 -07:00 |
|
|
|
ec4cf4dea9
|
Adding IPNs
|
2013-08-24 02:18:37 -07:00 |
|
|
|
1865123201
|
Lots of styling; avatars, payment methods, and more.
|
2013-01-26 02:21:41 -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 |
|
|
|
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 |
|
|
|
c80c3bbe5c
|
Added cancan
|
2012-09-02 04:37:34 -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 |
|
|
|
b28efe046c
|
Got uploading working
|
2012-08-24 21:14:51 -07:00 |
|
