Commit Graph

709 Commits

Author SHA1 Message Date
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
María Checa
35148015b9 Added token to poll voters 2017-10-06 18:43:00 +02:00
Bertocq
1806bd3df4 Add token string attribute to Poll Answer 2017-10-06 14:28:57 +02:00
Manuel Lucena
63cbe2f7c1 20171003 - [WIP] Functionality and tests for polls comments 2017-10-06 10:36:26 +02:00
Angel Perez
32f3b643b0 Create 'poll_question_answer_videos' table and model 2017-10-04 17:25:51 -04:00
rgarcia
4aaf681d2d uses new answer model in user facing interface 2017-10-04 17:45:51 +02:00
Raimond Garcia
44d0c04e38 Merge branch 'master' into aperez-admin-questions-section 2017-10-04 14:13:20 +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
1d1b861ddf Create 'poll_question_answers' table 2017-10-03 23:04:50 -04:00
BertoCQ
e32521ebe0 Merge branch 'master' into 1954-remove_question_show_and_description 2017-10-04 01:17:07 +02:00
Bertocq
e928eb38ac Add Officer relationship to Poll Voter 2017-10-04 00:39:31 +02:00
Bertocq
3a0e709e14 Correct composed index on poll Shift model adding date 2017-10-03 23:34:09 +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
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
19e8ec265f Merge branch 'master' into chore/remove_results 2017-10-02 23:54:13 +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
d401a2cd92 Add default 0 value for Poll Recount amounts 2017-10-02 21:16:22 +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
0147401fbe adds origin to poll voters 2017-10-02 16:18:08 +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
iagirre
77d0a551cf Migration for adding summary and description to polls created. Both text_areas were added to polls form.
Imageable class included in polls model and the first aproach for adding images added to form.
2017-09-28 17:46:30 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
Senén Rodero Rodríguez
5956207a00 Add map locations. Each map location can belongs to proposal or budget investment. 2017-09-27 14:48:12 +02:00
Bertocq
1dde4cb3ec Add types to Poll Shifts as an enum 2017-09-27 13:57:16 +02:00
Senén Rodero Rodríguez
6f71da07ee Duplicate documentable code and rename for imageable 2017-09-26 13:55:03 +02:00
Bertocq
e38b06a003 Add Images table with paperclip attachment columns 2017-09-26 13:53:43 +02:00
Bertocq
718336ce89 Remove no longer needed migrations, Image will be a separate table 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
515d6d7e70 Rename image_description column to image_title on budget investments. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c399692109 Add image description to budget investments 2017-09-26 13:53:42 +02:00
taitus
7b88e63136 Add image to budget investments. 2017-09-26 13:53:42 +02:00
María Checa
02fa3a83b5 Custom tags for Legislation Process available
Custom tags for Legislation Processes, editable in the admin section.
2017-09-22 17:16:04 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
María Checa
08d1e96575 Added migration to include legislation/proposals_count in tags table 2017-09-19 10:09:43 +02:00
Bertocq
2e3b5aad49 Totally remove Poll::FinalRecount model, table spec and factory 2017-09-19 01:22:30 +02:00
BertoCQ
90e1325293 Merge branch 'master' into 1740#add_total_poll_recount 2017-09-14 17:51:54 +02:00
Bertocq
e3a45baa37 Fix password_changed_at default date to 01-01-2015 2017-09-14 17:49:45 +02:00
Bertocq
1f867fb227 Add new model Poll Total Result with specs and relations 2017-09-14 13:51:27 +02:00
María Checa
335399e571 Created Legislation Proposals model 2017-09-14 12:50:48 +02:00
María Checa
c811fd46f0 Proposals description migration and form
- Added to legislation processes a new attribute called `proposals_description`.
- Then created new views to show a form for the `@process` to edit this attribute **from in the proposals section**.
- Completed translations for new views.
2017-09-13 15:48:07 +02:00
María Checa
bc218531b0 Proposals phase migration 2017-09-13 12:31:42 +02:00
BertoCQ
fa8b9a69a3 Merge branch 'master' into polls-persist-officer-data 2017-09-11 00:11:36 +02:00
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00