consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,280 Commits 1 Branch 0 Tags
a9159e0ec8fec089b9533dcd65b05d2b51a70e70
Commit Graph

1091 Commits

Author SHA1 Message Date
María Checa
6e680c187f Added new column most_voted to Poll::Question::Answers 2017-10-19 12:17:20 +02:00
rgarcia
cd148dfbf0 adds recounts and results to dev seeds 2017-10-19 11:28:09 +02:00
BertoCQ
9a4364bf0c Merge pull request #2074 from consul/chore/remove_deprecated_valid_answers 
[FROZEN] Remove deprecated Poll::Question valid_answers attribute
 2017-10-19 11:06:29 +02:00
Bertocq
c6d1f727af Correct dev_seeds to correctly create Poll::Question::Answers instead of valid_answers, plus style fixes 2017-10-18 01:29:40 +02:00
Bertocq
b5255afb2d Remove deprecated Poll::Question valid_answers attribute 2017-10-18 00:17:01 +02:00
BertoCQ
d1c67212b0 Merge pull request #1964 from consul/chore/remove_results 
Remove deprecated Poll results models
 2017-10-17 14:39:42 +02:00
Bertocq
99471a3d15 Comment out slug assignment until Poll slug feature is ported back from madrid's fork 2017-10-13 14:42:43 +02:00
Bertocq
ecf95c4ea3 Add slug to Polls on dev seed rake 2017-10-13 12:44:36 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +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
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
00bb6874db Fix dev seeds rake, creating Poll Question Answers 2017-10-06 20:37:13 +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
Bertocq
6e29b6adf5 Fix dev seeds rake, creating Poll Question Answers 2017-10-06 12:16:59 +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
Angel Perez
a83c259a04 Remove 'description' attribute from Poll::Question 
This avoid an exception when seeding the database

See PR #1977
 2017-10-04 15:49:28 -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
ca42bc9845 Added schema.rb with new columns for polls summary and description 2017-10-02 13:28:44 +02:00
Raimond Garcia
f68d86a2e5 Merge pull request #1824 from rockandror/user-recomendations 
User recomendations
 2017-09-29 19:02:03 +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
Senén Rodero Rodríguez
92c774cdeb Merge with master 2017-09-28 13:36:20 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
taitus
51c53b6f31 Add missing specs from Maps on New, Edit and Show. 2017-09-27 14:50:54 +02:00
Senén Rodero Rodríguez
5815389cb8 Rename map settings keys 2017-09-27 14:49:07 +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
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00