Commit Graph

6387 Commits

Author SHA1 Message Date
Raimond Garcia
debb12f026 Merge pull request #1733 from consul/chore/update_code_of_conduct
Update Code of Conduct
2017-07-10 12:01:09 +02:00
Raimond Garcia
cd91608922 Merge pull request #1729 from consul/chore/remove_tolk
Remove Tolk, Crowdin in use
2017-07-10 11:51:59 +02:00
Bertocq
51a22e8733 Fix english translation string for figcaption 2017-07-09 17:07:56 +02:00
Bertocq
0b967dac89 Fix english translation for budget investment share 2017-07-09 13:37:15 +02:00
Bertocq
dd8ff5284f Update Code of Conduct to contributor covenant 1.4 2017-07-09 13:06:44 +02:00
Bertocq
3dd459f18a Fix valuation english translation to English 2017-07-09 11:59:51 +02:00
Bertocq
8b2b21c6d7 Remove Tolk, Crowdin substituted it
Why:

* Crowdin now hosts all consul translations publicly so anyone can contribute https://crowdin.com/project/consul/invite
* Crowdin makes easy for non-tech people to contribute, once we have a demo site we'll be able to offer "on site" translation
* If you still use Tolk, we recommend removing this commit (but adding tolk gem to ./Gemfile_custom file to avoid future merge conflicts)

How:

* Reverting changes introduced with 9610a6a933
2017-07-09 00:56:14 +02:00
Bertocq
dbc3af917a Update rubocop_todo list with rubocop --auto-gen-config 2017-07-07 21:24:45 +02:00
Bertocq
a9c928505d Fix indentation on annotator overrides scss file 2017-07-06 15:56:51 +02:00
Bertocq
631f396e75 Fix dev_seeds to comply with budget related uniqueness names 2017-07-06 11:16:53 +02:00
BertoCQ
e8e6eff679 Merge pull request #1718 from consul/migrate_locales
Migrate localization files & Prepare Crowdin
2017-07-05 14:29:45 +02:00
Bertocq
f58f033e1d Move existing translations into new folder structure with help of rake task 2017-07-05 13:31:50 +02:00
Bertocq
0740c3bc26 Add rake task to help migrate existing locale files to new structure 2017-07-05 13:30:05 +02:00
Bertocq
6f01db0245 Update customization guides to reflect new localization files structure 2017-07-05 13:30:05 +02:00
Bertocq
8fc2692f69 Add crowding config 2017-07-05 13:30:05 +02:00
Bertocq
355d65b998 Correct i18n tasks config file with new folder pattern, remove Spanish from i18n-task specs 2017-07-05 13:30:05 +02:00
Bertocq
552661f0e4 Add to i18n load path files in nested folders 2017-07-05 13:30:05 +02:00
BertoCQ
e990568895 Merge pull request #1721 from consul/feature/add_slugs_to_budget_related
Add slugs to budget related
2017-07-05 13:16:24 +02:00
BertoCQ
c439454ec7 Merge pull request #1722 from consul/chore/rubocop_cleaning
Rubocop cleaning
2017-07-05 13:12:09 +02:00
BertoCQ
48cc2f03a2 Merge pull request #1724 from consul/feature/add_investment_selected_checbox
Add investment selected checbox & improve view
2017-07-05 13:11:48 +02:00
Bertocq
512059e021 Increase Budget, Heading and Group model specs to cover slug uniqueness
Why:

* Slug must be unique among:
 1. Budget slug: among other budgets
 2. Group slug: among other groups from its budget
 3. Heading slug: among other headings from all the groups from its budget

How:

* Adding checks for all possible scenarios on each model specs
2017-07-05 12:33:17 +02:00
Bertocq
4068e50b33 Create rake task to generate slug for objects that use Sluggable concern
Why:

* Once slug presence validation and usage is merged on to a code base, existing objects without it will become invalid and unusable

How:

* Running `bundle exec slugs:gnerate` will look for all models that include the concern, and generate a slug for each object
2017-07-05 12:33:17 +02:00
Bertocq
e3d89261a6 Add Sluggable concern and unique validation to Budget, Group and Heading
* What: We need to generate slug on Budget, Group and Heading classes, validating its unique for its scope

* How: Adding a presence and unique validation using Budget always as scope.
2017-07-05 12:33:16 +02:00
Bertocq
4a5a164925 Ignore Style/SymbolProc rubocop cop, no strong preferences for it 2017-07-05 11:56:44 +02:00
Bertocq
2888c20489 Fix all Style/RedundantSelf rubocop issues 2017-07-05 11:55:52 +02:00
Bertocq
97d7a21791 Fix all Style/RedundantReturn rubocop issues 2017-07-05 11:55:52 +02:00
Bertocq
29b58298db Fix Style/NegatedIf rubocop issue 2017-07-05 11:55:52 +02:00
Bertocq
343da2d58e Improve admin investment view with selection/compatibility/winner flags on top 2017-07-05 11:26:59 +02:00
Bertocq
16f295ea0b Fix english translation for Heading, typo from Spanish 2017-07-04 23:54:04 +02:00
Bertocq
e35817f240 Add selected checkbox on admin investment form 2017-07-04 23:48:18 +02:00
Bertocq
39fa6ec2de Increase admin investment feature to cover selected checkbox 2017-07-04 23:47:11 +02:00
Bertocq
28970c6701 Fix all Style/UnneededInterpolation rubocop issues and remove from rubocop_tod 2017-07-04 22:44:08 +02:00
Bertocq
4535fc9345 Create Sluggable concern, generates slug using name attribute before validation
Why:

* We need a way to generate a slug for a object given his name attribute value

How:

* A concern that generates the slug before validation
2017-07-04 18:40:54 +02:00
Bertocq
73e0a5a88d Add to Budget Budget::Heading Budget::Group specs the sluggable shared example
Why:

* Those classes have a slug attribute that needs to be filled

How:

* Just adding the shared example to Budget model spec, and creating the model spec file for Heading and Group to include it as well
2017-07-04 18:40:54 +02:00
Bertocq
148b58f71d Add sluggable shared example for Sluggable concern
Why:

* We need certain models that use a Sluggable to generate a slug based on name attribute on save

How:

* Creating a shared example that knows how to create a factory of the described class
* Checking in it that new objects of the described class get the correct slug
2017-07-04 18:40:01 +02:00
Bertocq
eb9d5b9b84 Add slug string column to Budget, Budget::Heading and Budget::Group
Why:

* We're still using id's on routes and other parts of the app, using slugs are more friendly and nice

How:

* Just a migration with a slug column with string type
2017-07-04 17:25:26 +02:00
Bertocq
9f38192e13 Remove unnecesary frozen_string_literal comment 2017-07-04 17:25:15 +02:00
Raimond Garcia
c5d2e83475 Merge pull request #1716 from MariaCheca/1647-locale_site_customization
Locale site customization
2017-07-04 12:55:21 +02:00
Raimond Garcia
e7e5b3c4a3 Merge branch 'master' into 1647-locale_site_customization 2017-07-04 12:11:07 +02:00
Raimond Garcia
92f2bd67b3 Merge pull request #1720 from consul/feature/1594#incompatible_investments
Incompatible investments
2017-07-04 12:10:19 +02:00
Bertocq
10b17eae8f Update user budget's result feature spec to include incompatible ones 2017-07-04 02:14:54 +02:00
Bertocq
10c299d19f Add to public Budget Results page winners, discarded and incompatible listing 2017-07-04 01:34:25 +02:00
Bertocq
e87073301d Fix form js coffe data toggle-link helper function for toogle buttons 2017-07-04 01:34:25 +02:00
Bertocq
339597483e Add incompatible scope to Budget Investment model 2017-07-04 01:34:25 +02:00
Bertocq
688ec05ea2 Replace winner column for incompatible on admin investment list filter by selected 2017-07-04 01:34:24 +02:00
Bertocq
646b3657ee Add investment status on admin budget investment detail show page 2017-07-04 01:34:24 +02:00
Bertocq
afc77f68fb Add incompatible checkbox on admin investment edit form 2017-07-04 01:34:24 +02:00
Bertocq
99052485fb Recalculate heading winner investments when a winner is flagged as incompatible 2017-07-04 01:34:24 +02:00
Bertocq
640e0e1c2a Use compatible filter when calculating budget heading winners 2017-07-04 01:34:24 +02:00
Bertocq
ed016d7afd Add compatible scope to Budget Investment and use it on the winners scope
Why:

* Only compatible investments can be winners

How:

* Using the new column incompatible to filter compatible investments
2017-07-04 01:34:24 +02:00