consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,587 Commits 1 Branch 0 Tags
51e27fb6ed0ff9ac6a5bbf7fa87b2ed92ad56ddd
Commit Graph

13587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Raimond Garcia
0d967b2765 Merge pull request #3571 from consul/i18n_available_locales 
Add Bosnian, Croatian, Czech, Danish, Greek, and Turkish locales
 2019-05-31 19:12:33 +02:00
Raimond Garcia
a3f538a2af Merge pull request #3569 from consul/delete_spending_proposals 
Delete spending proposals
 2019-05-31 19:11:28 +02:00
voodoorai2000
7218d80297 Update migrations for Rails 5 conventions 2019-05-31 18:23:03 +02:00
decabeza
084fb3059a Remove spending proposals styles 2019-05-31 18:23:03 +02:00
voodoorai2000
4f9f9a065a Update schema.rb 2019-05-31 18:23:03 +02:00
voodoorai2000
cb9c3696f4 Use budget investments in useful specs 2019-05-31 18:23:03 +02:00
voodoorai2000
2f5d153581 Delete migration to budget investments 2019-05-31 18:23:03 +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
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
voodoorai2000
6970e4c8fb Update locale names for Italian, Polish and Albanian 2019-05-31 14:49:38 +02:00
voodoorai2000
78f3cec133 Add Bosnian, Czech, Danish, Greek, Croatian and Turkish locales 2019-05-31 14:49:38 +02:00
Raimond Garcia
2004349cf3 Merge pull request #3378 from consul/i18n_crowdin 
Update translations from Crowdin
 2019-05-31 13:57:28 +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
cec1d5e5f0 Hide polls created by users from proposals dashboard on admin poll index 2019-05-31 11:34:55 +02:00
voodoorai2000
b9651bc9b3 Update translations from Crowdin 2019-05-30 20:26:13 +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
Javier Martín
137daba9bd Merge pull request #3570 from consul/valid_votes 
Fix valid votes labels
 2019-05-30 18:02:15 +02:00
Javi Martín
31515ddd45 Include blank and null ballots in booth totals 
Just the same way it's done for all polls.
 2019-05-30 17:22:41 +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
Javi Martín
6881ee134a Fix valid ballots label 
It was incorrectly labeled as "total ballots", which actually meant
"total valid ballots", but users were unsure as to whether include
blank and invalid ballots in that amount.
 2019-05-30 17:22:16 +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
db774e3fd2 Extract proposal supports progress bar to a partial 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
28835a29ef Share helper between class Proposal and Legislation::Proposal 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
Javier Martín
b1f34c31ab Merge pull request #3533 from consul/regenerate_schema 
Fix column order in schema file
 2019-05-29 22:03:37 +02:00
Javier Martín
80096d9654 Merge pull request #3563 from consul/add_lines_count_rake 
Add task to regenerate ballot_lines_count cache
 2019-05-29 21:17:40 +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
Javi Martín
7b5ce80593 Simplify MergedCommentTree#initialize 
By setting the comments lazily in a different method, we can share its
code with the parent class.
 2019-05-29 20:50:53 +02:00
Javi Martín
24236e654c Fix column order in schema file 
When introducing Rails 5 and the dashboard, we generated the schema file
without dropping the database first. When doing so locally, migrations
aren't always executed in order, changing the order of the columns.
 2019-05-29 20:49:29 +02:00
Javi Martín
dd851cb6cc Add task to regenerate ballot_lines_count cache 
We've added this column recently to `budget_ballots`, and we use it to
calculate stats.
 2019-05-29 20:39:19 +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
Julian Herrero
9948804e21 Add selected attribute to proposals 2019-05-29 16:51:27 +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
Alberto
392abcddf8 Merge pull request #3561 from consul/reset-password-message 
Change devise configuration
 2019-05-29 15:23:17 +02:00
Javi Martín
8f69399799 Add version to migration files 
These migrations were backported after upgrading to Rails 5.
 2019-05-28 16:40:52 +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