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

3246 Commits

Author SHA1 Message Date
Bertocq
1c653a7096 Improve admin menu active item conditionals 2018-02-20 18:50:39 +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
decabeza
1cc799ef11 Adds links to milestone description 2018-02-14 18:13:46 +01:00
decabeza
a950bb03a7 Removes unnecessary p tag on investment partial 2018-02-14 18:04:17 +01:00
decabeza
990dc072be Refactors custom page view and include specs 2018-02-14 17:52:10 +01:00
decabeza
f7c7f0201a Fixes heading structure and i18n format on legislation processes 2018-02-14 17:06:26 +01:00
María Checa
24bca36639 Merge branch 'master' into admin-newsletter-emails 2018-02-14 16:07:13 +01:00
María Checa
881059811f Added newsletter admin views 2018-02-14 16:05:29 +01:00
decabeza
c0c4d9e01f Fixes back link to on how to use help page 2018-02-14 16:00:01 +01:00
Raimond Garcia
8bec36500a Merge pull request #2385 from wairbut-m2c/2363-alert-delete-investment-project 
Add alert message when a user deletes an investment project from "My activity"
 2018-02-13 14:06:08 +01:00
María Checa
20173f9870 Added newsletter mailer method and view 2018-02-13 13:12:00 +01:00
Bertocq
b3b28e21d0 Fix translation indentation on investments partial 2018-02-10 20:44:02 +01:00
Bertocq
86a60a8b7c Fix space & comma typo 2018-02-10 19:15:00 +01:00
Bertocq
a46e9f756a Fix end's indentations at budget index page 2018-02-10 18:23:38 +01:00
Bertocq
9f47bce7f5 Improve budget index info page with classes 2018-02-10 18:22:45 +01:00
Bertocq
2915788487 Add budget id to finished budgets list on budget index 2018-02-10 18:20:15 +01:00
Bertocq
089ccdae7c Fix html alignments 2018-02-10 16:58:00 +01:00
Bertocq
189fa5ba50 Fixes advanced filters link position 2018-02-10 16:42:54 +01:00
Raúl Fuentes
5b16d395e7 Added logic to not show invetment links is the budget phase isn't reviewing_ballots or finished 2018-02-10 15:27:40 +01:00
decabeza
2154a614c2 Adds new legislation processes section on help page 2018-02-08 19:06:41 +01:00
decabeza
dac5b7c9a2 Adds missing polls button on help page 2018-02-07 19:09:30 +01:00
BertoCQ
087c8b0a99 Merge pull request #2395 from consul/hidden-comments 
Hidden comments
 2018-02-05 20:27:05 +01:00
Bertocq
770086779e Use new milestone order_by_publication_date order scope 2018-02-03 19:15:59 +01:00
Bertocq
2a678dfd4a Order group headings by name on listing 2018-01-31 23:20:57 +01:00
Bertocq
10d780ea4b Add valuation flag to comment form cache key 2018-01-31 22:26:03 +01:00
Bertocq
5420cd36bf Disallow comment actions on valuation comments 2018-01-31 17:46:36 +01:00
Bertocq
0f4d0b4fe9 Improve valuation flag at comment form 2018-01-31 17:19:26 +01:00
Bertocq
9cb4b03276 Disallow valuation comment creation on finished budget 2018-01-31 17:07:56 +01:00
Bertocq
b926740a32 Show valuation comments at admin investment show page 2018-01-31 16:35:45 +01:00
Bertocq
528c9be925 Refactor valuation comments into its own partial 
It's going to be used at valuation and admin panels
 2018-01-31 16:34:11 +01:00
Bertocq
a15e372f7e Rename written_by_authors partial to dossier 
Its more descriptive in the contexts where its rendered
 2018-01-31 16:30:39 +01:00
Angel Perez
47c9b343ee Admins can search investments by title or ID (#2401) 2018-01-31 09:52:55 -04:00
Raimond Garcia
45d07fa16f Merge pull request #2407 from wairbut-m2c/aperez-investment-filters-aggregation 
Investments can be applied several filters at once
 2018-01-31 14:39:02 +01:00
BertoCQ
05a6406189 Merge branch 'master' into remove_investments_internal_comments 2018-01-31 13:47:15 +01:00
BertoCQ
ec81f399bf Merge pull request #2403 from consul/valuation_comments 
Valuation comments
 2018-01-31 13:46:22 +01:00
Angel Perez
1f50e284a9 'Current applied filters' message handles multiple filters in use 2018-01-31 07:21:51 -04:00
Angel Perez
a5159672d4 Investments are now aggregated when using more than 1 advanced filter 2018-01-31 07:21:51 -04:00
Alberto García
0d64f51b78 Merge pull request #2405 from consul/more-info-pages 
Improve texts of help page
 2018-01-31 11:09:12 +01:00
BertoCQ
4020720b32 Merge pull request #2370 from consul/improve_budget_heading_style 
Improve budget heading style
 2018-01-31 02:35:51 +01:00
BertoCQ
f0f41b0403 Merge pull request #2373 from consul/single_heading_group_names 
Improve heading names at select boxes
 2018-01-31 02:35:11 +01:00
Bertocq
033c197580 Disallow comment flagging when showing valuations 2018-01-31 02:05:35 +01:00
Bertocq
1c3924b527 Hide comment voting at valuation comment threads 2018-01-31 02:04:16 +01:00
Bertocq
149c81371b Allow valuation internal comments to be created 
How:

Using a local variable at partials to set a hidden true/false value for
`valuation` parameter on the comment creation form.

Allowing that new param at the comment controller and using it when
building a new Comment.
 2018-01-31 02:03:02 +01:00
Bertocq
dff966d9b3 Show valuation comment thread @ Valuation show/edit 
Why:

Budget Investment's valuators should be able to see internal valuation
comments thread at both show and edit views.

How:

At Valuation::BudgetInvestmentsController:
* Include CommentableActions to gain access to the entire feature, with
required resource_model & resource_name methods.
* Add the only possible order (oldest to newest)
* Load comments on both show & edit actions, passing `valuations` flag
to the CommentTree in order to only list those.

At CommentTree:
* Use `valuations` flag as instance variable to decide wich
comment threat to load: valuations (if relation exists) or comments.
 2018-01-31 01:53:33 +01:00
BertoCQ
e0e67c959b Merge pull request #2397 from consul/hide_order_selector_if_only_one_order 
Hide order selectors when only one order available
 2018-01-30 19:20:28 +01:00
decabeza
42d0f471ee Updates i18n keys and images folder 2018-01-30 19:10:48 +01:00
decabeza
f92664331d Changes .more-information class to .help 2018-01-30 18:27:43 +01:00
decabeza
286371c9d9 Changes more_info folder and path to help 2018-01-30 18:26:30 +01:00
decabeza
a958a75bb1 Updates text of polls section of more info page 2018-01-30 18:13:24 +01:00
decabeza
037a3af5a6 Updates text of budgets section of more info page 2018-01-30 18:12:48 +01:00