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
841ef2a3a2
Merge branch 'master' into 1856-legislation_processes_proposals_phase
2017-10-09 17:19:07 +02:00
María Checa
f23073bb28
Fixed already voted message in poll show
2017-10-09 13:12:44 +02:00
Pedro Ríos Flores
87d4fa92b4
Wrapped the last link under the same if clause.
2017-10-09 13:09:09 +02:00
decabeza
ba9814cd85
shows videos on polls answers
2017-10-09 13:01:39 +02:00
Pedro Ríos Flores
693030ff17
Wrapped two links under the same if clause.
2017-10-09 12:26:34 +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
Raimond Garcia
6d7ef674f8
Merge pull request #2015 from consul/polls-design
...
Polls design
2017-10-07 20:31:32 +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
Raimond Garcia
d123df5304
Merge pull request #2010 from consul/polls-show-description
...
Polls show description
2017-10-07 18:01:47 +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
María Checa
b19953b38f
Added tests
2017-10-07 17:06:53 +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
María Checa
84e35edca7
Added new tests for vote token
2017-10-07 16:16:39 +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
5d5f331dd8
Merge branch 'polls-gallery-polish' of https://github.com/consul/consul into polls-gallery-polish
2017-10-07 15:23:51 +02:00
decabeza
953a6e7573
updates videos link spec
2017-10-07 15:23:31 +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
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
