Raimond Garcia
5d39ce2f03
Merge pull request #2053 from consul/officing-voter-message
...
Officing voter message
2017-10-13 15:30:49 +02:00
rgarcia
200db22cbb
only update the poll that was just voted
2017-10-13 15:15:54 +02:00
decabeza
234d4d3f54
hides can vote callout when voted
2017-10-13 14:45:30 +02:00
decabeza
6b721e7750
moves table content to partials
2017-10-13 14:40:39 +02:00
decabeza
5540f130e1
removes unused partials
2017-10-13 14:16:33 +02:00
decabeza
386fe785c7
improves text and layouts for officing voters views
2017-10-13 14:16:21 +02:00
BertoCQ
df5934e0c2
Merge pull request #2026 from consul/polls-admin-polish
...
Polls admin polish
2017-10-13 12:59:27 +02:00
rgarcia
cd6cf3bda1
uses default rails helper to disable submit button
2017-10-13 12:41:33 +02:00
rgarcia
560ff7c51d
does not use custom implementation to disable submit button
2017-10-13 12:40:42 +02:00
BertoCQ
1d59dcac7c
Merge pull request #2049 from consul/booth-edit-button
...
Edit booth button
2017-10-11 20:32:55 +02:00
decabeza
3a20a6bc2a
adds margin to read more answer description link
2017-10-11 20:16:38 +02:00
decabeza
811c348f0f
hides edit booth button when available filter
2017-10-11 19:36:23 +02:00
decabeza
bdc3538100
Merge branch 'master' into polls-admin-polish
2017-10-11 19:12:34 +02:00
Bertocq
34c278db74
Small fixes for Poll Question Answer ordering
2017-10-11 12:05:20 +02:00
iagirre
2b10b59e2a
Order in the admin page using jquery-ui sortable widget.
2017-10-10 16:38:29 +02:00
rgarcia
ffdbdacc78
fixes specs
2017-10-10 12:47:09 +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
decabeza
471860ea41
puts content on a table for polls questions answers show
2017-10-09 19:44:58 +02:00
decabeza
9dc8a0fb34
fixes questions table with long links on description
2017-10-09 19:44:12 +02:00
decabeza
36d39503e8
improves admin poll questions show
2017-10-09 19:42:53 +02:00
decabeza
80298a2746
improves admin poll header
2017-10-09 19:42:10 +02:00
decabeza
07f74cf6e5
improves layout for admin polls index
2017-10-09 19:40:16 +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
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
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
