consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

5383 Commits

Author SHA1 Message Date
Bertocq
872e7ceb02 Use budget published_phases's method to get them ordered, and decrease final date 2018-01-18 17:18:05 +01:00
Bertocq
7599eb4c35 Refactor budget phases step progress functions and usage 2018-01-18 17:18:05 +01:00
decabeza
aaccf87ec5 adds new partial for phases info on budget homepage 2018-01-18 17:18:04 +01:00
Bertocq
2e883db283 Refactor budget phases current step & total steps 2018-01-18 16:53:36 +01:00
Bertocq
986ee9c87d Correctly render budget description with html & links 2018-01-18 16:18:27 +01:00
BertoCQ
92eac29da7 Merge branch 'master' into budget_map 2018-01-18 00:36:43 +01:00
decabeza
0950a98ddd fixes css class name 2018-01-18 00:24:32 +01:00
decabeza
9cfd60afc2 adds styles to budgets homepage 2018-01-18 00:24:32 +01:00
decabeza
7cbb1dd3a7 adds comments to pending content 2018-01-18 00:24:32 +01:00
decabeza
8486c183df improves name on each method 2018-01-18 00:24:32 +01:00
Bertocq
a6b06ca730 Improve Budget's homepage 
* Add budget's phases number status
* Add budget's headings and groups list
* Placeholders for future improvements
 2018-01-17 19:11:58 +01:00
María Checa
14b62601f6 Added alerts data 2018-01-17 19:11:47 +01:00
Vicente Mendoza
d0df965487 fix some issues about test and variables name 2018-01-17 17:10:19 +01:00
Vicente Mendoza
91e10e1897 new map on budget homepage 2018-01-17 13:15:35 +01:00
BertoCQ
d44db9cec4 Merge branch 'master' into feature/budget_phases 2018-01-16 17:47:47 +01:00
Raimond Garcia
a215c9c603 Merge pull request #2322 from consul/current_budget 
Change concept of current budget to account for multiple budgets
 2018-01-16 16:53:10 +01:00
BertoCQ
5ee1cc66fd Merge pull request #2327 from consul/design-ui 
Design UI
 2018-01-16 14:18:45 +01:00
decabeza
0114286e6c adds class to improve table on mobile version 2018-01-16 12:37:03 +01:00
Bertocq
66691b644a Refactor Budget::PHASES constant to Budget::Phase::PHASE_KINDS 2018-01-16 12:18:13 +01:00
Bertocq
f2228a908b Refactor budget's phase max description lenght from Budget to Phase model 2018-01-16 12:18:13 +01:00
Bertocq
153b46b468 Create description_for_phase helper method at Budget, to make it easier to get non-active-phase description 2018-01-16 12:18:13 +01:00
rgarcia
5086314bee Display only current budget for Valuators 
Before we could have multiple current budgets, as we now only have one
current_budget, some specs broke.

As there is no need to display multiple budgets to Valuators, only the
current budget is necessary, we can remove arrays and assume that only
a single budget, the current budget, is displayed to Valuators
 2018-01-15 22:02:04 +01:00
rgarcia
01ef439053 Display only current budget to Managers printing investments 
In the specs, some investment were missing a heading_id, thus creating
another unexpected budget

By explicitly setting the heading_id we can control better which
budgets are created in each test
 2018-01-15 22:02:04 +01:00
BertoCQ
3d5bf04829 Merge pull request #2311 from consul/2299-budget_investments_related_content 
Budget investments related content
 2018-01-15 20:02:34 +01:00
María Checa
a1f840e8fd Added improvements to related contents 2018-01-12 18:35:15 +01:00
decabeza
ba63a91ce7 removes comments 2018-01-11 17:09:54 +01:00
decabeza
a39f5eb691 adds help text for population field on new heading form 2018-01-11 17:08:39 +01:00
decabeza
ddcd5eb2e0 Merge branch 'budgets-ui' of https://github.com/consul/consul into budgets-ui 2018-01-11 17:07:11 +01:00
decabeza
40d32f3e16 Merge branch 'master' into budgets-ui 2018-01-11 17:05:28 +01:00
María Checa
c56a7b4e16 Added related contents to budget investments 2018-01-11 16:49:07 +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
71e045fece Merge pull request #2296 from consul/feature/2278#budget_price_show_phase 
New Budget's phase to publish investment prices
 2018-01-10 23:46:41 +01:00
decabeza
e819da5556 improve i18n for budgets notices 2018-01-10 22:27:22 +01:00
decabeza
46666c4b01 add i18n and fix layout for download current selection 2018-01-10 22:27:21 +01:00
decabeza
f4de83da2d fixes vertical align on support/price on index list 2018-01-10 22:25:41 +01:00
decabeza
baeef5e1e8 fixes typo 2018-01-10 22:25:41 +01:00
decabeza
8dd41325be hide budget investment table heading if no results 2018-01-10 22:25:09 +01:00
decabeza
cf2a732e3d improves messages on header 2018-01-10 22:17:26 +01:00
decabeza
c704d100cc reorders elements like proposals/show 2018-01-10 22:17:26 +01:00
decabeza
ddcfc73e86 shows supports number on bold 2018-01-10 22:17:26 +01:00
decabeza
04c2c3f884 fixes author actions on sidebar 2018-01-10 22:17:26 +01:00
decabeza
6f922621a9 adds help text for population field on admin budgets groups 2018-01-10 22:17:26 +01:00
decabeza
b8b3ce87f3 fixes label name of group on admin budgets groups 2018-01-10 22:17:25 +01:00
Bertocq
88741b9179 Improve investment links at budget list with target blank 2018-01-10 22:09:06 +01:00
Bertocq
760b7ca4c8 Fix indentations and lines lenght 2018-01-10 14:17:48 +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
María Checa
bc363289ad Added translations to link text 2018-01-10 12:19:48 +01:00
María Checa
eda673a85d Restored missing code 2018-01-10 11:57:13 +01:00
decabeza
27c4abf552 improve i18n for budgets notices 2018-01-10 11:37:05 +01:00