Alberto Garcia Cabeza 3f53f61b1d Fixes conflicts

2015-09-03 00:12:59 +02:00

..

account

Adds styles for verification account process

2015-09-02 12:34:08 +02:00

admin

Adds shared/filter_subnav partial to DRY filters

2015-09-02 13:39:27 +02:00

comments

disables voting on comments for not allowed users

2015-09-02 12:23:56 +02:00

debates

Changes and updates texts

2015-09-02 23:43:08 +02:00

devise

hides social network login

2015-09-01 16:30:12 +02:00

kaminari

Adds styles for pagination

2015-08-20 12:35:00 +02:00

layouts

Updates header and footer

2015-09-02 23:43:32 +02:00

mailer

replaces hard-coded strings by i18n calls

2015-08-28 13:42:22 +02:00

moderation

Adds shared/filter_subnav partial to DRY filters

2015-09-02 13:39:27 +02:00

organizations/registrations

fixes html render of i18n text

2015-08-29 13:55:37 +02:00

pages

Adds new pages, includes new texts

2015-09-02 23:42:06 +02:00

shared

Adds shared/filter_subnav partial to DRY filters

2015-09-02 13:39:27 +02:00

simple_captcha

Improves styles for simple captcha

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

stats

Adds styles for new admin's sections

2015-08-18 13:48:37 +02:00

users/registrations

Changes and updates texts

2015-09-02 23:43:08 +02:00

verification

Changes and updates texts

2015-09-02 23:43:08 +02:00

welcome

adds cache to featured debates (welcome/index)

2015-08-31 20:47:11 +02:00