Commit Graph

9013 Commits

Author SHA1 Message Date
María Checa
b8f2fd1c54 Markup fixes 2017-10-06 01:32:00 +02:00
María Checa
1225fc9009 Minor fix 2017-10-06 01:28:38 +02:00
María Checa
a655466dbf Added new translations 2017-10-06 01:28:15 +02:00
María Checa
d20a4909d6 Minor fix
Removed left margin from submit button
2017-10-06 01:27:14 +02:00
María Checa
37c9ca0973 Fixed admin menu 2017-10-06 01:25:41 +02:00
María Checa
284fdea2e6 Improved answer documents and question summary views 2017-10-06 01:23:41 +02:00
María Checa
c3f778bbdd Check if user has voted before sign in 2017-10-06 01:18:56 +02:00
María Checa
590344a576 Added view to upload documents to poll answers 2017-10-06 01:18:53 +02:00
María Checa
6192ea8b78 Added documents to Poll::Question::Answer 2017-10-06 01:17:23 +02:00
Raimond Garcia
c72f95c72b Merge branch 'master' into aperez-admin-question-videos 2017-10-06 01:12:22 +02:00
Raimond Garcia
3d100d1e93 Merge branch 'master' into iagirre-remove-documents-questions 2017-10-06 01:02:56 +02:00
María Checa
0cf5299846 Set voting messages 2017-10-06 00:04:25 +02:00
Alberto García
806fd85246 Merge pull request #1990 from consul/polls-gallery
Polls Gallery
2017-10-05 21:44:38 +02:00
BertoCQ
34503f2e95 Merge pull request #1987 from consul/polls-index-icons
Polls index
2017-10-05 20:36:21 +02:00
rgarcia
127ab222eb removes rendering of local variable 2017-10-05 19:37:44 +02:00
rgarcia
82735ae2de spacing 2017-10-05 19:27:10 +02:00
rgarcia
1922bc55a0 adds pending specs 2017-10-05 19:27:04 +02:00
rgarcia
6327bcb343 adds specs for answer's gallery 2017-10-05 19:15:17 +02:00
Angel Perez
5862eea516 Add controllers/views for Poll::Question::Answer::Video 2017-10-05 12:34:20 -04:00
decabeza
ad8f58993f checks already answered polls only for users logged 2017-10-05 17:48:52 +02:00
iagirre
b31abb64d7 Removed the methods not used from nested_documentable specs (the ones that were deleted in the questions specs) and removed also the document params from questions_params (not used anymore). 2017-10-05 17:28:24 +02:00
Angel Perez
5f6d218a15 Rename param in Admin::Poll::Questions::AnswersController
'poll_question_id' attribute was renamed to 'question_id' on PR #1977,
commit 4aaf681
2017-10-05 10:32:09 -04:00
decabeza
5fdbc7b8a6 removes icons on polls index view 2017-10-05 16:29:57 +02:00
iagirre
82cf1fc285 Remove unused i18n-keys: admin.questions.show.documents, value: Documents(1) (en and es) 2017-10-05 15:55:37 +02:00
iagirre
75d841e2fe Fixed the correct specs and views to make the test pass. 2017-10-05 15:31:21 +02:00
Angel Perez
ab09bde7dd Fix broken translations for Poll::Question::Answer model
Poll::QuestionAnswer model was renamed to Poll::Question::Answer
which made the previous I18n keys unavailable for the views

See PR #1977, commit 461410a
2017-10-05 08:11:15 -04:00
iagirre
5b129b933f Removed documents from questions (documentable from model and uploader from _form in views) 2017-10-05 13:38:19 +02:00
decabeza
de27530621 improves polls gallery partial 2017-10-05 11:46:21 +02:00
decabeza
0ba2dbd4f3 replaces lorem content on polls show 2017-10-05 11:45:51 +02:00
decabeza
d069d903a1 fixes active classes on admin menu 2017-10-05 11:08:45 +02:00
decabeza
2e8922459d adds line break on css 2017-10-05 11:08:12 +02:00
decabeza
25de95cdb4 removes blank space 2017-10-05 11:07:41 +02:00
decabeza
acea19dca3 improves layout for poll questions answers views 2017-10-05 11:07:26 +02:00
decabeza
ea4b534ee9 improves layout for poll questions views 2017-10-05 11:06:00 +02:00
BertoCQ
6084899a74 Merge pull request #1966 from consul/chore/update_secrets_example
Update secrets and deploy secrets example files
2017-10-05 00:52:23 +02:00
BertoCQ
1e22108431 Merge pull request #1980 from wairbut-m2c/iagirre-polls-show
Specs added for branch polls-show in consul and thumbnail for poll im…
2017-10-05 00:52:08 +02:00
Bertocq
895fc96bee Correct voter feature spec scenario name 2017-10-05 00:39:05 +02:00
rgarcia
52b68aa0df removes extra space 2017-10-04 23:58:36 +02:00
rgarcia
bba8cac262 displays images for an answer 2017-10-04 23:56:23 +02:00
rgarcia
06a1b96fcd clean up 2017-10-04 23:56:23 +02:00
rgarcia
30a2db635d displays upload link for second image
To infinity and beyond
2017-10-04 23:56:23 +02:00
rgarcia
1cf9bc4ad1 adds images to anwers 2017-10-04 23:56:09 +02:00
Angel Perez
32f3b643b0 Create 'poll_question_answer_videos' table and model 2017-10-04 17:25:51 -04:00
Angel Perez
f4774894e7 Adapt Admin::Poll::Question 'show' action to new design
Changes required as per issues #1855 and #1951

Fixes PR #1977, note n° 2
2017-10-04 16:59:23 -04:00
BertoCQ
ababdd0368 Merge pull request #1979 from consul/fix/shift_creation_polls
Fixes on Polls Shifts
2017-10-04 22:40:53 +02:00
Angel Perez
a83c259a04 Remove 'description' attribute from Poll::Question
This avoid an exception when seeding the database

See PR #1977
2017-10-04 15:49:28 -04:00
Raimond Garcia
f9c35db983 Merge pull request #1982 from consul/polls-answer-polish
Polls - create answer polish
2017-10-04 20:28:33 +02:00
Raimond Garcia
1b58b7851b Merge branch 'master' into fix/shift_creation_polls 2017-10-04 20:14:08 +02:00
rgarcia
24fc7ab70a makes answer creation spec more robust 2017-10-04 20:10:49 +02:00
rgarcia
3ae539e8ab fixes relation between questions and answers 2017-10-04 20:10:31 +02:00