decabeza
f94a376392
updates text on specs
2017-10-13 14:16:46 +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
c097cf236c
updates specs
2017-10-13 12:41:43 +02:00
decabeza
7a58b49851
updates specs
2017-10-11 20:14:25 +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
BertoCQ
5ff0047c9f
Merge pull request #2037 from wairbut-m2c/iagirre-question-ansers-ordenable
...
Iagirre question ansers ordenable
2017-10-11 11:53:39 +02:00
iagirre
943c1f23af
Spects added to test the order of answers. Default order for question_answers set.
2017-10-10 16:38:55 +02:00
rgarcia
89f81bf7a4
fixes exception when sending email about comment reply
2017-10-10 16:01:20 +02:00
rgarcia
37cae41ee9
adds specs
2017-10-10 12:07:04 +02:00
decabeza
090ff83cc1
updates edit texts on specs
2017-10-09 20:09:56 +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
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
María Checa
b19953b38f
Added tests
2017-10-07 17:06:53 +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
953a6e7573
updates videos link spec
2017-10-07 15:23:31 +02:00
rgarcia
1ec2455134
fixes spec
...
this one seems unrelated, probably got pushed in another PR
2017-10-07 14:30:10 +02:00
Bertocq
a487159e39
Add scenario for user that voted on booth can't vote on website
2017-10-07 00:53:21 +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
Bertocq
cb15428742
Add scenario for re-voting after sing out the same answer
2017-10-06 19:57:31 +02:00
Raimond Garcia
8576f59af1
Merge branch 'master' into aperez-edit-poll-question-answers
2017-10-06 18:14:00 +02:00
Raimond Garcia
936ffa1fb6
Merge pull request #1993 from consul/1984-voting_messages
...
Voting messages
2017-10-06 17:57:17 +02:00
Angel Perez
63eaa0bef6
Allow Poll::Question::Answer edit
...
As requested by #1992
2017-10-06 09:48:17 -04:00
María Checa
305b5dcf07
Fixed test
2017-10-06 14:45:44 +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
María Checa
089c1fecfd
Added tests
2017-10-06 13:37:24 +02:00
Raimond Garcia
c72f95c72b
Merge branch 'master' into aperez-admin-question-videos
2017-10-06 01:12:22 +02:00
Raimond Garcia
3d100d1e93
Merge branch 'master' into iagirre-remove-documents-questions
2017-10-06 01:02:56 +02:00
Alberto García
806fd85246
Merge pull request #1990 from consul/polls-gallery
...
Polls Gallery
2017-10-05 21:44:38 +02:00
rgarcia
82735ae2de
spacing
2017-10-05 19:27:10 +02:00
rgarcia
1922bc55a0
adds pending specs
2017-10-05 19:27:04 +02:00
rgarcia
6327bcb343
adds specs for answer's gallery
2017-10-05 19:15:17 +02:00
Angel Perez
5862eea516
Add controllers/views for Poll::Question::Answer::Video
2017-10-05 12:34:20 -04:00
iagirre
75d841e2fe
Fixed the correct specs and views to make the test pass.
2017-10-05 15:31:21 +02:00
BertoCQ
1e22108431
Merge pull request #1980 from wairbut-m2c/iagirre-polls-show
...
Specs added for branch polls-show in consul and thumbnail for poll im…
2017-10-05 00:52:08 +02:00
Bertocq
895fc96bee
Correct voter feature spec scenario name
2017-10-05 00:39:05 +02:00
rgarcia
1cf9bc4ad1
adds images to anwers
2017-10-04 23:56:09 +02:00
BertoCQ
ababdd0368
Merge pull request #1979 from consul/fix/shift_creation_polls
...
Fixes on Polls Shifts
2017-10-04 22:40:53 +02:00
Raimond Garcia
1b58b7851b
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 20:14:08 +02:00
rgarcia
24fc7ab70a
makes answer creation spec more robust
2017-10-04 20:10:49 +02:00
Bertocq
c62b573489
Fix poll Voter feature spec
2017-10-04 17:59:29 +02:00
rgarcia
007bcb7ec7
fixes specs
2017-10-04 17:46:25 +02:00
Bertocq
24ef7984a3
Include the answerable by user scope back on Poll list for officer voting panel
2017-10-04 17:05:25 +02:00
iagirre
4035097c60
Specs added for branch polls-show in consul and thumbnail for poll images in admins views.
...
Cambios para hacer commit:
modificado: app/views/images/_admin_image.html.erb
modificado: spec/features/admin/poll/polls_spec.rb
modificado: spec/features/polls/polls_spec.rb
2017-10-04 16:43:35 +02:00
rgarcia
1f2aa301d4
adds specs for answer's index and create
2017-10-04 16:33:52 +02:00
Bertocq
e1a7fc5dfa
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 15:27:54 +02:00
rgarcia
bf7cab29cf
fixes specs
2017-10-04 15:15:20 +02:00
Bertocq
2900104a07
Show only active polls from the shifts assigned to officer on vote panel
2017-10-04 13:11:13 +02:00