consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,828 Commits 1 Branch 0 Tags
d901b09560b9e73eaf35d4dd90fef6c79b66d9a1
Commit Graph

423 Commits

Author SHA1 Message Date
Julian Nicolas Herrero
4a12425987 Merge pull request #3296 from consul/make_budgets_translatable 
[Backport] Make budgets translatable
 2019-02-13 19:01:13 +01:00
Alberto
eacf740087 Merge pull request #3290 from consul/budget-heading-alert 
[Backport] Include heading names in "headings limit reached" alert
 2019-02-13 17:10:38 +01:00
Julian Herrero
a963a99c55 Use correct scope to sort headings by name 2019-02-13 13:35:09 +01:00
Julian Herrero
1c35ec99c1 Make budget groups translatable 2019-02-13 12:30:37 +01:00
Alberto
938d5eba43 Merge pull request #3191 from consul/ui-i18n-details 
Fix i18n and UI minor details
 2019-02-13 10:55:03 +01:00
Marko Lovic
4a2fae5e90 Add headings to "headings limit reached" alert msg 2019-02-12 17:16:40 +01:00
decabeza
b4ecd07f1f Refactor social share messages 2019-02-11 15:41:35 +01:00
rgarcia
55fb14ac14 do not display alert when supporting for whole city 2019-02-07 16:55:24 +01:00
decabeza
5c7cc5a20f Improve space for links on budget index 2019-02-05 17:16:10 +01:00
decabeza
a2161f3ace Hide voted group css class if current filter is unfeasible 2019-02-05 17:16:04 +01:00
decabeza
025bcedce9 Show project winner label only if budget is finished 2019-02-05 17:15:40 +01:00
decabeza
773302f0d7 Show only random order for unfeasible and unselected investments 2019-01-30 14:16:25 +01:00
decabeza
849dcb7a1a Fix map overlapping links 2019-01-30 14:16:19 +01:00
decabeza
7de846f55c Hide heading links if budget is finished 2019-01-30 14:15:49 +01:00
decabeza
9edabb5bf4 Fix links on budgets index page 2019-01-30 14:15:40 +01:00
Julian Herrero
d77183ee09 Improvement - CRUD budgets and content blocks 2019-01-14 12:59:48 +01:00
Julian Herrero
d2b3943968 improve rendering of map in the sidebar 2019-01-02 10:41:03 +01:00
decabeza
7316c16edd Adds price explanation link on budget investments show 2018-12-19 13:52:17 +01:00
Julian Nicolas Herrero
2175339609 Merge pull request #3106 from consul/2918-crud_budget_groups_headings 
Change CRUD for budget groups and headings
 2018-12-18 10:23:24 +01:00
Julian Herrero
25e1afea48 fix map rendering for budget headings 2018-12-14 15:37:22 +01:00
Javi Martín
df29b49d05 Make milestones view reusable 2018-12-11 19:22:55 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043 
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
 2018-12-11 18:21:14 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page 
Add map to sidebar on Heading's page
 2018-12-11 16:32:35 +01:00
decabeza
6f1e7abedd Improves styles for milestones documents 2018-12-04 17:31:04 +01:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Raimond Garcia
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
decabeza
2c06008370 Improves social share message to budget investments 2018-11-22 11:35:09 +01:00
Matheus Miranda
06f07b1139 Add map to sidebar on Heading's page 
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
 2018-11-16 09:05:23 +01:00
decabeza
315ed77618 Removes unnecessary condition 2018-11-14 13:56:14 +01:00
decabeza
dfa7148406 Shows unselected message only on balloting or later phase 2018-11-12 17:23:58 +01:00
decabeza
7dd530dad7 Adds missing for to budget exections status label tag 2018-11-07 18:25:18 +01:00
decabeza
ba1a6b4cc8 Display first image available for milestones 2018-11-07 18:09:23 +01:00
decabeza
d698a724ac Moves milestone image to a partial 2018-11-07 18:09:20 +01:00
decabeza
7d55f64aac Adds link to milestones on budgets index page 2018-11-07 18:08:03 +01:00
Javi Martín
9bacf39647 Fix link to create a new budget investment 2018-11-06 13:19:34 +01:00
Angel Perez
810bdae37a Move 'budget_execution_no_image' file to app/assets/images/ folder 2018-11-06 13:02:35 +01:00
María Checa
b6fdf732f2 Add total Investments in the execution list 2018-11-06 13:02:35 +01:00
María Checa
d089cc14a5 Add logic to handle budget investments with an execution process 2018-11-06 13:02:35 +01:00
Marko Lovic
8376efce3f Hide headings with no investments 
The page should not show any headings which don't have any
winning investments. The "no content" message should only be
shown when there are no headings with investments to avoid an
otherwise blank page.

__Note:__ in the main @headings query, _both_ #includes and #joins
are needed to:
 1. eager load all necessary data (#includes)
and
 2. to perform an INNER JOIN on milestones to filter out investments
with no milestones (#joins).
 2018-11-06 13:02:35 +01:00
Angel Perez
62b99f01bc Show message for headings without winner investments 2018-11-06 13:02:34 +01:00
Angel Perez
99e4e7ef8a Limit milestones to 1 per investment and sort them by publication date 2018-11-06 13:02:34 +01:00
Angel Perez
448ac7a158 Restore filtering investments by milestone status query 
This commit makes 3 changes:

1. Extracts a query into a helper for clarity and DRYness

2. Adds a `.where` clause to filter investments based on their
(current) milestone status

3. Fixes a bug where investments would be rendered as many times as
milestones associated to an investment
 2018-11-06 13:02:34 +01:00
decabeza
689b25c977 Adds tab-milestones anchor to link and milestone image 2018-11-06 13:02:34 +01:00
decabeza
eb76f644b7 Adds link to heading name on sidebar 2018-11-06 13:02:34 +01:00
decabeza
c7936bacae Adds styles to budgets execution 2018-11-06 13:02:34 +01:00
Angel Perez
2a3ce0b182 Render winner investments under 'Executions' tab 2018-11-06 13:02:34 +01:00
Angel Perez
5de74ea6f1 Load budget headings on budgets/executions#show action 2018-11-06 13:02:34 +01:00
Angel Perez
0a95abc30d Replace budget execution heading route with anchor link 2018-11-06 13:02:34 +01:00
Angel Perez
6559c7212b Add prompt & label for milestones filters under budgets/executions#show 2018-11-06 13:02:34 +01:00