Commit Graph

7983 Commits

Author SHA1 Message Date
decabeza
12427e1ce5 adds styles to document link on polls show 2017-10-07 14:46:55 +02:00
rgarcia
38f100d183 fixes loading of poll question 2017-10-07 14:40:26 +02:00
Raimond Garcia
88724abb2b Merge pull request #2007 from consul/fix/2000#already_voted_in_booth
Already voted in booth can't vote on website
2017-10-07 14:31:21 +02:00
decabeza
316b6720cb fixes polls show indentation and adds missing <% end %> 2017-10-07 14:31:04 +02:00
rgarcia
1ec2455134 fixes spec
this one seems unrelated, probably got pushed in another PR
2017-10-07 14:30:10 +02:00
Alberto García
ca724c7d25 Merge branch 'master' into polls-gallery-polish 2017-10-07 14:26:50 +02:00
rgarcia
e320a836e7 fixes specs 2017-10-07 13:31:54 +02:00
Raimond Garcia
bad58eaa7b Merge pull request #2006 from wairbut-m2c/aperez-admin-polls-adjustments
Adjuments for Poll-related features
2017-10-07 13:10:58 +02:00
decabeza
e7716ca4b3 makes darker border answer divider 2017-10-07 11:56:34 +02:00
decabeza
a5d3d5d239 adds links to read more and less for answer description 2017-10-07 11:53:34 +02:00
decabeza
3ddcb0fd21 changes large size to original for gallery images 2017-10-07 11:52:50 +02:00
María Checa
e127b52225 Minor fixes 2017-10-07 11:37:33 +02:00
Bertocq
9a396fe634 Fix record_voter_participation and usage on specs 2017-10-07 10:48:24 +02:00
BertoCQ
6a0197a61b Merge branch 'master' into feature/1985#voting_token 2017-10-07 10:46:13 +02:00
decabeza
732fb70730 makes answers buttons width 100% on mobile size 2017-10-07 03:03:17 +02:00
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
Bertocq
a487159e39 Add scenario for user that voted on booth can't vote on website 2017-10-07 00:53:21 +02:00
Bertocq
27a1584a0f Check if user has already voted in a booth on this poll 2017-10-06 23:59:53 +02:00
rgarcia
5f1485dbfa fixes specs 2017-10-06 22:49:53 +02:00
María Checa
cc2da735c7 Set token to 64 characters 2017-10-06 21:47:46 +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
María Checa
7e11a48f00 Fixed token message 2017-10-06 21:14:19 +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
María Checa
34cd8d8b98 Fixed token message 2017-10-06 20:59:25 +02:00
Angel Perez
8b8e8aff8f Show answer's title if answer has any records associated
If an answer has a description and/or documents/images
associated, the answer's title will be shown on the UI
so the user can associate a certain answer with its
related records

See issue #1998, as well as commit 7fad604
2017-10-06 14:46:13 -04:00
María Checa
bcfd1a844a Poll voter token 2017-10-06 20:44:47 +02:00
Angel Perez
a1907c6f50 Show answer's associated documents on polls
As requested by #2003
2017-10-06 14:40:54 -04: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
Angel Perez
7fad604842 Avoid show div into markup for answers' information
If an answer does not contain any description or images
associated, the "poll-more-info-answers" div won't be
shown in the markup

Change requested by #1998
2017-10-06 14:17:01 -04:00
Angel Perez
d62c0d5d05 Remove Poll::Question title length limit
As requested by #1997
2017-10-06 14:11:08 -04: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
Bertocq
165509b525 Switch from Poll::Answer to Poll::Voter usage and small fixes 2017-10-06 18:59:47 +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
María Checa
35148015b9 Added token to poll voters 2017-10-06 18:43:00 +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