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
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
5b80d8893e
shows always orbit next and previous arrows
2017-10-07 19:38:44 +02:00
decabeza
71d785ba78
improves polls index view on mobile version
2017-10-07 19:38:17 +02:00
decabeza
b06102fb79
adds image rendering on gallery images
2017-10-07 19:37:51 +02:00
María Checa
65f5c9efa9
Changed token message background color
2017-10-07 19:21:27 +02:00
Raimond Garcia
676f11dcfc
Merge pull request #2012 from consul/fixed-poll-answer-document-upload-redirect
...
Fixed poll answer document upload redirect
2017-10-07 19:17:01 +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
65237db099
Fixed poll answer document upload redirect
2017-10-07 17:50:42 +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
rgarcia
099593a189
Merge branch 'polls-gallery-polish' of github.com:consul/consul into polls-gallery-polish
2017-10-07 14:55:37 +02:00
rgarcia
777237421f
fixes specs
2017-10-07 14:55:08 +02:00
decabeza
9ec57f68c2
changes list of videos links on polls question admin
2017-10-07 14:49:36 +02:00
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
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
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
