Bertocq
|
ca2d9a1d68
|
Add recounting Poll scope with trait and spec
|
2017-10-13 16:51:58 +02:00 |
|
Bertocq
|
540e12a3ac
|
Add RECOUNT_DURATION Poll constant for recount period duration
|
2017-10-13 16:47:47 +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
|
644d09ebd2
|
PR comments applied and poll_question_answer default name changed in factory.
|
2017-10-11 09:42:52 +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
|
89f81bf7a4
|
fixes exception when sending email about comment reply
|
2017-10-10 16:01:20 +02:00 |
|
Raimond Garcia
|
2b588753ee
|
Merge branch 'master' into mlucena-poll-comments
|
2017-10-09 17:59:12 +02:00 |
|
María Checa
|
841ef2a3a2
|
Merge branch 'master' into 1856-legislation_processes_proposals_phase
|
2017-10-09 17:19:07 +02:00 |
|
Bertocq
|
9a396fe634
|
Fix record_voter_participation and usage on specs
|
2017-10-07 10:48:24 +02:00 |
|
BertoCQ
|
6a0197a61b
|
Merge branch 'master' into feature/1985#voting_token
|
2017-10-07 10:46:13 +02:00 |
|
María Checa
|
bcfd1a844a
|
Poll voter token
|
2017-10-06 20:44:47 +02:00 |
|
Bertocq
|
165509b525
|
Switch from Poll::Answer to Poll::Voter usage and small fixes
|
2017-10-06 18:59:47 +02:00 |
|
María Checa
|
35148015b9
|
Added token to poll voters
|
2017-10-06 18:43:00 +02:00 |
|
rgarcia
|
23682fadd8
|
fixes document specs
|
2017-10-06 17:50:41 +02:00 |
|
decabeza
|
dd69401477
|
Merge branch 'master' into question-answer-documents
|
2017-10-06 15:18:42 +02:00 |
|
Bertocq
|
1806bd3df4
|
Add token string attribute to Poll Answer
|
2017-10-06 14:28:57 +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 |
|
rgarcia
|
8dd1d6d947
|
Merge branch 'question-answer-documents' of github.com:consul/consul into question-answer-documents
|
2017-10-06 14:01:13 +02:00 |
|
rgarcia
|
9a31c97a20
|
fixes image specs
|
2017-10-06 14:01:03 +02:00 |
|
decabeza
|
de9b599578
|
Merge branch 'master' into question-answer-documents
|
2017-10-06 13:55:49 +02:00 |
|
Manuel Lucena
|
63cbe2f7c1
|
20171003 - [WIP] Functionality and tests for polls comments
|
2017-10-06 10:36:26 +02:00 |
|
rgarcia
|
a15d1a4020
|
resolves conflict when uploading pdfs to answers
|
2017-10-06 02:52:06 +02:00 |
|
María Checa
|
6192ea8b78
|
Added documents to Poll::Question::Answer
|
2017-10-06 01:17:23 +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 |
|
iagirre
|
5b129b933f
|
Removed documents from questions (documentable from model and uploader from _form in views)
|
2017-10-05 13:38:19 +02:00 |
|
rgarcia
|
06a1b96fcd
|
clean up
|
2017-10-04 23:56:23 +02:00 |
|
rgarcia
|
1cf9bc4ad1
|
adds images to anwers
|
2017-10-04 23:56:09 +02:00 |
|
Angel Perez
|
32f3b643b0
|
Create 'poll_question_answer_videos' table and model
|
2017-10-04 17:25:51 -04:00 |
|
Raimond Garcia
|
1b58b7851b
|
Merge branch 'master' into fix/shift_creation_polls
|
2017-10-04 20:14:08 +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
|
e1a7fc5dfa
|
Merge branch 'master' into fix/shift_creation_polls
|
2017-10-04 15:27:54 +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 |
|
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 |
|
Angel Perez
|
1cc0816dcd
|
Create 'poll_question_answers' controller and views
|
2017-10-03 23:23:50 -04:00 |
|
Angel Perez
|
1d1b861ddf
|
Create 'poll_question_answers' table
|
2017-10-03 23:04:50 -04:00 |
|
Bertocq
|
e928eb38ac
|
Add Officer relationship to Poll Voter
|
2017-10-04 00:39:31 +02:00 |
|
María Checa
|
80c8fa308f
|
Merge branch 'master' into 1954-remove_question_show_and_description
|
2017-10-03 22:33:08 +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
|
348e4e54f3
|
Removed question description
|
2017-10-03 19:11:54 +02:00 |
|
María Checa
|
05d40c0ede
|
Merge branch 'master' into polls_minor_changes
|
2017-10-03 16:22:33 +02:00 |
|
Bertocq
|
fc5ff61365
|
Destroy all related OfficerAssignments when destroying a Shift
|
2017-10-03 12:30:42 +02:00 |
|
Bertocq
|
332b9be94a
|
Reorder before/after create methods
|
2017-10-03 12:26:43 +02:00 |
|
Bertocq
|
34fbf1472c
|
Join in a single validation both Shift date validates statements
|
2017-10-03 12:26:04 +02:00 |
|
Bertocq
|
4e85e136d1
|
Remove OfficerAssignment composed index
|
2017-10-03 12:02:30 +02:00 |
|