Commit Graph

1955 Commits

Author SHA1 Message Date
decabeza
eec05219cc improves html markup on activity tables 2017-10-18 18:54:43 +02:00
decabeza
05a713790f improves edit debate button on debate show 2017-10-18 18:54:01 +02:00
Alberto García
91b8ed67f6 Merge pull request #2075 from wairbut-m2c/iagirre-poll-stats
Iagirre poll stats
2017-10-18 17:25:02 +02:00
BertoCQ
c6d683083f Merge pull request #2073 from consul/feature/2072#remove_question_valid_answers
Remove valid answers usage
2017-10-18 11:52:14 +02:00
BertoCQ
98ba367dfd Merge pull request #2069 from consul/chore/fix_officing_final_result_date
Force Officer results to current date instead of datepicker
2017-10-18 10:59:07 +02:00
iagirre
c896800325 Removed added and unused route 2017-10-18 09:53:03 +02:00
iagirre
f7bb3ec8b7 Merge remote-tracking branch 'consul/master' into iagirre-poll-stats 2017-10-18 09:48:02 +02:00
iagirre
73365ad9d2 Added spects to check de stats model and view 2017-10-18 09:34:17 +02:00
Bertocq
e9294f2a22 Switch from valid_answers to question_answers usage for Poll Questions 2017-10-18 01:32:15 +02:00
Bertocq
ceec71e558 Remove no actions message for citizen that already voted at officing panel 2017-10-17 21:42:03 +02:00
Bertocq
04910fea5b Remove officing results date picker for current date 2017-10-17 21:00:19 +02:00
iagirre
6a292daf42 Partial to render the polls stats and model methods to get the information from DB 2017-10-17 15:04:29 +02:00
BertoCQ
a476019c49 Merge pull request #2020 from consul/poll-videos
Poll answer videos
2017-10-16 20:03:34 +02:00
iagirre
78cc09cc5a Controllers and models to see the polls stats. Routes related also added. 2017-10-16 17:25:04 +02:00
decabeza
d91388b2b3 improves layout and unifies design of admin moderated content 2017-10-13 20:57:19 +02:00
decabeza
ae74e1ba07 improves admin tags layout 2017-10-13 19:31:02 +02:00
Raimond Garcia
5d39ce2f03 Merge pull request #2053 from consul/officing-voter-message
Officing voter message
2017-10-13 15:30:49 +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
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
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +02:00
rgarcia
d405d70f4c add translations 2017-10-10 12:06:58 +02:00
decabeza
471860ea41 puts content on a table for polls questions answers show 2017-10-09 19:44:58 +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
ba9814cd85 shows videos on polls answers 2017-10-09 13:01:39 +02:00
María Checa
728edf64a5 Added "participate in other polls" link in poll show 2017-10-07 19:12:58 +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
decabeza
9ec57f68c2 changes list of videos links on polls question admin 2017-10-07 14:49:36 +02:00
decabeza
a5d3d5d239 adds links to read more and less for answer description 2017-10-07 11:53:34 +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
rgarcia
cf3a62b126 fixes specs 2017-10-06 20:32:06 +02:00
Raimond Garcia
23ef9ded1d Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:47:04 +02:00
Raimond Garcia
c04e2889c5 Merge pull request #1991 from consul/question-answer-documents
Admin question answer documents
2017-10-06 18:25:25 +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
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
María Checa
1225fc9009 Minor fix 2017-10-06 01:28:38 +02:00
María Checa
a655466dbf Added new translations 2017-10-06 01:28:15 +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
María Checa
0cf5299846 Set voting messages 2017-10-06 00:04:25 +02:00