Bertocq
59175ff039
Add date on officer assignment list for final shifts
2017-10-06 18:36:25 +02:00
Raimond Garcia
c04e2889c5
Merge pull request #1991 from consul/question-answer-documents
...
Admin question answer documents
2017-10-06 18:25:25 +02:00
Raimond Garcia
936ffa1fb6
Merge pull request #1993 from consul/1984-voting_messages
...
Voting messages
2017-10-06 17:57:17 +02:00
rgarcia
23682fadd8
fixes document specs
2017-10-06 17:50:41 +02:00
Raimond Garcia
6af7c6cd5f
Merge pull request #1996 from consul/polls-show-content
...
Polls show
2017-10-06 17:22:32 +02:00
decabeza
225ede4a42
hides temporally documents sidebar on polls show
2017-10-06 16:58:49 +02:00
decabeza
1933cf62fa
changes gallery order images
2017-10-06 16:44:26 +02:00
decabeza
47ee8a2f79
shows answer title on polls show only if description is present
2017-10-06 16:19:55 +02:00
decabeza
dd69401477
Merge branch 'master' into question-answer-documents
2017-10-06 15:18:42 +02:00
María Checa
305b5dcf07
Fixed test
2017-10-06 14:45:44 +02:00
Raimond Garcia
108d4104e8
Merge pull request #1986 from wairbut-m2c/iagirre-remove-documents-questions
...
Iagirre remove documents questions
2017-10-06 14:07:21 +02:00
rgarcia
8dd1d6d947
Merge branch 'question-answer-documents' of github.com:consul/consul into question-answer-documents
2017-10-06 14:01:13 +02:00
rgarcia
9a31c97a20
fixes image specs
2017-10-06 14:01:03 +02:00
decabeza
de9b599578
Merge branch 'master' into question-answer-documents
2017-10-06 13:55:49 +02:00
María Checa
089c1fecfd
Added tests
2017-10-06 13:37:24 +02:00
Raimond Garcia
c2edb58679
Merge pull request #1989 from wairbut-m2c/aperez-admin-question-videos
...
Add Poll::Admin answer videos
2017-10-06 13:25:17 +02:00
decabeza
b4d494ce24
fixes documents specs
2017-10-06 12:57:21 +02:00
María Checa
8e5cf50679
Prevent user from seeing its votes in a poll after signing in
2017-10-06 12:52:13 +02:00
rgarcia
bd1c03accf
fixes upload of answer's images
2017-10-06 12:15:45 +02:00
María Checa
c5c1ea7251
Fixed answer documents form
2017-10-06 12:02:24 +02:00
rgarcia
a15d1a4020
resolves conflict when uploading pdfs to answers
2017-10-06 02:52:06 +02:00
decabeza
7856915203
removes @question on questions answers
2017-10-06 02:38:43 +02:00
decabeza
3ce98b6cdf
fixes answer documents path on polls questions show
2017-10-06 02:09:01 +02:00
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
