consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,352 Commits 1 Branch 0 Tags
5fe56a62f16b475eed24dcb83e7ee431766a57cc
Commit Graph

14352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
German Galia
4e88de0e1f Add feature test unique, multiple, prioritized and positive negative 2019-06-12 19:44:14 +02:00
lalo
c6e4b2480f Add public changes to create and vote Poll:Questions with votation type 2019-06-12 19:44:14 +02:00
lalo
23d36835d7 Add Admin changes to create Poll:Questions with votation type 2019-06-12 19:44:14 +02:00
lalo
7c9c50f4c6 Add Model changes to work with votation_types 2019-06-12 19:32:41 +02:00
Javier Martín
c505fd373c Merge pull request #3514 from LextrendIT/3481_add_historic_setings_to_budget 
Add historic fields to participatory budget
 2019-06-12 18:46:40 +02:00
German Galia
74083df10f Add historic fields to participatory budget 2019-06-12 18:03:53 +02:00
Javier Martín
cc6dc0dc0c Merge pull request #3480 from LextrendIT/3461_create_traker_rol 
Create tracker rol
 2019-06-12 16:49:53 +02:00
German Galia
9ce524e1f3 Create tracker rol 2019-06-12 16:23:40 +02:00
Javier Martín
800a701a40 Merge pull request #3614 from consul/increase_travis_workers 
Use one more node in the Travis matrix
 2019-06-12 16:22:39 +02:00
voodoorai2000
5564a0d74f Use one more node in the Travis matrix 2019-06-12 16:19:54 +02:00
Raimond Garcia
a61f88b4f0 Merge pull request #3456 from LextrendIT/3433_change_log_participatory_budget 
Add change log in investment participatory budget
 2019-06-12 14:05:38 +02:00
German Galia
16ffa2a259 Add change log in investment participatory budget 2019-06-12 13:06:20 +02:00
Raimond Garcia
259e05c3e0 Merge pull request #3410 from LextrendIT/report_generation 
Report generation, download CSV
 2019-06-12 11:45:59 +02:00
German Galia
9d1ca3bfd4 Report generation. Download csv 2019-06-12 10:17:31 +02:00
Pierre Mesure
2705416842 Adding missing subtasks to upgrade task and adding info log 2019-06-11 22:35:57 +02:00
Raimond Garcia
22787151f5 Merge pull request #3439 from LextrendIT/feature/add_admin_investments_column_chooser 
Add columns selector JS component and change Rails view to use it
 2019-06-11 17:17:52 +02:00
Raimond Garcia
e0e1e1dac1 Merge pull request #3437 from LextrendIT/feature/add_valuator_role_actions_manager 
Add abilities to valuator model for comment and edit dossiers
 2019-06-11 17:13:13 +02:00
Raimond Garcia
c1b14943e6 Merge pull request #3473 from LextrendIT/3463_collaborative_legislation_summary 
Collaborative legislation summary
 2019-06-11 16:41:45 +02:00
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