Commit Graph

2124 Commits

Author SHA1 Message Date
Bertocq
36e74d0ef2 Add Budget::Phase model, spec and factory
Create a new Budget::Phase model that:
* Stablishes a relation with its budget
* Stablishes relation with two other Budget::Phases (previous and next)
* Validates basic dates range, kind and description rules.
* Adds scopes to get the ones enabled as well as each individual phase

Create a factory that generates a basic and valid Budget::Phase

Create a model spec that checks kind, date range and budget validations.
2018-01-16 12:18:13 +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
fa3c0d0143 Added new translations 2018-01-12 18:35:21 +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
Raimond Garcia
43ba27c9cf Merge pull request #1908 from wairbut-m2c/aperez-split-routes-file
Split 'routes.rb' file into multiple small files
2018-01-11 12:20:42 +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
iagirre
0e11e21b2a Merged with master and solved conflicts 2018-01-10 13:23:39 +01:00
María Checa
bc363289ad Added translations to link text 2018-01-10 12:19:48 +01:00
decabeza
27c4abf552 improve i18n for budgets notices 2018-01-10 11:37:05 +01:00
Bertocq
922318b978 Add publishing prices phase to budget model, plus translation texts 2018-01-10 01:10:57 +01:00
Angel Perez
1cd47da9d4 Split routes into small files for easier customization (#1852) 2018-01-09 15:49:01 -04:00
decabeza
13ea6bdd6b add i18n and fix layout for download current selection 2018-01-09 19:39:51 +01:00
decabeza
271c6869cd hide budget investment table heading if no results 2018-01-09 19:32:40 +01:00
decabeza
458b2aeb2d fixes i18n 2018-01-09 19:29:36 +01:00
decabeza
6fbd971278 changes text proposal to projects 2018-01-09 19:29:36 +01:00
decabeza
6174820de6 updates text 2018-01-09 19:29:36 +01:00
decabeza
3c8ec4169f improves messages on header 2018-01-09 19:29:36 +01:00
decabeza
72a8c4ab6e updates texts proposals to investment project 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
Bertocq
c4e0178947 Fix all budget investment price translations to Price instead of Cost 2018-01-09 18:42:06 +01:00
Raimond Garcia
50884f7f24 Merge branch 'master' into aperez-capistrano-maintenance-task 2018-01-09 16:17:21 +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
Bertocq
f9803ce9ca Add drafting phase to budget model & translations 2018-01-08 22:56:11 +01:00
Bertocq
b1d685c4dc Add budget destroy texts for admin section 2018-01-08 18:21:46 +01:00
Bertocq
3509bfe3e4 Remove spending proposals from sitemap and its test, deprecated model 2018-01-07 15:38:44 +01:00
Bertocq
0ecfbfe55c Fix capistrano version lock on deploy.rb script to same on Gemfile 2018-01-07 12:51:42 +01:00
Bertocq
3bf8948b11 Fix typo, dowload to download 2018-01-03 17:38:44 +01:00
Bertocq
83d6b7948d Downscore archival date ordering label for consistency in english 2017-12-27 19:42:07 +01:00
decabeza
f95d5d4639 improves generic error message 2017-12-22 12:32:34 +01:00
decabeza
ef5cbc4638 adds legislation processes to sitemap 2017-12-21 14:44:30 +01:00
decabeza
466b6d9ec5 removes irrelevants pages from sitemap 2017-12-21 14:19:05 +01:00
BertoCQ
d534b02b3c Merge pull request #2206 from consul/related-contents-score
Related contents score
2017-12-20 15:13:12 +01:00
rgarcia
e58ff785cd adds translations 2017-12-19 20:33:54 +01:00
María Checa
47a847c173 Added translations 2017-12-19 13:20:40 +01:00
María Checa
7d8b5838b9 Added new related contents score method 2017-12-19 13:14:12 +01:00
María Checa
d944a88c63 Added flag/unflag related content routes 2017-12-18 18:21:51 +01:00
Raimond Garcia
3610c61d6f Merge pull request #2199 from consul/api-votes
Allows querying for a proposal's votes
2017-12-16 10:52:48 +01:00
rgarcia
56945d9bbe allows querying for a proposal's votes 2017-12-15 19:21:02 +01:00
decabeza
463731c731 adds documentation text shared i18n key 2017-12-15 18:48:24 +01:00
decabeza
8bff974584 changes milestones date label 2017-12-15 18:48:24 +01:00
decabeza
8ff4303d20 changes image admin title label and improves image fields layout 2017-12-15 18:48:24 +01:00
decabeza
4f3c75c205 changes public interest label and improves account show layout 2017-12-15 18:48:24 +01:00
decabeza
208f2e898d removes duplicated i18n key 2017-12-15 18:48:24 +01:00
Raimond Garcia
d0b407d4e5 Merge pull request #2183 from consul/related-content
Related contents functionalities
2017-12-15 10:00:43 +01:00
Alberto García
1737f85398 Merge branch 'master' into aperez-dates-for-milestones 2017-12-14 20:50:55 +01:00
Alberto García
09b544774d Merge pull request #2191 from wairbut-m2c/iagirre-add-documents-to-milestones
Add documents to milestones
2017-12-14 20:49:19 +01:00