Commit Graph

3105 Commits

Author SHA1 Message Date
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
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
Bertocq
f3a7de55ea Rename should_show_price_info? to should_show_price_explanation? at Budget::Investment & usage 2018-01-10 01:13:34 +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
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
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
Raimond Garcia
05031dffa1 Merge pull request #2202 from wairbut-m2c/aperez-social-metatags
Use 'image_url' properties to improve SEO for proposals & investments
2018-01-08 18:33:07 +01:00
Bertocq
dd3a0add2a Add destroy budget button to admin budget edit view 2018-01-08 17:48:46 +01:00
Raimond Garcia
bce0729a61 Merge pull request #1899 from xarlybovi/legislation-process-html-fixes
Legislation process minor html fixes
2018-01-08 16:00:26 +01:00
Bertocq
d7d1a85fbb Refactor documents and document view partials 2018-01-02 13:32:42 +01:00
Bertocq
46dc559301 Filter out nil related contents while listing them 2017-12-31 20:30:45 +01:00
iagirre
64aaa97d86 Add feature specs to check that edit links and "Selected" buttons are not displayed/enabled.
"Selected" button appears as text instead of dissapearing completely.
2017-12-27 16:23:21 +01:00
iagirre
ec8715efd3 Budget investments cannot be edited when budget is finished. Only milestones can be managed. 2017-12-27 12:15:38 +01:00
decabeza
f95d5d4639 improves generic error message 2017-12-22 12:32:34 +01:00