Commit Graph

1396 Commits

Author SHA1 Message Date
Bertocq
7339a98b74 Create installation controller with consul details method, add route on routes.rb 2017-12-04 18:32:04 +01:00
Bertocq
05a6c35b65 Switch case statement for if 2017-12-04 15:48:09 +01:00
Bertocq
b327420e72 Force setseed value range from -1 o 1 2017-12-04 15:42:59 +01:00
María Checa
f9e65b0f80 Merge pull request #2102 from wairbut-m2c/iagirre-admin-poll-stats
Iagirre admin poll stats
2017-11-29 20:07:53 +01:00
Bertocq
c5fa85e3f6 Prevent a division by zero from happening on sort by random investment scope 2017-11-29 11:40:10 +01:00
Raimond Garcia
778ddbee0f Merge pull request #2131 from wairbut-m2c/iagirre-budget-pagination-bug
Iagirre budget pagination bug
2017-11-27 16:49:27 +01:00
BertoCQ
104a26db35 Merge pull request #2110 from wairbut-m2c/aperez-remove-valuator-role
Add option to unassign Valuator role
2017-11-21 16:34:16 +01:00
BertoCQ
ae71f4960b Merge pull request #2068 from ortegacmanuel/add-investment-user-tags-admin-interface
Add investment user tags admin interface
2017-11-19 14:42:01 +01:00
Angel Perez
db86cc5216 Enable 'destroy' action for Valuator on controller 2017-11-17 13:12:26 -04:00
iagirre
87f6f14d48 Bigger random seed range. Tests added to check the randomness between browsers 2017-11-15 11:50:06 +01:00
iagirre
fbb02095bb Some fixes to new code to make the test pass 2017-11-15 09:02:19 +01:00
iagirre
7f0e447e0f One aproach to make the randomness work with kaminari 2017-11-15 08:56:31 +01:00
Bertocq
f45cfc108a Fix Style/AccessorMethodName rubocop issue 2017-11-13 02:34:00 +01:00
Bertocq
a34118dbb0 Fix Lint/ShadowingOuterLocalVariable rubocop issue 2017-11-13 02:23:49 +01:00
Bertocq
cd66ba5d54 Rubocop autocorrections 2017-11-13 02:22:00 +01:00
rgarcia
644ea9629f uses correct order for permitted params 2017-11-08 12:05:02 +01:00
rgarcia
f3831de31c fixes typo introduced while fixing conflicts 2017-11-08 11:56:49 +01:00
Raimond Garcia
ad37606129 Merge branch 'master' into legislation-processes-documents 2017-11-08 11:31:09 +01:00
Alberto García
164bc19b3e Merge pull request #1906 from consul/1856-legislation_processes_proposals_phase
[WIP] Legislation Process Proposals
2017-10-27 12:41:09 +02:00
María Checa
5ae31a6d01 Prevent responsible_name and question from validation 2017-10-27 10:43:37 +02:00
María Checa
658d115c91 Removed share view for Legislation Proposals 2017-10-26 17:13:04 +02:00
María Checa
276baedcfa Added votes to Legislation Proposals 2017-10-25 16:42:55 +02:00
Angel Perez
91aa6e3302 Enable search by name/email for Managers 2017-10-25 10:16:21 -04:00
Angel Perez
59c97b4db7 Enable search by name/email for Valuators 2017-10-25 10:16:21 -04:00
Angel Perez
41f1f4e695 Enable search by name/email for Moderators 2017-10-25 10:16:21 -04:00
Angel Perez
8ef4afb07d Enable search by name/email for Administrators 2017-10-25 10:16:21 -04:00
María Checa
231a14c428 Fixed broken tests 2017-10-25 12:52:59 +02:00
decabeza
f0cfe50de4 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-25 11:52:31 +02:00
Alberto García
5aaeba5fed Merge pull request #2094 from consul/topic-notifications
Topic notifications
2017-10-25 11:08:00 +02:00
iagirre
15db2a150d Merge remote-tracking branch 'consul/master' into iagirre-admin-poll-stats 2017-10-24 10:37:47 +02:00
rgarcia
b8dd93748f removes unnecessary code 2017-10-23 21:40:04 +02:00
Bertocq
3adfbcb830 Fix Shift date ranges when poll is on recounting phase 2017-10-23 20:17:42 +02:00
María Checa
5a9ee4642e Merge branch 'master' into 1786-poll_results 2017-10-23 13:43:58 +02:00
Raimond Garcia
8ca4d0fb7f Merge pull request #2095 from consul/2052-admin_results_and_stats
Admin results and stats
2017-10-23 13:42:40 +02:00
iagirre
5a3e701e8d Polls' stats migrated from Madrid's fork and sortable functions added for tables 2017-10-23 13:19:22 +02:00
decabeza
70713e08c3 adds missing space 2017-10-21 18:25:30 +02:00
decabeza
573961a321 avoids admin access to officing panel 2017-10-21 17:37:14 +02:00
María Checa
62b1998ec6 Added results_enabled and stats_enabled to Poll admin form 2017-10-20 18:45:34 +02:00
decabeza
796fe333e3 adds case when topic on notifications controller 2017-10-20 17:05:23 +02:00
María Checa
dfa8f4590a Most voted fix 2017-10-20 16:57:41 +02:00
María Checa
9bbf0b1ef9 Improved most_voted method 2017-10-20 16:48:54 +02:00
BertoCQ
e886559e9e Merge branch 'master' into 1786-poll_results 2017-10-20 11:10:39 +02:00
Bertocq
085e6ecba4 Complete booth assigment create/destroy methods to work with ajax 2017-10-19 21:32:37 +02:00
Bertocq
f8839434f7 Complete booth assignment view list without actions yet 2017-10-19 20:10:51 +02:00
Bertocq
45d91a7e50 Add Poll booth_assignments and :Poll::BoothAssignment manage routes, actions and views 2017-10-19 19:27:26 +02:00
rgarcia
39ebc5173a displays recounts for a single booth 2017-10-19 11:28:09 +02:00
rgarcia
34ee16a1c1 displays results for booth 2017-10-19 11:28:09 +02:00
Manuel Ortega
97fb986626 Added documentable feature to legislation processes 2017-10-18 19:50:34 +02:00
María Checa
70a35fbe58 Poll views improvements
Reorganized poll `#show`,  `#stats` and `#results` views. Gave stats section its own route.
2017-10-18 18:35:53 +02:00
María Checa
35f24b519d Merge branch 'master' into 1786-poll_results 2017-10-18 17:33:16 +02:00