Alberto García
1207b5ce51
Merge pull request #2279 from wairbut-m2c/aperez-missing-i18n-keys
...
I18n maintenance
2018-01-29 14:02:15 +01:00
Angel Perez
e04dc5b8f2
Add sorting options for Admin::BudgetInvestments ( #2336 )
2018-01-25 08:18:04 -04:00
Angel Perez
680ca46ef1
Add search form for Admin::BudgetInvestments ( #2336 )
2018-01-25 08:16:32 -04:00
Angel Perez
1027896617
Reenable 'winners' tab under Admin::Budget::Investment
2018-01-22 14:04:57 -04:00
Angel Perez
ff40d32028
Add new filters to Admin::Budget::Investment navbar
2018-01-22 14:02:29 -04:00
Angel Perez
e92a67a206
Simplify filters navbar on Admin::Budget::Investment
2018-01-22 14:02:29 -04:00
Angel Perez
e5c73d8f02
Add advanced filters for Admin::Budget::Investment
2018-01-22 14:02:29 -04:00
Angel Perez
8499549eeb
Add missing I18n key for Admin::Poll::Questions::Answers::Images
2018-01-19 15:34:44 -04:00
Angel Perez
10fac6d2d1
Admins can delete an answer's associated images ( #1999 )
2018-01-19 15:29:18 -04:00
María Checa
1abb7f0310
Added admin budget phases controller and routes
2018-01-19 17:55:24 +01:00
BertoCQ
d44db9cec4
Merge branch 'master' into feature/budget_phases
2018-01-16 17:47:47 +01:00
Bertocq
66691b644a
Refactor Budget::PHASES constant to Budget::Phase::PHASE_KINDS
2018-01-16 12:18:13 +01:00
rgarcia
349780922d
Add Budget.open scope
...
Before Budget.current could return multiple budgets, now there can only
be a single current_budget.
Adding the concept of open, which better reflects what the admin sees
in this page: A tab for open budgets and a tab for finished budgets
2018-01-15 22:01:59 +01:00
Raimond Garcia
b0bd7792be
Merge pull request #1917 from wairbut-m2c/iagirre-admin-budget-heading-action
...
Actions for budgets' headings added. Edit headings, delete headings i…
2018-01-11 13:47:27 +01:00
Bertocq
3026115382
Remove redundant curly braces around a hash parameter
2018-01-10 22:44:11 +01:00
iagirre
0e11e21b2a
Merged with master and solved conflicts
2018-01-10 13:23:39 +01:00
iagirre
f0724ce13a
Changes suggested in the PR made
2018-01-10 13:13:05 +01:00
Raúl Fuentes
29018e3062
changes made at the request of voodoorai2000
2018-01-09 13:08:03 +01:00
Raúl Fuentes
b3461b2051
final details
2018-01-09 12:45:30 +01:00
Raúl Fuentes
56f4c3c3b9
added test to csv download and style corrections
2018-01-09 12:45:30 +01:00
Raúl Fuentes
95c1aa43e8
added csv download link to budget_investments (issue 1625)
2018-01-09 12:45:30 +01:00
BertoCQ
6e96c8c057
Merge branch 'master' into feature/2275#destroy_budgets
2018-01-09 11:03:51 +01:00
Bertocq
03e1481fb1
Redirect admin to budget lists after editing a budget
2018-01-08 18:47:09 +01:00
Bertocq
799b96cc40
Add destroy action to admin budget controller
2018-01-08 18:21:45 +01:00
Alberto García
b4782f73f2
delete unnecessary parenthesis
2017-12-14 21:13:46 +01:00
Alberto García
1737f85398
Merge branch 'master' into aperez-dates-for-milestones
2017-12-14 20:50:55 +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
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
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
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
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
decabeza
f0cfe50de4
Merge branch 'master' into 1856-legislation_processes_proposals_phase
2017-10-25 11:52:31 +02:00
iagirre
15db2a150d
Merge remote-tracking branch 'consul/master' into iagirre-admin-poll-stats
2017-10-24 10:37:47 +02:00
Bertocq
3adfbcb830
Fix Shift date ranges when poll is on recounting phase
2017-10-23 20:17:42 +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
