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
María Checa
2020990b05
Merge pull request #1972 from consul/1954-remove_question_show_and_description
...
Removed poll question show view and description attribute
2017-10-04 12:52:46 +02:00
María Checa
5b7a90221a
Fixed tests
2017-10-04 11:18:09 +02:00
Bertocq
15039b6c5d
Load the Booth polls instead of all current/incoming on Shift creation for date ranges
2017-10-04 11:02:09 +02:00
María Checa
8dc05d399b
Fixed tests
2017-10-04 10:03:44 +02:00
Bertocq
85087b0bea
Check officer value for Poll Voter created from officing panel
2017-10-04 01:09:51 +02:00
María Checa
80c8fa308f
Merge branch 'master' into 1954-remove_question_show_and_description
2017-10-03 22:33:08 +02:00
María Checa
81e9682aa3
Fixed tests
2017-10-03 22:30:15 +02:00
Raimond Garcia
c7f576aa4f
Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section
...
Iagirre admin polls section
2017-10-03 22:23:53 +02:00
María Checa
ac1d2e3aec
Merge pull request #1960 from consul/polls_minor_changes
...
Requested polls admin section improvements
2017-10-03 21:36:08 +02:00
Bertocq
825671ad9b
Fix polls answer this question show text
2017-10-03 18:53:44 +02:00
María Checa
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
María Checa
2cb620296b
Fixed test
2017-10-03 15:49:03 +02:00
Bertocq
0384baf26a
Unify both Shift task type creation on a single scenario to check double task on same day
2017-10-03 13:29:26 +02:00
BertoCQ
fbbbd38932
Merge pull request #1965 from consul/polls-voting
...
Polls voting
2017-10-02 22:25:51 +02:00
BertoCQ
3835821871
Merge branch 'master' into iagirre-admin-polls-section
2017-10-02 22:25:09 +02:00
Bertocq
5aa063668f
Remove no longer used befor block with comments
2017-10-02 19:57:02 +02:00
Raimond Garcia
a743b6b823
Merge branch 'master' into polls-voting
2017-10-02 17:11:21 +02:00
BertoCQ
7f936f440c
Merge branch 'master' into polls_minor_changes
2017-10-02 16:44:53 +02:00
María Checa
c0dcedcd0f
Tests fix
2017-10-02 16:39:09 +02:00
rgarcia
085991c624
allows voting only in one origin: booth or web
2017-10-02 16:22:31 +02:00
