consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

2603 Commits

Author SHA1 Message Date
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
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
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 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
Julian Herrero
4764fcaa6d Release version 1.0.0 2019-06-10 15:47:13 +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
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
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
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
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
d0e1eff532 Add description field to administrator users like evaluators description 2019-06-05 16:18:12 +02:00
Julian Herrero
220bfb065a Add images and documents settings to admin panel 2019-06-04 11:47:22 +02:00
Javi Martín
dadbf873ba Order translations using ruby 
Joining the translations table caused duplicate records to appear.
Ordering with SQL is simply too hard because we need to consider
fallback locales.

Thanks Senén for providing most of the tests in the poll spec.
 2019-06-03 18:35:59 +02:00
Julian Herrero
b122302c58 Use find instead of find_by_id 
Better raise a 404 HTML NotFound exception than any other unexpected error.
 2019-06-03 17:54:19 +02:00
Julian Herrero
4bd20eebf4 Use correct param in controller 
There were some custom routes created using the param[:id] but the
Rails routes use the param[:budget_id] by default, so the same
controller could be asked for different param keys.
 2019-06-03 16:54:39 +02:00
rgarcia
998b4d9e39 Load budgets using slugs 2019-06-03 16:54:39 +02:00
Bertocq
0d761ddfb1 Hotfixing find the only budget for emails 2019-06-03 16:54:39 +02:00
German Galia
4f50e67ac3 Collaborative legislation summary 2019-06-03 12:34:25 +02:00
German Galia
85722eb7c4 Rename admin/debates and admin/comments to hidden 2019-06-02 19:12:26 +02:00
Alberto
2f8505332e Merge pull request #3574 from consul/remove-dashboard-polls 
Allow users to delete dashboard polls
 2019-06-01 11:06:34 +02:00
Alberto
8ee396f311 Merge pull request #3573 from consul/improve-ux 
Add help texs, links and new message section to improve UX
 2019-06-01 10:38:52 +02:00
Alberto
51e27fb6ed Merge pull request #3572 from consul/user-polls 
Hide polls created by users from proposals dashboard on admin poll index
 2019-06-01 10:38:07 +02:00
voodoorai2000
d0b8fef6b3 Delete spending proposals 2019-05-31 18:22:59 +02:00
voodoorai2000
24dde9c35e Delete valuation 2019-05-31 15:43:06 +02:00
Julian Nicolas Herrero
3ba7bd1cab Merge pull request #3567 from consul/select_proposals_by_admins 
Make proposals to be selected by administrators
 2019-05-31 15:30:39 +02:00
Javier Martín
888c161944 Merge pull request #2616 from consul/show_votes_associated_to_signatures 
Show count of votes associated to verified signatures
 2019-05-31 15:30:04 +02:00
decabeza
3855bf26ad Allow users to delete dashboard polls 2019-05-31 11:55:23 +02:00
decabeza
6b7c6a2f1f Refactor dashboard polls controller 2019-05-31 11:55:20 +02:00
decabeza
4c5b2723f4 Create new messages section for proposal's dashboard 2019-05-31 11:42:15 +02:00
decabeza
cec1d5e5f0 Hide polls created by users from proposals dashboard on admin poll index 2019-05-31 11:34:55 +02:00
Bertocq
d9fdc2e0f2 Show votes associated to verified signatures 2019-05-30 18:38:46 +02:00
Javier Martín
087a21b4ca Merge pull request #3565 from consul/fix_annotation_comments_order 
Fix order in annotation comments with same score
 2019-05-30 18:25:04 +02:00
Javi Martín
123196e4ed Display the same results for stats and recounts 
In the recounts we were incorrectly assuming the total amount included
the blank and invalid ballots.
 2019-05-30 17:22:39 +02:00
Julian Herrero
d4ec750428 Show archived proposals in selected proposals list 2019-05-30 11:19:38 +02:00
Julian Herrero
a852696eeb Remove not selected proposals from other lists 2019-05-30 11:19:38 +02:00
Julian Herrero
b68a872298 Change links for proposals lists 
Changed applied:

- Remove Archived proposals from tab and add a link under Proposals
  lists
- Remove Popular proposals link from custom section and add it to the
  Proposals lists
- Remove Retired proposals link from custom section and add it to the
  Proposals lists
- Remove Selected proposals link from custom section and add it to the
  Proposals lists
 2019-05-30 11:19:38 +02:00
Julian Herrero
ad5f7a06e1 Allow admins to select proposals and users to list them 2019-05-30 11:19:33 +02:00
Javi Martín
dbcc5fb724 Use AR relations when merging comments 
Using arrays made it difficult to order by more than one field (like the
`most_voted` scope does), and so we were ordering by `confidence_score`
and ignoring the `created_at` column.

Using an AR relation makes it easy to reuse the existing `most_voted`
scope.

This change has one side effect: now comments with equal votes are
ordered in descending order instead of having no specific order. That
means flaky specs which failed sometimes because they assumed comments
were ordered by date are now always green.

I've also re-added the `oldest` scope removed in 792b15b thinking it was
removed because using it with arrays was too hard.
 2019-05-29 20:50:53 +02:00
Javier Martín
14a5ea87a1 Merge pull request #3562 from consul/prepare_for_rails_5.1 
Add Rails 5.1 compatibility
 2019-05-29 19:11:19 +02:00
Javi Martín
e445e14d65 Use ActiveSupport::HashWithIndifferentAccess 
Using `HashWithIndifferentAccess` directly will be deprecated in Rails
5.1.
 2019-05-28 14:23:54 +02:00
voodoorai2000
29f5268e42 Display polls for current booth 
Polls that were not votable by a user were not being displayed in the officing interface. Creating a confusing situation for officers.

With this commit polls that are not votable by a user will be displayed, with the corresponding message explaining that that poll can only be voted by residents of a certain geozone.
 2019-05-24 15:20:54 +02:00
Javier Martín
387488aa68 Merge pull request #3520 from consul/backport-refactor_stats_enabled 
Add options to show advanced stats
 2019-05-23 13:07:19 +02:00
Javi Martín
4f4dc2c2af Add show results and stats form to budgets 2019-05-22 11:50:03 +02:00