Commit Graph

8587 Commits

Author SHA1 Message Date
decabeza
fc89c899cc Updates help url example on seeds 2018-01-30 18:28:05 +01:00
decabeza
f92664331d Changes .more-information class to .help 2018-01-30 18:27:43 +01:00
decabeza
286371c9d9 Changes more_info folder and path to help 2018-01-30 18:26:30 +01:00
decabeza
a958a75bb1 Updates text of polls section of more info page 2018-01-30 18:13:24 +01:00
decabeza
037a3af5a6 Updates text of budgets section of more info page 2018-01-30 18:12:48 +01:00
decabeza
fffc769c90 Updates text of proposals section of more info page 2018-01-30 18:12:21 +01:00
decabeza
59a02301c2 Updates text of debates section of more info page 2018-01-30 18:11:50 +01:00
decabeza
735630cff0 Updates text of intro section of more info page 2018-01-30 18:11:13 +01:00
decabeza
213152349b Changes more info link to help 2018-01-30 18:10:42 +01:00
Raimond Garcia
e1b7c7aa32 Merge pull request #2398 from wairbut-m2c/aperez-fix-investments-table
Fix: Admin investments table not showing up properly
2018-01-30 12:18:47 +01:00
Bertocq
345d513342 Remove unnecesary feature flag setting at spec 2018-01-30 12:13:01 +01:00
Bertocq
b3e7f8a78f Remove no longer neccesary feature flags from valuation feature spec 2018-01-30 12:10:15 +01:00
Bertocq
ffe7d4baad Fix rubocop issues at dev seeds 2018-01-30 03:31:41 +01:00
Bertocq
a4fb568654 Improve dev seeds comments adding them to investments 2018-01-30 03:29:20 +01:00
Bertocq
093b191f16 Small rubocop autocorrections 2018-01-30 03:07:52 +01:00
Bertocq
04d5a83031 Improve Budget's index feature spec scenarios 2018-01-30 03:01:44 +01:00
BertoCQ
dab1562132 Merge pull request #2369 from consul/fix_finished_budgets_list
Correctly show finished budgets at budget index
2018-01-30 02:25:06 +01:00
Angel Perez
2cee29d883 Fix: Admin investments table not showing up properly 2018-01-29 18:34:15 -04:00
Raimond Garcia
b5cb5e2563 Merge pull request #2387 from wairbut-m2c/show_only_current_budget_tags_in_admin_budget
Show only current budget tags in admin budget
2018-01-29 20:14:10 +01:00
Raimond Garcia
626b9972d1 Merge pull request #2378 from wairbut-m2c/aperez-investments-search
Add search & sorting options to Admin::BudgetInvestments
2018-01-29 20:06:43 +01:00
Alberto García
1207b5ce51 Merge pull request #2279 from wairbut-m2c/aperez-missing-i18n-keys
I18n maintenance
2018-01-29 14:02:15 +01:00
BertoCQ
afb1c5da4b Merge pull request #2393 from consul/paperclip_upgrade
Upgrade Paperclip to 5.2.1 for security reasons
2018-01-29 12:04:17 +01:00
Bertocq
4874090799 Update Security section of unreleased at Changelog.md 2018-01-29 11:36:22 +01:00
Bertocq
75a68e8439 Upgrade Paperclip to 5.2.1 for security reasons 2018-01-29 11:08:46 +01:00
Bertocq
6d3359dbbc Fix bad line break 2018-01-26 12:01:22 +01:00
Vicente Mendoza
45a86d0db8 Added test to verify that the search of the tags is only from the current budget 2018-01-26 11:31:14 +01:00
Vicente Mendoza
ff5112f96b Changed the budgets helper so just search for the current budget 2018-01-26 11:30:02 +01:00
Bertocq
5e583d2015 Increase notifiable access security on add notification method 2018-01-26 11:24:13 +01:00
Bertocq
f4ad0b2979 Improve add_notification logic to add notificable author 2018-01-26 00:33:07 +01:00
Bertocq
070c94494e Fix linelenght over 100 on multiple files 2018-01-26 00:27:03 +01:00
Bertocq
34b2a27357 Cleanup indentation and line lenght aat order select partial 2018-01-25 18:06:36 +01:00
Bertocq
9b2aebc8c2 Remove closing </li>'s without opening <li> 2018-01-25 17:54:15 +01:00
Alberto García
6918bd699c Merge pull request #2384 from consul/fix-texts
Fix i18n texts
2018-01-25 16:09:36 +01:00
decabeza
f06ef1ac91 updates spanish translations of budgets 2018-01-25 14:41:16 +01:00
decabeza
1d7352d21c fixes textarea and label order on admin budgets phases form 2018-01-25 14:40:04 +01:00
decabeza
f607075c4a replaces hardcoded text to votes_for_proposal_success setting 2018-01-25 14:39:13 +01:00
Angel Perez
716fd6a46e Persist sorting when filtering/selecting investments 2018-01-25 08:18:04 -04:00
Angel Perez
e04dc5b8f2 Add sorting options for Admin::BudgetInvestments (#2336) 2018-01-25 08:18:04 -04:00
Angel Perez
d30d2b0dd8 Arrange Admin::BudgetInvestments I18n for buttons under same namespace 2018-01-25 08:18:04 -04:00
Angel Perez
680ca46ef1 Add search form for Admin::BudgetInvestments (#2336) 2018-01-25 08:16:32 -04:00
María Checa
c08edf044d Updated changelog 2018-01-25 11:57:37 +01:00
María Checa
e875ba1f33 Merge pull request #2379 from consul/advanced-filters-design
Advanced filters design
2018-01-25 11:53:07 +01:00
decabeza
c2ff1f6cff fixes scss lint warning 2018-01-25 11:14:06 +01:00
decabeza
12fbd50fc4 updates specs 2018-01-25 11:14:06 +01:00
decabeza
acfd49e5bd improves styles for budget investments advanced filters 2018-01-25 11:14:06 +01:00
Bertocq
c01c08a3f4 Use current_budget directly instead of instance variable 2018-01-25 00:48:52 +01:00
Bertocq
8749b46ec4 Remove budget_published? usage on budget index, drafting budgets no longer listed 2018-01-25 00:48:52 +01:00
Bertocq
791f081a91 Rename @budget to @current budget at budget index
Clear instance variable names help understand what's going around when
you're deep 2 or 3 partials. In this case @budget is only used to carry
around the current_budget so @current_budget is more descriptive.

Using `current_budget` directly around would be an alternative, but
maybe not as maintainable in case we want to change which budget is
being shown (for example the drafting one if you're admin).
2018-01-25 00:48:52 +01:00
Bertocq
e62ca48a94 Show only finished budgets at budget's index
We only need finished budget's at budget's index "Finished budgets"
section. So we add the `finished` scope to @budgets variable, and rename
it so its clear what it contains.

Also avoid showing the "Finished budgets" section if there is none
2018-01-25 00:48:52 +01:00
Bertocq
e5cff2fb60 Make budget feature spec comply with 100 linelenght 2018-01-25 00:48:52 +01:00