consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,833 Commits 1 Branch 0 Tags
338fecc7c788f921d9d7166625d6bb7512c54d4c
Commit Graph

13833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lalo
c2860dda0e Add can_comment and can_edit_dossier abilities to valuators 2019-06-11 16:24:02 +02:00
Raimond Garcia
d266cb33ce Merge pull request #3427 from LextrendIT/feature/unify_valuator_and_admin_investment_pages 
Display preview public page component on admin and valuators investment page
 2019-06-11 14:44:45 +02:00
Julian Nicolas Herrero
c7ea0528e0 Merge pull request #3603 from consul/admin_stats_before_voting_phase 
Avoid error when accessing final voting stats before the balloting phase
 2019-06-11 14:34:42 +02:00
lalo
4740aeaddf Add columns selector JS component and change Rails view to use it 2019-06-11 14:33:40 +02:00
lalo
ef345ca87c Collaborative legislation summary 2019-06-11 14:31:44 +02:00
Raimond Garcia
139b2720d8 Merge pull request #3419 from LextrendIT/feature/add_tags_to_milestones 
Add tags to milestones
 2019-06-11 12:37:30 +02:00
Julian Nicolas Herrero
dc03207fb3 Merge pull request #3600 from consul/release_1.0.0 
Release version 1.0.0
 2019-06-10 17:33:43 +02:00
Julian Herrero
fd71ed825b Avoid error when accessing final votes stats before balloting phase 
When accessing the URL `/admin/stats/budget_balloting?budget_id=X'
for a budget in a phase prior to the balloting phase, the following
error was raised due to the stats where not calculated yet.
Instead, we'll now show a flash message.

NoMethodError:
  undefined method `[]' for nil:NilClass
  ./app/controllers/admin/stats_controller.rb:82
 2019-06-10 17:28:16 +02:00
Javier Martín
28b3777315 Merge pull request #3601 from consul/fix_globalize_fallbacks 
Reset globalize fallbacks before every test
 2019-06-10 15:59:02 +02:00
Julian Herrero
4764fcaa6d Release version 1.0.0 2019-06-10 15:47:13 +02:00
Senén Rodero Rodríguez
1c76493fa1 Prevent flaky specs because of globalize fallbacks initialization 
When any helper, lib, mailer, model or view spec is executed
after a feature, controller or request spec Globalize.fallbacks
returns nil and this can cause some flaky specs. With this
patch we are ensuring to initialize Globalize fallbacks
between specs.

Controller, feature and request specs do not need this patch
because of application_controller is currently initializing
Globalize.fallback on each request.
 2019-06-07 19:55:01 +02:00
Javier Martín
5eafad81bd Merge pull request #3598 from consul/update_migrations_and_schema 
Update migrations and schema file
 2019-06-07 19:45:00 +02:00
Javi Martín
ff82e3f4e8 Remove question from legislation people proposal 
It was added by accident; this field had already been removed from
legislation proposal.
 2019-06-07 18:55:29 +02:00
Javi Martín
2a6c285257 Update migrations and schema file 
It looks like they got out of sync when rebasing.
 2019-06-07 17:36:22 +02:00
lalo
be8a0dbe8a Add Milestone tag select filter on executions public page 2019-06-07 14:17:32 +02:00
lalo
63e0cd02d0 Display milestone_tags input for investments, display milestone_tags on admin and tests 2019-06-07 14:07:43 +02:00
lalo
3282606be2 Add act_as_taggable_on milestoneable concern 2019-06-07 14:07:43 +02:00
Raimond Garcia
c93ec95917 Merge pull request #3591 from consul/proposals-people 
Create Legislation::PeopleProposal model
 2019-06-07 13:46:54 +02:00
voodoorai2000
d9cc726085 Add setting for max votes to edit a people proposal 2019-06-07 12:29:30 +02:00
voodoorai2000
5699da671c Remove obsolete question attribute 2019-06-07 12:28:55 +02:00
voodoorai2000
18cef27b8d Add missing geozone relation 2019-06-07 12:28:40 +02:00
voodoorai2000
f190edacbd Use Rails 5 ApplicationRecord instead of ActiveRecord::Base 2019-06-07 12:28:23 +02:00
voodoorai2000
744824e26f Remove deprecated reference to documentable method 
We have done a little refactoring of documents. Now document settings are part of the admin interface[1].

[1] https://github.com/consul/consul/pull/3585/
 2019-06-07 12:22:09 +02:00
lalo
46e5d6a9fa Create Legislation::PeopleProposal model 2019-06-06 17:22:49 +02:00
Javier Martín
3284a0848a Merge pull request #3595 from consul/fix_schema_indentation 
Fix indentation in schema file
 2019-06-06 17:00:33 +02:00
Javi Martín
69c6cd6737 Fix indentation in schema file 2019-06-06 16:20:27 +02:00
Javier Martín
6ba5c35bab Merge pull request #3596 from consul/fix_admin_comments_test 
Check the comment is present after commenting
 2019-06-06 16:17:02 +02:00
Javi Martín
0cca8c2cc1 Check the comment is present after commenting 
We've got a bug which causes the admin description not to appear
immediately after commenting, due to the `admin_layout` variable being
false when we add a comment using an AJAX request.

So the test reloaded the page to check the admin description was there.
However, sometimes reloading the page is faster than the AJAX request,
and so the comment is not there yet.

By checking the results of the AJAX request before reloading the page,
the test passes.

A proper solution would be to display the admin description or name
right after the comment is added.
 2019-06-06 14:18:32 +02:00
Javier Martín
b14661e378 Merge pull request #3581 from consul/duplicate_translations 
Avoid duplicate records using translations
 2019-06-06 13:08:05 +02:00
Javier Martín
42f8ce99a0 Merge pull request #3590 from consul/add_upgrade_task 
Add task to upgrade to a new release
 2019-06-06 13:07:41 +02:00
Javier Martín
10be2ad86c Merge pull request #3592 from consul/fix_results_links 
Don't show links to disabled budget results
 2019-06-06 13:06:26 +02:00
Javi Martín
da59315530 Don't show links to budget results if disabled 2019-06-06 12:18:05 +02:00
Javi Martín
eb7dc3ef2d Extract partial to render budget navigation links 2019-06-06 12:17:52 +02:00
Javi Martín
c8b6a1a4a1 Use the same view code for finished budgets 
The differences between the custom code and the code in CONSUL didn't
make much sense anymore: the path can be passed a budget instead of an
ID (so it uses a slug) and there's no reason to hide the link to the
executions for the 2018 budget anymore. Furthermore, removing the
`status: 1` parameter makes the link consistent with the rest of the
application, since it was the only link to budget executions using that
parameter.
 2019-06-06 12:17:51 +02:00
Javi Martín
99fd838ca1 Extract partial to render finished budgets 2019-06-06 12:17:49 +02:00
Raimond Garcia
a874d25bfa Merge pull request #3413 from LextrendIT/feature/notify_evaluation_comments 
notify by email new evaluation comments
 2019-06-06 11:29:38 +02:00
Javi Martín
d2c075cc93 Add new settings on servers with the db role 
This task adds records to the database, so the role `db` is more
appropriate.
 2019-06-05 20:23:56 +02:00
Javi Martín
1d0b05832c Add info messages for release 1.0.0 tasks 
So users know what's going on when they upgrade CONSUL.
 2019-06-05 20:23:56 +02:00
Javi Martín
3ab2085e05 Move calculate_ballot_lines task to the right file 
We already have a file with the proper budgets namespace.
 2019-06-05 20:23:56 +02:00
Javi Martín
685c96c40d Add capistrano task to deploy and upgrade CONSUL 2019-06-05 20:23:56 +02:00
Javi Martín
c78211af49 Add task to upgrade to version 1.0.0 
It includes every task needed for the upgrade.
 2019-06-05 20:23:54 +02:00
Javier Martín
72c6b05c64 Merge pull request #3376 from LextrendIT/3350_rename_debates_comments_admin 
Refactor admin/debates and admin/comments to hidden
 2019-06-05 19:15:21 +02:00
Julian Nicolas Herrero
7802305b18 Merge pull request #3585 from consul/images_and_documents_settings 
Images and documents settings
 2019-06-05 19:11:22 +02:00
Javier Martín
81b67349f2 Merge pull request #3580 from consul/use_find_instead_of_find_by_id 
Use find instead of find by
 2019-06-05 19:04:47 +02:00
Javier Martín
cbad8ad416 Merge pull request #3389 from LextrendIT/feature/add_description_field_to_administrator_users_like_evaluators 
Add description field to administrator users like evaluators description
 2019-06-05 18:36:16 +02:00
Julian Nicolas Herrero
5e9cb24e22 Merge pull request #3587 from consul/unregistered_poll_officers 
Show name and email for deleted poll officer's user account
 2019-06-05 17:58:53 +02:00
lalo
8061bfa5e8 Send email to users related with an investment when valuation comment is created 2019-06-05 17:02:59 +02:00
lalo
28815cb290 Create new email template for new evaluation comment created and add it to system_emails view 2019-06-05 16:22:12 +02:00
lalo
d721920b97 Display commenter as admin description or name 2019-06-05 16:19:31 +02:00
lalo
d0e1eff532 Add description field to administrator users like evaluators description 2019-06-05 16:18:12 +02:00