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

11379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Consul Bot
ec91bdfdff New translations valuation.yml (Albanian) 2018-11-06 13:14:02 +01:00
Consul Bot
22603388b2 New translations activerecord.yml (Albanian) 2018-11-06 13:14:01 +01:00
Consul Bot
85e09715fc New translations verification.yml (Albanian) 2018-11-06 13:13:59 +01:00
Consul Bot
10bc138f94 New translations activemodel.yml (Albanian) 2018-11-06 13:13:57 +01:00
Consul Bot
380e6b1d6a New translations mailers.yml (Albanian) 2018-11-06 13:13:57 +01:00
Consul Bot
86c9a166cc New translations devise_views.yml (Albanian) 2018-11-06 13:13:56 +01:00
Consul Bot
0afaf6f7bd New translations pages.yml (Albanian) 2018-11-06 13:13:54 +01:00
Consul Bot
afe109fb18 New translations devise.yml (Albanian) 2018-11-06 13:13:53 +01:00
Consul Bot
b7b683d27d New translations budgets.yml (Albanian) 2018-11-06 13:13:52 +01:00
Consul Bot
5a81923d99 New translations legislation.yml (Albanian) 2018-11-06 13:13:51 +01:00
Consul Bot
d2388dec54 New translations moderation.yml (Albanian) 2018-11-06 13:12:17 +01:00
Raimond Garcia
7d403a6d86 Merge pull request #2999 from consul/dependabot/bundler/knapsack_pro-1.1.0 
Bump knapsack_pro from 0.53.0 to 1.1.0
 2018-11-06 13:11:09 +01:00
Raimond Garcia
eb32835e1a Merge pull request #3000 from consul/dependabot/bundler/rack-1.6.11 
[Security] Bump rack from 1.6.10 to 1.6.11
 2018-11-06 13:10:46 +01:00
Consul Bot
bc7be0ee7b New translations kaminari.yml (Swedish) 2018-11-06 13:10:38 +01:00
Consul Bot
c17b739068 New translations community.yml (Swedish) 2018-11-06 13:10:37 +01:00
Consul Bot
d173e39abb New translations social_share_button.yml (Swedish) 2018-11-06 13:10:36 +01:00
Consul Bot
b1e77e07c6 New translations valuation.yml (Swedish) 2018-11-06 13:10:34 +01:00
Consul Bot
f03f8f529f New translations verification.yml (Swedish) 2018-11-06 13:10:33 +01:00
Consul Bot
db7c8cc915 New translations activemodel.yml (Swedish) 2018-11-06 13:10:32 +01:00
Consul Bot
f1cd3f3713 New translations mailers.yml (Swedish) 2018-11-06 13:10:31 +01:00
Consul Bot
c2ca684409 New translations devise_views.yml (Swedish) 2018-11-06 13:10:30 +01:00
Consul Bot
137c16a68b New translations pages.yml (Swedish) 2018-11-06 13:10:29 +01:00
Consul Bot
078ae17cff New translations devise.yml (Swedish) 2018-11-06 13:10:28 +01:00
Consul Bot
73e6639d28 New translations budgets.yml (Swedish) 2018-11-06 13:10:27 +01:00
Consul Bot
6e9cc6972f New translations moderation.yml (Swedish) 2018-11-06 13:10:26 +01:00
Consul Bot
daf850d42b New translations rails.yml (Swedish) 2018-11-06 13:10:25 +01:00
Consul Bot
c7c9c42b58 New translations activerecord.yml (Swedish) 2018-11-06 13:10:22 +01:00
Raimond Garcia
281336689c Merge pull request #3002 from consul/dependabot/bundler/uglifier-4.1.19 
Bump uglifier from 4.1.3 to 4.1.19
 2018-11-06 13:10:11 +01:00
Raimond Garcia
883d5b985f Merge pull request #3003 from consul/dependabot/bundler/rspec-rails-3.8.1 
Bump rspec-rails from 3.7.2 to 3.8.1
 2018-11-06 13:09:49 +01:00
Consul Bot
3c5642004d New translations admin.yml (Spanish) 2018-11-06 13:09:24 +01:00
Consul Bot
e3a88a7b05 New translations activerecord.yml (Spanish) 2018-11-06 13:09:17 +01:00
Consul Bot
afa26f4df5 New translations rails.yml (Albanian) 2018-11-06 13:06:43 +01:00
Javi Martín
ab870c756a Use Date.current to find published milestones 
Using `Date.today` caused some milestones to be published before/after
the date defined by `Rails.application.config.time_zone`.

See also commit AyuntamientoMadird/consul@088c76d for a more detailed
explanation.
 2018-11-06 13:02:35 +01:00
María Checa
126941a335 Change headings reorder method 2018-11-06 13:02:35 +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
406bbb4cdb Avoid unnecessary navigation for faster specs 2018-11-06 13:02:35 +01:00
Marko Lovic
997db67104 Refactor how headings are ordered 2018-11-06 13:02:35 +01:00
Marko Lovic
375fbf775f Order non-city headings by alphabetical order 2018-11-06 13:02:35 +01:00
Marko Lovic
4758c1b91a Show city heading in first position on executions list 2018-11-06 13:02:35 +01:00
rgarcia
685927116c Query for all investments, not only winner investment 
Spending proposals did not have a winner attribute, instead winners
where calculated dynamically looking at votes

Removing this condition, so that we can see investment for the 2016
participatory budget which used spending proposals
 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
a3ef662509 Filtering investments are based on the latest milestone status 2018-11-06 13:02:35 +01:00
Angel Perez
749954267d Use Budget::Investment#winners scope to fetch only winner investments 2018-11-06 13:02:34 +01:00
Angel Perez
62b99f01bc Show message for headings without winner investments 2018-11-06 13:02:34 +01:00
Angel Perez
5114792941 Add specs for budgets/executions feature 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
a07a100828 Fixes image sizes 2018-11-06 13:02:34 +01:00