consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,900 Commits 1 Branch 0 Tags
0239efef9d11f1be7d88557e98e96e67244c3917
Commit Graph

2684 Commits

Author SHA1 Message Date
lalo
63e0cd02d0 Display milestone_tags input for investments, display milestone_tags on admin and tests 2019-06-07 14:07:43 +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
Javi Martín
da59315530 Don't show links to budget results if disabled 2019-06-06 12:18: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
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
Julian Herrero
220bfb065a Add images and documents settings to admin panel 2019-06-04 11:47:22 +02:00
lalo
c538d08fee Display public investment view on admin and valuator pages as preview 2019-06-04 09:30:51 +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
rgarcia
998b4d9e39 Load budgets using slugs 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
cb9c3696f4 Use budget investments in useful specs 2019-05-31 18:23:03 +02:00
voodoorai2000
d0b8fef6b3 Delete spending proposals 2019-05-31 18:22:59 +02:00
voodoorai2000
a932737881 Delete ballots 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
a3799aa87c Update link to selected proposals on proposals spec 2019-05-31 12:25:01 +02:00
decabeza
7ed80d7883 Move link to selected proposals on proposals index 2019-05-31 12:24:10 +02:00
decabeza
3855bf26ad Allow users to delete dashboard polls 2019-05-31 11:55:23 +02:00
decabeza
bc1fc5d929 Add button to delete a poll 2019-05-31 11:55:05 +02:00
decabeza
4c5b2723f4 Create new messages section for proposal's dashboard 2019-05-31 11:42:15 +02:00
decabeza
6b85ed8747 Add show and collapse text on comments tree 2019-05-31 11:40:57 +02:00
decabeza
0154bc556d Add link to comment path on comment date 2019-05-31 11:40:53 +02:00
decabeza
5fd493cd2c Add link to process on legislation processes proposals 2019-05-31 11:40:48 +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
4be4d96710 Don't show order links in selected proposals list 2019-05-30 11:19:38 +02:00
Julian Herrero
6e905c517f Don't show recommented proposals in selected proposals list 2019-05-30 11:19:38 +02:00
Julian Herrero
dfe3764616 Don't show featured proposals in selected proposals list 2019-05-30 11:19:38 +02:00
Julian Herrero
5952c2664d Show a 'Selected proposal' message in the show view 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
6beb11f0a9 Show completed progress bar for successful proposals 
Show a completed progress bar with total supports intead of showing
a message telling the proposal has reached the needed supports.
 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
Alberto
24bab90cff Merge pull request #3539 from consul/hide-token 
Remove token on views
 2019-05-29 16:28:35 +02:00
decabeza
585f9ea5ab Remove token on views temporally 2019-05-29 15:49:28 +02:00
Javi Martín
241ee313f1 Use paths instead of URLs where possible 
It simplifies the code and solves any issue we might have configuring
the host in the test environment.
 2019-05-28 16:38:45 +02:00