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 |
|
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 |
|
Bertocq
|
3026115382
|
Remove redundant curly braces around a hash parameter
|
2018-01-10 22:44:11 +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
|
a06abf7650
|
Removed unnecessary code
|
2018-01-10 11:57:23 +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 |
|
Bertocq
|
334091710c
|
Refactor price & explanation showing logic at Investment model
|
2018-01-10 11:26:16 +01:00 |
|
Bertocq
|
21d6ce57c5
|
Add published_prices? helper method and phases constant at Budget model
|
2018-01-10 01:15:07 +01:00 |
|
Bertocq
|
f3a7de55ea
|
Rename should_show_price_info? to should_show_price_explanation? at Budget::Investment & usage
|
2018-01-10 01:13:34 +01:00 |
|
Bertocq
|
922318b978
|
Add publishing prices phase to budget model, plus translation texts
|
2018-01-10 01:10:57 +01:00 |
|
Bertocq
|
d8ceff1a53
|
Refactor Budget's on hold phases to constant, plus alignments
|
2018-01-10 01:09:13 +01:00 |
|
decabeza
|
13ea6bdd6b
|
add i18n and fix layout for download current selection
|
2018-01-09 19:39:51 +01:00 |
|
decabeza
|
65d682901b
|
fixes vertical align on support/price on index list
|
2018-01-09 19:32:40 +01:00 |
|
decabeza
|
952869b5b6
|
fixes typo
|
2018-01-09 19:32:40 +01:00 |
|
decabeza
|
271c6869cd
|
hide budget investment table heading if no results
|
2018-01-09 19:32:40 +01:00 |
|
decabeza
|
3c8ec4169f
|
improves messages on header
|
2018-01-09 19:29:36 +01:00 |
|
decabeza
|
5fb49c7adf
|
reorders elements like proposals/show
|
2018-01-09 19:29:36 +01:00 |
|
decabeza
|
c44a1c57af
|
shows supports number on bold
|
2018-01-09 19:29:36 +01:00 |
|
decabeza
|
47194205bf
|
fixes author actions on sidebar
|
2018-01-09 19:29:36 +01:00 |
|
decabeza
|
979d9d071b
|
adds help text for population field on admin budgets groups
|
2018-01-09 19:29:36 +01:00 |
|
decabeza
|
bba19d1fd5
|
fixes label name of group on admin budgets groups
|
2018-01-09 19:29:36 +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 |
|
María Checa
|
c27e6ab1d1
|
Merge pull request #2223 from wairbut-m2c/iagirre-prevent-edition-if-budget-final-phase
Prevent edition of investments if budget is in the final phase
|
2018-01-09 12:18:23 +01:00 |
|
María Checa
|
96859190be
|
Merge pull request #2280 from consul/2277-budgets_new_form
Budgets new form
|
2018-01-09 11:55:10 +01:00 |
|
BertoCQ
|
6e96c8c057
|
Merge branch 'master' into feature/2275#destroy_budgets
|
2018-01-09 11:03:51 +01:00 |
|
BertoCQ
|
01c41c7cca
|
Merge pull request #2284 from consul/feature/2276#admin_budget_edit_redirect
Redirect admin to budget lists after edit
|
2018-01-09 10:50:54 +01:00 |
|
María Checa
|
385db76a24
|
Changed location attribute label text
|
2018-01-08 23:23:02 +01:00 |
|
María Checa
|
5161988844
|
Removed external_url input
|
2018-01-08 23:22:46 +01:00 |
|
Bertocq
|
4916f9a3c3
|
Avoid listing non-published Budgets to the public
Why:
Non-admins shouldn't be aware of non-published Budgets
How:
Using the budget_published? helper method
|
2018-01-08 23:02:18 +01:00 |
|