consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,208 Commits 1 Branch 0 Tags
154cdac33233b7bdfe09b51b43e08d4a1e4ad9ef
Commit Graph

6208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bertocq
154cdac332 Add calculate_winners on Admin Budget controller, route and ability for admins 2017-06-25 15:47:04 +02:00
Bertocq
ee9d3cd7e3 Add a scenario for the Calculate Budgets winner investment feature on admin budget spec 2017-06-25 15:47:04 +02:00
Bertocq
167df16567 Fix Github Pull Request template 
Why:

* The template tried to specify a placeholder for the title, but instead it was used as first line in the description
* The template tried to specify a guide for each section with a `>` character to imply it was a comment, but people didn't remove it

How:

* Removing the first line specifying the title placeholder that has no use
* Changing the `>` character on each section guide for a `-` that can be easily reused for enumerations
 2017-06-25 01:37:42 +02:00
Alberto
b5da0dfc9a Merge pull request #1687 from consul/improve-proposal 
Improve proposal
 2017-06-23 20:12:47 +02:00
decabeza
44b5403db5 improves styles and texts of share proposal view 2017-06-23 18:19:43 +02:00
Alberto
13d414bac3 Merge pull request #1686 from consul/proposal-improvement-link 
Use path instead of url for proposal improvement link
 2017-06-23 16:10:46 +02:00
Juanjo Bazán
616efbffed uses path instead of url for proposal improvement link 2017-06-23 13:12:46 +02:00
Juanjo Bazán
84c5b67644 Merge pull request #1681 from consul/gems 
Updates gem dependencies
 2017-06-22 14:38:19 +02:00
BertoCQ
621ec41ec9 Update Crowdin configuration file 2017-06-22 14:18:22 +02:00
rgarcia
32570c53a9 updates gem dependencies 2017-06-22 13:51:43 +02:00
Raimond Garcia
6667494629 Merge pull request #1670 from consul/feature/1601#generate_budget_heading_winners 
Add Budget Investments filter by winners
 2017-06-21 17:53:01 +02:00
Alberto
57f4a7b897 Merge pull request #1671 from consul/feature/1590#display_draft_comments_by_default 
Display Draft Version comments panel by default
 2017-06-21 17:36:46 +02:00
Juanjo Bazán
cf06f13484 Merge pull request #1675 from consul/registration-polish 
Removes unused validation
 2017-06-21 13:44:09 +02:00
rgarcia
9ebc5ccf34 removes user locale validation 2017-06-21 13:11:59 +02:00
rgarcia
9c12680197 fixes styles for available username 
It was always showing red instead of green, even if the username was
available
 2017-06-21 13:10:40 +02:00
Raimond Garcia
4ceff0a74f Merge pull request #1669 from consul/fix/french_yml_files 
Remove trailing whitespaces from french translation files
 2017-06-21 10:17:15 +02:00
Bertocq
56434cf197 Make Draft Version comments panel visible by default, that hides Table of Contents 2017-06-21 02:54:31 +02:00
Bertocq
6c975998c5 Increase darft version feature spec scenario to expect comments visible 2017-06-21 02:54:00 +02:00
Bertocq
4fd3eb643a Add translations for Admin Budget Investments list filter by winner 2017-06-21 01:33:45 +02:00
Bertocq
1a20c1c785 Add winners scope to Budget Investments 2017-06-21 01:32:22 +02:00
Bertocq
6aecb558cc Add Budget Investment winners filter on admin list view and controller 2017-06-21 01:32:09 +02:00
Bertocq
52d23462fe Increase admin budget investment feature spec to check Winner investment filtering on list 2017-06-21 01:30:48 +02:00
Bertocq
3e88795449 Add winner trait to budget_investment factory 2017-06-21 01:30:07 +02:00
Raimond Garcia
09a2f2b795 Merge pull request #1660 from consul/fix/rubocop_issues 
Fix some Rubocop issues
 2017-06-20 21:49:59 +02:00
Raimond Garcia
91061dc47f Merge pull request #1665 from consul/chore/add_codeclimate_config 
Add CodeClimate config file to enable multiple engines
 2017-06-20 21:49:29 +02:00
Raimond Garcia
6495abf55c Merge pull request #1666 from consul/users-without-email 
Users without email
 2017-06-20 21:48:35 +02:00
Juanjo Bazán
3edced4e5e Merge pull request #1668 from consul/styles 
Fixes styles
 2017-06-20 19:43:34 +02:00
Alberto
6fc59825a6 Merge pull request #1667 from consul/feature/improve_active_category 
Mark current Category as active on proposal/budget list
 2017-06-20 18:48:30 +02:00
decabeza
a7886c401d fixes submenu active class on admin sidebar 2017-06-20 18:43:23 +02:00
decabeza
5d036bae1a removes unnecessary margin on legislation allegations 2017-06-20 18:43:02 +02:00
decabeza
def93d3e0a fixes legislation processes menu 2017-06-20 18:42:34 +02:00
Bertocq
04b8ac36ad Remove trailing whitespaces on french yml files 2017-06-20 01:01:01 -07:00
Bertocq
1eebc33da9 Fix bad merge conflict on rubocop_todo 2017-06-20 09:57:22 +02:00
Bertocq
e5baecdbfe Use 'active' css class on the active category for both proposals and budgets partials 2017-06-20 09:55:42 +02:00
Bertocq
2c031d75c8 Add active class for category link, similar to :hover 2017-06-19 22:54:30 +02:00
Bertocq
74783ffad2 Add missing :verified trait for User model factory 2017-06-19 18:13:00 +02:00
Juanjo Bazán
315c57929a allows managers to create users without email 
allows managers to create users without email

hides email preferences from account page for email-less users

prevents email delivery to users with no email

adds spec for user creation from management

adds specs for user's email requirement

adds spec for no deliveries if no email
 2017-06-19 13:02:48 +02:00
Bertocq
02ca07deb6 Add .codeclimate.yml config file to enable multiple engines 2017-06-19 10:53:31 +02:00
Raimond Garcia
40563ffc64 Merge pull request #1633 from consul/chore/add_github_pr_template 
Github Pull Request Template
 2017-06-19 10:47:09 +02:00
Raimond Garcia
f1e4e5f206 Merge pull request #1656 from consul/chore/add_markdownlinter 
Add Markdown Linter gem and config file && Fixes
 2017-06-19 10:46:31 +02:00
Raimond Garcia
3917f2d999 Merge pull request #1658 from consul/chore/add_coffeelint_config 
Add CoffeeLint configuration file && Fixes
 2017-06-19 10:45:41 +02:00
Bertocq
15c92b27c8 Fix Style/BlockDelimiters rubocop issues and remove it from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
25e501c668 Fix Style/AndOr rubocop issue and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
256eb682d0 Fix Rails/RequestReferer rubocop issue and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
f6863f5ea0 Rubocop autocorrect Performance/RedundantBlockCall issue and remove it from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
c88d822330 Fix Lint/UnderscorePrefixedVariableName issue and remove it from rubocop_todo file 2017-06-19 10:45:18 +02:00
Bertocq
db97314f7b Fix Lint/NestedMethodDefinition rubocop issue and remove it from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
6e1fa53e2c Fix Lint/DefEndAlignment rubocop issues and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
b104765ddc Rubocop autocorrect Lint/BlockAlignment and remove from rubocop_todo list 2017-06-19 10:45:18 +02:00
Bertocq
21c6d1c4dd Cleanup Lint/AssignmentInCondition rubocop issues on code and remove it from ruboco_todo list 2017-06-19 10:45:18 +02:00