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
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
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
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
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
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
Angel Perez
d62c0d5d05
Remove Poll::Question title length limit
...
As requested by #1997
2017-10-06 14:11:08 -04: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
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
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
Bertocq
d4408efda6
Generate a unique token for a Poll Ballot and use it on answer buttons
2017-10-06 14:36:21 +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
decabeza
de9b599578
Merge branch 'master' into question-answer-documents
2017-10-06 13:55:49 +02:00
María Checa
c5c1ea7251
Fixed answer documents form
2017-10-06 12:02:24 +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
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
