Commit Graph

2322 Commits

Author SHA1 Message Date
decabeza
acfd49e5bd improves styles for budget investments advanced filters 2018-01-25 11:14:06 +01:00
Vicente Mendoza
410caced3e test added for changes at documentable's view 2018-01-24 12:48:06 +01:00
Bertocq
18a5bc6642 Make English the default locale 2018-01-24 11:37:43 +01:00
María Checa
1c2949b60d Merge pull request #2344 from wairbut-m2c/aperez-investments-filters
Improvements for Admin::Budget::Investment filters
2018-01-23 20:09:54 +01:00
Raúl Fuentes
82b750de68 moved duplicated code to helper 2018-01-23 15:42:01 +01:00
iagirre
846898f3ec New phase "Information" added and UI modified to not show the links.
Specs to test the functionality added.
2018-01-23 15:42:01 +01:00
Bertocq
4dc07738b0 Fix rails translations for months, beware of crowdin PR's! 2018-01-23 12:51:05 +01:00
Bertocq
b998ca2e7a Add back nil at beginning of rails en months 2018-01-23 11:55:51 +01:00
Bertocq
599442440b Correctly format Budget's phases dates 2018-01-23 02:07:49 +01:00
Bertocq
c41a8482d1 Fix spanish phase translations 2018-01-23 01:48:55 +01:00
Bertocq
2ad1f96d71 Fix rails english dates 2018-01-23 01:43:57 +01:00
decabeza
7a17db01ef adds links with filters on budgets results page 2018-01-22 19:27:54 +01:00
Angel Perez
3f6a9187ec Add 'current applied filters' message to investments partial 2018-01-22 14:04:57 -04:00
Angel Perez
1027896617 Reenable 'winners' tab under Admin::Budget::Investment 2018-01-22 14:04:57 -04:00
Angel Perez
a085f471df Replace 'selection' header on investments partial with 'selected' 2018-01-22 14:02:29 -04:00
Angel Perez
ff40d32028 Add new filters to Admin::Budget::Investment navbar 2018-01-22 14:02:29 -04:00
Angel Perez
e92a67a206 Simplify filters navbar on Admin::Budget::Investment 2018-01-22 14:02:29 -04:00
Angel Perez
e5c73d8f02 Add advanced filters for Admin::Budget::Investment 2018-01-22 14:02:29 -04:00
María Checa
1f461b09f0 Merge pull request #2353 from consul/2339-admin_budgets_phases
Allow admins to edit Budget phases
2018-01-22 18:07:34 +01:00
Bertocq
0359488477 Fix months names and abbr on rails files after crowdin breaks them 2018-01-22 16:38:07 +01:00
Bertocq
891b81920d Fix bad crowdin rails.yml dates list format 2018-01-22 16:24:45 +01:00
decabeza
f37141b2ac Corrects again texts for investments 2018-01-22 15:56:37 +01:00
Bertocq
0f88343f06 Remove spanish derived language translations, really just copies of spanish right now 2018-01-22 15:53:45 +01:00
María Checa
94279448f3 Replaced 'participatory budget' with 'budget' 2018-01-20 14:03:14 +01:00
Angel Perez
baa50b9b51 Fix: Missing I18n key on Admin::Budgets index view 2018-01-19 15:34:44 -04:00
Angel Perez
ac5c8cc02f Fix: Typo on Admin::HiddenUsers controller views 2018-01-19 15:34:44 -04:00
Angel Perez
8499549eeb Add missing I18n key for Admin::Poll::Questions::Answers::Images 2018-01-19 15:34:44 -04:00
María Checa
c9f0bf4947 Added new translations 2018-01-19 18:19:54 +01:00
María Checa
1abb7f0310 Added admin budget phases controller and routes 2018-01-19 17:55:24 +01:00
Bertocq
4df6479c26 Update translations from Crowdin 2018-01-19 16:56:23 +01:00
BertoCQ
54f3c2b460 Merge pull request #2348 from consul/budgets-design-polish
Budgets design polish
2018-01-19 15:19:24 +01:00
decabeza
5ffd06257a updates texts for investments 2018-01-19 14:35:05 +01:00
Bertocq
f17527f467 Update translations from crowdin 2018-01-19 14:12:51 +01:00
Bertocq
17671fa29b Remove duplicated activerecord translation key 2018-01-19 13:40:21 +01:00
decabeza
57c0907b9b adds some strong tags on guide texts 2018-01-18 21:09:21 +01:00
decabeza
dcc2240eb6 adds i18n keys 2018-01-18 21:09:21 +01:00
rgarcia
8a669b86bd Fix English grammar in translations 2018-01-18 21:09:21 +01:00
rgarcia
d3d05f9cee Add guide to create a proposal or investment
During a Participatory Budget, some users are getting confused and
creating a proposal instead of a budget investment. This intermediate
page should help them create investments

Adding a feature flag just in case other forks don’t need this feature
and setting seeds and dev_seeds for appropriate initial setup
2018-01-18 21:09:21 +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
4f41dc4d3a Added new translations 2018-01-17 19:11:47 +01:00
BertoCQ
d44db9cec4 Merge branch 'master' into feature/budget_phases 2018-01-16 17:47:47 +01:00
Bertocq
601351d160 Validate next/prev phases before saving a Budget::Phase, with model specs 2018-01-16 15:20:17 +01:00
Bertocq
7d222db84b Fix budget investment location label title 2018-01-16 14:21:36 +01:00
BertoCQ
5ee1cc66fd Merge pull request #2327 from consul/design-ui
Design UI
2018-01-16 14:18:45 +01:00
Bertocq
32e746ddb3 Add maps config variables to secrets example file 2018-01-16 12:46:15 +01:00
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
decabeza
9f93f11e90 changes organization name on budget investment show 2018-01-15 21:30:42 +01:00
decabeza
2763f65c7d updates texts on new budget investment form 2018-01-15 21:24:06 +01:00
decabeza
39b55e11df changes text and makes bigger link to delete a marker on a map 2018-01-15 21:21:24 +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