decabeza
3a20a6bc2a
adds margin to read more answer description link
2017-10-11 20:16:38 +02:00
Bertocq
34c278db74
Small fixes for Poll Question Answer ordering
2017-10-11 12:05:20 +02:00
rgarcia
23397eecb3
increases consistency by moving comment's view to poll's folder
2017-10-10 12:06:50 +02:00
rgarcia
faa2f31b3a
Adds comment's tab
2017-10-10 12:06:41 +02:00
Raimond Garcia
2b588753ee
Merge branch 'master' into mlucena-poll-comments
2017-10-09 17:59:12 +02:00
María Checa
3fc3f9e88e
Fixed condition
2017-10-09 17:42:13 +02:00
María Checa
f23073bb28
Fixed already voted message in poll show
2017-10-09 13:12:44 +02:00
decabeza
ba9814cd85
shows videos on polls answers
2017-10-09 13:01:39 +02:00
Alberto García
bd62af9eb7
Merge pull request #2014 from consul/poll_ui_fixes
...
Polls UI fixes
2017-10-07 21:18:48 +02:00
María Checa
316ba37d91
Requested changes
2017-10-07 20:27:44 +02:00
decabeza
63ffb1adca
hides zoom icon on mobile version
2017-10-07 19:39:04 +02:00
decabeza
71d785ba78
improves polls index view on mobile version
2017-10-07 19:38:17 +02:00
María Checa
65f5c9efa9
Changed token message background color
2017-10-07 19:21:27 +02:00
María Checa
728edf64a5
Added "participate in other polls" link in poll show
2017-10-07 19:12:58 +02:00
María Checa
ca24be79e3
Moved token message below questions
2017-10-07 19:12:17 +02:00
Raimond Garcia
e9276037f9
Merge pull request #2009 from consul/votable_by_fix
...
Fixed already-answered logic
2017-10-07 18:21:05 +02:00
Raimond Garcia
689b6ecb9d
Merge pull request #2011 from consul/show-poll-answers-after-booth-vote
...
Show poll answers in poll show view after voting on a booth
2017-10-07 18:20:29 +02:00
María Checa
8b2f6d454c
Show poll answers in poll show view after voting on a booth
...
If the user votes in a booth, it can see the poll and answers but can't see what he/she voted and the answers are inactive (no link, inactive ui style).
2017-10-07 17:33:27 +02:00
decabeza
7cfd47ad87
removes duplicated content on polls show
2017-10-07 17:11:40 +02:00
rgarcia
a08d5bdba9
fixes conflict in merge
2017-10-07 17:00:26 +02:00
María Checa
bdffab7d72
Fixed already-answered logic
...
Added condition to check if user is unverified to avoid showing the ui element that lets users know they already voted a poll.
2017-10-07 16:56:35 +02:00
Raimond Garcia
2e4ce39722
Merge pull request #1994 from consul/feature/1985#voting_token
...
Voter Answer unique Token
2017-10-07 16:54:01 +02:00
Raimond Garcia
a585f79351
Merge pull request #2008 from consul/polls-gallery-polish
...
Polls gallery polish
2017-10-07 15:44:37 +02:00
decabeza
12427e1ce5
adds styles to document link on polls show
2017-10-07 14:46:55 +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
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
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
6a0197a61b
Merge branch 'master' into feature/1985#voting_token
2017-10-07 10:46:13 +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
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
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
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
Bertocq
165509b525
Switch from Poll::Answer to Poll::Voter usage and small fixes
2017-10-06 18:59:47 +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
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
Bertocq
d4408efda6
Generate a unique token for a Poll Ballot and use it on answer buttons
2017-10-06 14:36:21 +02:00
Manuel Lucena
8277e3cc2b
removed obsolete polls questions view
2017-10-06 11:55:25 +02:00
Manuel Lucena
63cbe2f7c1
20171003 - [WIP] Functionality and tests for polls comments
2017-10-06 10:36:26 +02:00
