Raimond Garcia
d0b407d4e5
Merge pull request #2183 from consul/related-content
...
Related contents functionalities
2017-12-15 10:00:43 +01:00
Raimond Garcia
cd89cb801c
Merge pull request #2190 from consul/related-content-form
...
Related content form
2017-12-15 09:59:56 +01:00
rgarcia
ebb3c075b0
fixes proposal's management specs
2017-12-15 09:58:12 +01:00
Alberto García
b4782f73f2
delete unnecessary parenthesis
2017-12-14 21:13:46 +01:00
María Checa
1830a7bb04
Added pagination for relationed content list
2017-12-14 20:54:35 +01:00
Alberto García
1737f85398
Merge branch 'master' into aperez-dates-for-milestones
2017-12-14 20:50:55 +01:00
María Checa
88fc740863
Moved RELATIONABLE_MODELS from controller to model
2017-12-14 20:48:32 +01:00
María Checa
5c7b5eed53
Added RelatedContentsController
2017-12-14 14:50:47 +01:00
iagirre
01a8c55936
Make Budget::Investment::Milestone class Documentable.
...
Add fields to the milestone form so that the admin can attach 0, 1 or multiple documents.
Add column to milestone list with a link to documents (if there is any).
Make documents accessible from the milestone view for users.
2017-12-14 10:53:01 +01:00
Angel Perez
6d57d76071
Admins can add a 'publication date' to milestones
2017-12-13 20:17:54 -04:00
iagirre
35986ea6b5
Budget::Investment::Milestone is imageable
...
Admin form attaches an image
Milestone list has a column "Image", empty or with a link to the image
2017-12-13 08:59:36 +01:00
Raimond Garcia
11e80fbc92
Merge pull request #1903 from wairbut-m2c/aperez-enable-disable-proposals
...
Add enable/disable option for 'Proposals' feature
2017-12-08 11:41:13 +01:00
Raimond Garcia
22a8157165
Merge branch 'master' into aperez-email-specs-for-commentables
2017-12-07 13:05:25 +01:00
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
2bdc2c27d7
Add email specs for Poll
2017-11-17 13:14:03 -04:00
Angel Perez
db86cc5216
Enable 'destroy' action for Valuator on controller
2017-11-17 13:12:26 -04:00
Angel Perez
ab9d612128
'Proposals' feature can be enabled/disabled
...
Fixes #1886
2017-11-17 13:10:55 -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
