kikito b28f63b016 merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

..

ahoy

Add a helper for build c3.js chart compatible data

2015-08-17 19:13:56 +02:00

concerns

initial commit

2015-07-15 13:32:13 +02:00

.keep

initial commit

2015-07-15 13:32:13 +02:00

ability.rb

fixes error in abilities

2015-08-17 17:59:23 +02:00

administrator.rb

validates uniqueness of admins & mods

2015-08-07 18:20:20 +02:00

comment.rb

adds moderation to comments and debates [#136]

2015-08-17 13:39:31 +02:00

debate.rb

Fix conflicts

2015-08-17 21:08:15 +02:00

moderator.rb

validates uniqueness of admins & mods

2015-08-07 18:20:20 +02:00

organization.rb

Removes user_id validation from Organisations

2015-08-17 17:11:17 +02:00

setting.rb

adds Settings

2015-08-17 18:13:30 +02:00

user.rb

merges master and fixes conflicts

2015-08-18 09:35:13 +02:00

visit.rb

Add model visit

2015-08-08 12:56:41 +02:00

vote.rb

adds votes feature specs [#9]

2015-07-18 18:10:36 +02:00