kikito 9e1581656a merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

..

account

merges master and fixes conflicts

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

admin

merges master and fixes conflicts

2015-08-17 17:38:34 +02:00

comments

adds i18n to deleted comments

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

debates

adds moderation to comments and debates [#136]

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

devise

merges master and fixes conflicts

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

layouts

adds admin_header partial

2015-08-17 15:18:51 +02:00

mailer

sends emails [#23]

2015-08-07 20:52:53 +02:00

moderation

adds moderation to comments and debates [#136]

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

organizations/registrations

merges master and fixes conflicts

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

shared

improves consistency of error messages [#110]

2015-08-16 15:57:09 +02:00

simple_captcha

Improves styles for simple captcha

2015-08-15 01:05:00 +02:00

users/registrations

merges master and fixes conflicts

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

welcome

Limiting max number of tags shown on debate cards ~ issue#144

2015-08-12 16:26:41 +02:00