consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

410 Commits

Author SHA1 Message Date
María Checa
cb15a2e25b Added EmailsDownload controller and routes 
Removed original method to return emails file from Newsletters controller and NewsletterZip class, included `rubyzip` gem that's no longer necessary.
 2018-02-20 22:33:01 +01:00
María Checa
017c242085 Merge pull request #2462 from consul/admin-newsletter-emails 
Admin newsletter emails
 2018-02-20 16:17:37 +01:00
Bertocq
9925e2b02f Extract inline query to User scope & refactor 2018-02-19 11:09:19 +01:00
Bertocq
62d75af892 Fix line lenght offenses at multiple controllers 2018-02-19 11:09:19 +01:00
Bertocq
4fb9f6829c Extract inline query to an OfficerAssignment scope 2018-02-19 11:09:19 +01:00
Bertocq
118deb9fc4 Fix line lenght offenses at multiple controllers 2018-02-19 11:09:19 +01:00
María Checa
24bca36639 Merge branch 'master' into admin-newsletter-emails 2018-02-14 16:07:13 +01:00
María Checa
49adcfde02 Added newsletter controller and routes 2018-02-13 11:39:12 +01:00
Bertocq
2341a2f70b Add by_budget scope to Investment and use it 2018-02-10 16:36:14 +01:00
Bertocq
c0dcd03bab Prevent valuation comments from appearing in public pages 2018-01-31 18:14:11 +01:00
Bertocq
b926740a32 Show valuation comments at admin investment show page 2018-01-31 16:35:45 +01:00
Angel Perez
47c9b343ee Admins can search investments by title or ID (#2401) 2018-01-31 09:52:55 -04:00
Angel Perez
a5159672d4 Investments are now aggregated when using more than 1 advanced filter 2018-01-31 07:21:51 -04:00
Bertocq
093b191f16 Small rubocop autocorrections 2018-01-30 03:07:52 +01:00
Raimond Garcia
626b9972d1 Merge pull request #2378 from wairbut-m2c/aperez-investments-search 
Add search & sorting options to Admin::BudgetInvestments
 2018-01-29 20:06:43 +01:00
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
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