Commit Graph

7307 Commits

Author SHA1 Message Date
decabeza
cd495c80fe changes border right to bottom when expand gallery 2017-10-07 02:08:01 +02:00
decabeza
687fbfac08 changes zoom icon when is active 2017-10-07 02:05:37 +02:00
Raimond Garcia
638fcdbc1d Merge pull request #2005 from consul/fix/2002#voting_after_singout
Allow re-casting an answer after singout
2017-10-06 21:14:32 +02:00
Raimond Garcia
336fda4018 Merge pull request #1995 from wairbut-m2c/aperez-edit-poll-question-answers
Allow poll question answers to be editable
2017-10-06 21:08:02 +02:00
Bertocq
00bb6874db Fix dev seeds rake, creating Poll Question Answers 2017-10-06 20:37:13 +02:00
rgarcia
cf3a62b126 fixes specs 2017-10-06 20:32:06 +02:00
Bertocq
bfef00d478 Refactor voted_before_sign_in logic to avoid no-answer scenario error 2017-10-06 20:07:57 +02:00
Bertocq
81f65f1ac9 Touch answer model to force the updated_at value update 2017-10-06 19:57:52 +02:00
Bertocq
cb15428742 Add scenario for re-voting after sing out the same answer 2017-10-06 19:57:31 +02:00
Raimond Garcia
0e7431e9e6 Merge pull request #2001 from consul/polls-show-gallery
Polls show galleries
2017-10-06 18:48:30 +02:00
Raimond Garcia
23ef9ded1d Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:47:04 +02:00
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
8576f59af1 Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:14:00 +02:00
decabeza
dcc5ebf530 removes data equalizer to avoid big scrolls 2017-10-06 18:09:05 +02:00
decabeza
5c2784794f changes medium to large size on gallery images 2017-10-06 18:04:15 +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
Angel Perez
63eaa0bef6 Allow Poll::Question::Answer edit
As requested by #1992
2017-10-06 09:48:17 -04: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