consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

1554 Commits

Author SHA1 Message Date
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
Bertocq
ad986e600e Merge branch 'master' into feature/1929#add_shift_task_usage 2017-10-03 12:01:21 +02:00
Bertocq
3a17c74f2c Merge branch 'master' into chore/remove_results 2017-10-03 11:42:57 +02:00
María Checa
e6b5de77fe Removed files that are not being used 2017-10-03 10:50:18 +02:00
Bertocq
6c998768e8 Fix Poll Recount model spec after default amount value added 2017-10-03 00:19:12 +02:00
BertoCQ
19e8ec265f Merge branch 'master' into chore/remove_results 2017-10-02 23:54:13 +02:00
Bertocq
9ae72387fe Remove remove_question ability from admin on Poll 2017-10-02 23:29:57 +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
01e4447050 Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results 
Admins can see the preview of the budgets' results before the balloti…
 2017-10-02 21:40:04 +02:00
Raimond Garcia
a743b6b823 Merge branch 'master' into polls-voting 2017-10-02 17:11:21 +02:00
Bertocq
58069b35a3 Remove Poll White/Null/Total Results models, tables, specs and references 2017-10-02 16:24:57 +02:00
rgarcia
085991c624 allows voting only in one origin: booth or web 2017-10-02 16:22:31 +02:00
rgarcia
0147401fbe adds origin to poll voters 2017-10-02 16:18:08 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
Bertocq
6c297ae789 Add Poll Recount model, factory and spec 2017-10-02 14:57:40 +02:00
Bertocq
35f6a5bb65 Add task to unique triple index on Shift for booth, officer and task 2017-10-02 13:45:19 +02:00