consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

1508 Commits

Author SHA1 Message Date
Bertocq
afc77f68fb Add incompatible checkbox on admin investment edit form 2017-07-04 01:34:24 +02:00
María Checa
36d51b380b Merge branch 'master' into 1647-locale_site_customization 2017-07-02 23:19:40 +02:00
María Checa
720a2af046 Update pages controller and views 
Added new attribute `locale` to pages index list and form.
 2017-07-02 14:49:56 +02:00
Eduardo Martinez Echevarria
9324b02ce1 Avoid set_process on legislation/processes controller member actions 2017-07-01 12:39:16 +02:00
Bertocq
d31e0ed79b Bring set_process back to legislation process controller, still needed until is correctly loaded 2017-07-01 02:05:57 +02:00
Eduardo Martinez Echevarria
a599a0b91e Set legislation processes visibility depending on publication 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
3e5c5d7e49 Define some actions on legislation processes as member actions 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
dfa9c988ad Add checkbox to set published in process admin management 2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
Bertocq
904e3fdcfa Fix all Style/HashSyntax rubocop issues and remove from rubocop_todo list 2017-06-28 14:12:51 +02:00
Bertocq
c9bc028524 Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file 2017-06-28 14:12:51 +02:00
Bertocq
2fa92937d2 Fix all Style/BracesAroundHashParameters rubocop issues and remove them from rubocop_todo list 2017-06-28 14:12:51 +02:00
Bertocq
57f476c2fa Merge branch 'master' into feature/add_population_to_budget_heading 2017-06-27 18:43:24 +02:00
Bertocq
f6fe9cc7d2 Fix all Layout/SpaceAroundOperators rubocop issues and remove file list from rubocop_todo list 2017-06-26 18:04:20 +02:00
Bertocq
e6dd33bd66 Fix all Layout/SpaceAfterComma issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
9763931f55 Fix all Layout/SpaceBeforeComma rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
a76033fb72 Fix all Style/StringLiteralsInInterpolation rubocop issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Raimond Garcia
6e60f5acde Merge pull request #1680 from consul/chore/small_rubocop_cleanup 
Chore/small rubocop cleanup
 2017-06-26 17:42:10 +02:00
Raimond Garcia
f41d3637cf Merge pull request #1678 from consul/feature/1601#budget_winner_investments_button 
Add button to Calculate Budget Winner investments
 2017-06-26 17:41:08 +02:00
Bertocq
8cd7c685dc Add population to allowed params on admin budget heading controller 2017-06-25 15:47:46 +02:00
Bertocq
154cdac332 Add calculate_winners on Admin Budget controller, route and ability for admins 2017-06-25 15:47:04 +02:00
Bertocq
78efccc197 Fix all Layout/EmptyLinesAroundAccessModifier rubocop issues and remove files from rubocop_todo list 2017-06-25 15:46:46 +02:00
Bertocq
d2e08d1a0c Remove unused param on both method and call, using class variable instead 2017-06-25 15:46:46 +02:00
taitus
f220952883 Add CRUD Milestone on Admin::BudgetInvestment. Rename Checkpoint to Milestone. 2017-06-24 22:38:48 +02:00
Eduardo Martinez Echevarria
e60ffa3c00 Remove featured attribute management on admin/tags 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
8dd52110db Use category scope instead of condition on kind on Tag 2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
7fe5fc18b0 Manage only tags of kind 'category' on admin/tags controller 2017-06-23 17:34:55 +02:00
Juanjo Bazán
616efbffed uses path instead of url for proposal improvement link 2017-06-23 13:12:46 +02:00
Bertocq
6aecb558cc Add Budget Investment winners filter on admin list view and controller 2017-06-21 01:32:09 +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
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
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
21c6d1c4dd Cleanup Lint/AssignmentInCondition rubocop issues on code and remove it from ruboco_todo list 2017-06-19 10:45:18 +02:00
Juanjo Bazán
9ab0f9cf8b Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 12:46:58 +02:00
kikito
782a68e9d3 Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 09:58:17 +02:00
Bertocq
73ff68815d Update admin legislation process controller and form to allow enabling/disabling phase/publications 2017-06-13 23:50:12 +02:00
Bertocq
2018fc0b7d Fix Legislation Process Controller to correctly set both @phase and @process 2017-06-13 22:04:36 +02:00
Bertocq
8710d8c0d3 Replace old active_phase? for new phase/publication enabled? for legislation processes 2017-06-13 22:04:36 +02:00
Bertocq
1b260c91f0 Replace old show_phase? for new phase/publication started? for legislation processes 2017-06-13 22:04:36 +02:00
Bertocq
523988a291 Replace old open_phase? method for new phase/publication open? on Legislative Process 2017-06-13 22:04:36 +02:00
Bertocq
e55328caf4 Rename legislation process final_version_publication phase name to more descriptive result_publication 2017-06-13 22:04:36 +02:00
Bertocq
0c27f1ffde Rename Legislation Process final_publication_date field to more descriptive result_publication_date 2017-06-13 22:04:36 +02:00
rgarcia
b1fa2d22f7 only count active users in stats 2017-06-13 12:59:04 +02:00
kikito
1701111bf5 Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2 2017-06-13 12:07:28 +02:00
Raimond Garcia
58da3b43e6 Merge pull request #1638 from entantoencuanto/issue#1595-results_url_permissions 
Issue#1595 results url permissions
 2017-06-12 13:09:27 +02:00
Raimond Garcia
05afaacf3d Merge pull request #1635 from entantoencuanto/issue#1354-suggest_on_investments_creation 
Issue#1354 suggest on investments creation
 2017-06-12 13:09:09 +02:00
Raimond Garcia
1033c9fc11 Merge pull request #1634 from consul/fix/date_time_current_usage 
Fix Flaky test related with Time/Date in Search concern
 2017-06-12 09:53:09 +02:00
Eduardo Martinez Echevarria
2380b97bd0 Make budgets result show action available only when budget is finished 2017-06-11 23:33:05 +02:00
Eduardo Martinez Echevarria
89d2793d76 Setup suggest action in investments controller 2017-06-11 14:10:29 +02:00