kikito 3ab579999e merges with master and fixes conflicts

2015-10-20 16:28:22 +02:00

..

account

Adds new styles for erase account

2015-10-20 12:37:01 +02:00

admin

fixes conflicts with master

2015-10-14 15:48:55 +02:00

comments

Fixes error messages and overflow on comments

2015-09-14 18:50:29 +02:00

debates

tests that user has been hidden

2015-10-20 13:07:47 +02:00

devise

fixes conflicts with master

2015-10-14 15:48:55 +02:00

kaminari

Improves accesibility

2015-10-13 16:48:37 +02:00

layouts

changes link to root in management layout

2015-10-17 13:18:42 +02:00

mailer

Includes the document number and type in the verification email

2015-10-02 18:40:24 +02:00

management

displays only the first 5 proposals to print

2015-10-20 14:45:59 +02:00

moderation

Updates admin and moderation texts

2015-09-25 09:40:51 +02:00

organizations/registrations

Improves accesibility

2015-10-13 16:48:37 +02:00

pages

uses english for method and filenames

2015-10-19 19:27:03 +02:00

proposals

displays proposal created within management layout

2015-10-13 15:00:23 +02:00

shared

Adds new styles for print buttons

2015-10-19 13:27:34 +02:00

simple_captcha

Changes notes tag on forms

2015-09-28 13:46:54 +02:00

users/registrations

Adds new styles for erase account

2015-10-20 12:37:01 +02:00

verification

merges and fixes conflicts

2015-10-20 16:23:51 +02:00

welcome

fixes conflicts with master

2015-10-14 15:48:55 +02:00