Bertocq
|
916f9ba40b
|
Correctly query and order poll question answers for description block
|
2017-10-13 12:44:55 +02:00 |
|
Bertocq
|
34c278db74
|
Small fixes for Poll Question Answer ordering
|
2017-10-11 12:05:20 +02:00 |
|
iagirre
|
644d09ebd2
|
PR comments applied and poll_question_answer default name changed in factory.
|
2017-10-11 09:42:52 +02:00 |
|
iagirre
|
44474e7686
|
Deleted a forgotten comment
|
2017-10-10 16:39:19 +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 |
|
iagirre
|
2b10b59e2a
|
Order in the admin page using jquery-ui sortable widget.
|
2017-10-10 16:38:29 +02:00 |
|
rgarcia
|
843048a861
|
cleans up
|
2017-10-10 12:14:04 +02:00 |
|
Raimond Garcia
|
2b588753ee
|
Merge branch 'master' into mlucena-poll-comments
|
2017-10-09 17:59:12 +02:00 |
|
María Checa
|
65237db099
|
Fixed poll answer document upload redirect
|
2017-10-07 17:50:42 +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 |
|
rgarcia
|
777237421f
|
fixes specs
|
2017-10-07 14:55:08 +02:00 |
|
rgarcia
|
38f100d183
|
fixes loading of poll question
|
2017-10-07 14:40:26 +02:00 |
|
BertoCQ
|
6a0197a61b
|
Merge branch 'master' into feature/1985#voting_token
|
2017-10-07 10:46:13 +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 |
|
rgarcia
|
cf3a62b126
|
fixes specs
|
2017-10-06 20:32:06 +02:00 |
|
Bertocq
|
81f65f1ac9
|
Touch answer model to force the updated_at value update
|
2017-10-06 19:57:52 +02:00 |
|
Bertocq
|
165509b525
|
Switch from Poll::Answer to Poll::Voter usage and small fixes
|
2017-10-06 18:59:47 +02:00 |
|
Raimond Garcia
|
23ef9ded1d
|
Merge branch 'master' into aperez-edit-poll-question-answers
|
2017-10-06 18:47:04 +02:00 |
|
María Checa
|
35148015b9
|
Added token to poll voters
|
2017-10-06 18:43:00 +02:00 |
|
Raimond Garcia
|
8576f59af1
|
Merge branch 'master' into aperez-edit-poll-question-answers
|
2017-10-06 18:14:00 +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 |
|
rgarcia
|
bd1c03accf
|
fixes upload of answer's images
|
2017-10-06 12:15:45 +02:00 |
|
María Checa
|
c5c1ea7251
|
Fixed answer documents form
|
2017-10-06 12:02:24 +02:00 |
|
Manuel Lucena
|
63cbe2f7c1
|
20171003 - [WIP] Functionality and tests for polls comments
|
2017-10-06 10:36:26 +02:00 |
|
decabeza
|
7856915203
|
removes @question on questions answers
|
2017-10-06 02:38:43 +02:00 |
|
María Checa
|
590344a576
|
Added view to upload documents to poll answers
|
2017-10-06 01:18:53 +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
|
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
|
b31abb64d7
|
Removed the methods not used from nested_documentable specs (the ones that were deleted in the questions specs) and removed also the document params from questions_params (not used anymore).
|
2017-10-05 17:28:24 +02:00 |
|
Angel Perez
|
5f6d218a15
|
Rename param in Admin::Poll::Questions::AnswersController
'poll_question_id' attribute was renamed to 'question_id' on PR #1977,
commit 4aaf681
|
2017-10-05 10:32:09 -04: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
|
3ae539e8ab
|
fixes relation between questions and answers
|
2017-10-04 20:10:31 +02:00 |
|
Raimond Garcia
|
861b583b02
|
Merge pull request #1977 from wairbut-m2c/aperez-admin-questions-section
Admin::Poll questions UI refactor
|
2017-10-04 19:52:45 +02:00 |
|
rgarcia
|
4aaf681d2d
|
uses new answer model in user facing interface
|
2017-10-04 17:45:51 +02:00 |
|
rgarcia
|
461410a79d
|
adds consistency to answer's namespace
|
2017-10-04 17:06:29 +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 |
|
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 |
|
BertoCQ
|
4e99012f8b
|
Merge pull request #1978 from consul/officing_requested_changes
Officing requested changes
|
2017-10-04 14:20:36 +02:00 |
|
Raimond Garcia
|
44d0c04e38
|
Merge branch 'master' into aperez-admin-questions-section
|
2017-10-04 14:13: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 |
|