consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,557 Commits 1 Branch 0 Tags
5fd493cd2cc319aca12e41195528cfc427e4e277
Commit Graph

2592 Commits

Author SHA1 Message Date
decabeza
5fd493cd2c Add link to process on legislation processes proposals 2019-05-31 11:40:48 +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
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
Javi Martín
db6ed4772c Update travel_to usage 
In Rails 5.1, calling `travel_to` inside another `travel_to` block will
result in a RuntimeError:

> Calling `travel_to` with a block, when we have previously already made
> a call to `travel_to`, can lead to confusing time stubbing.
 2019-05-28 16:36:56 +02:00
Javi Martín
307cf24846 Use describe on feature tests 
The `type: :feature` is automatically detected by RSpec because these
tests are inside the `spec/features` folder. Using `feature` re-adds a
`type: :feature` to these files, which will result in a conflict when we
upgrade to Rails 5.1's system tests.

Because of this change, we also need to change `background` to `before`
or else these tests will fail.
 2019-05-28 16:36:54 +02:00
decabeza
c2acd53a06 Change devise configuration 
This change don't let the user know if the email address exists when asking to resend confirmation or password reset instructions.
 2019-05-28 14:23:37 +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
Javi Martín
605da522cb Resize Capybara window back to its original size 
The `maximize` method didn't work as we expected and didn't resize the
window, causing issues in tests expecting the window to be larger.
 2019-05-24 13:30:49 +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
Javier Martín
afdc7087d7 Merge pull request #3519 from consul/backport-remove_custom_poll_group_file 
Simplify link to poll
 2019-05-23 13:06:50 +02:00
decabeza
4b3172912e Add spec to show sticky button on mobile screens 
Also remove some unnecessary css lines that were causing some unrelated specs to fail.
 2019-05-22 12:41:52 +02:00
Javi Martín
45a3d8daf0 Add option to enable advanced stats 2019-05-22 11:50:03 +02:00
Javi Martín
4f4dc2c2af Add show results and stats form to budgets 2019-05-22 11:50:03 +02:00
Javi Martín
e3d6dbacab Simplify finished budget factory creation 2019-05-22 11:50:03 +02:00
Javi Martín
c00203f7f5 Move budget stats permission tests to the model 
They're easier to test and to read in the model.
 2019-05-22 11:50:03 +02:00
Alberto
ac1d8195f2 Merge pull request #3488 from consul/basic-yml 
Admin basic customization texts
 2019-05-21 21:43:07 +02:00
Javi Martín
5ca528d2ce Extract method to link to a poll 2019-05-21 17:30:46 +02:00
Javier Martín
82e3c41aa9 Merge pull request #3512 from consul/backport-stats 
Change stats layout
 2019-05-21 17:18:47 +02:00
Javier Martín
d57025696f Merge pull request #3503 from consul/backport-blank_votes 
Improve poll stats
 2019-05-21 14:23:13 +02:00
decabeza
a2cb7501f7 Create new basic tab for admin information texts 2019-05-21 14:06:58 +02:00
Javi Martín
66ecb2835b Show only available budget stats phases 
This way we can show statistics for the supports phase before the vote
phase is over.
 2019-05-21 13:50:18 +02:00
Javier Martín
cbfa2c1df8 Merge pull request #3504 from consul/backport-poll_slugs 
Add slug to polls
 2019-05-21 13:42:47 +02:00
Bertocq
ba9346162c Improve officing result specs 2019-05-21 13:26:44 +02:00
Javi Martín
e461c8d0ac Generate navigation links for polls without a slug 2019-05-21 13:04:26 +02:00
Alberto
1c10c22b08 Merge pull request #3509 from consul/menu-users 
Users menu
 2019-05-21 12:54:42 +02:00
decabeza
43dd3d2169 Include mailer header logo on custom images list 2019-05-21 11:22:04 +02:00
decabeza
cbbe188d6a Move officing link inside header dropdown menu 
Also include the condition to hide this link on officing namespace.
 2019-05-17 17:48:43 +02:00
decabeza
6cfb2e896d Change admin menu to menu 2019-05-17 17:47:46 +02:00
decabeza
f06cdc5fbb Change my activity menu to my content 2019-05-17 17:47:40 +02:00
decabeza
035b11c460 Hide select text if budget finished 2019-05-17 17:42:58 +02:00
decabeza
625c34bac2 Add officer email on admin poll shifts table 2019-05-17 17:41:42 +02:00
decabeza
0c704c2f06 Replace i18n destroy to delete 2019-05-17 17:41:38 +02:00
Alberto
d845c6e973 Merge pull request #3476 from consul/delete-poll 
Allow delete polls with associated questions and answers
 2019-05-17 17:38:20 +02:00
Alberto
7c79965547 Merge pull request #3397 from consul/proposals-form 
Remove question and external_url fields from proposals and legislation proposals
 2019-05-17 17:08:56 +02:00
María Checa
0c6e7e7580 Adds Sluggable concern to Poll model 2019-05-17 05:41:09 +02:00
María Checa
e3b16230e6 Added slug to polls for named urls 2019-05-16 23:40:50 +02:00
María Checa
c2457e36a5 Add budget stats permissions for normal users and admins 2019-05-16 22:01:42 +02:00
Javier Martín
668b6cfd73 Merge pull request #3499 from consul/backport-admin_stats 
Add admin budget stats
 2019-05-16 20:41:39 +02:00
Juanjo Bazán
f22a97468b makes code heading_id agnostic 2019-05-16 14:45:46 +02:00
Juanjo Bazán
110ee961e3 adds budget stats for final voting to admin stats 2019-05-16 14:45:46 +02:00
Juanjo Bazán
5be54b57da reduces current admin budget stats as supporting phase 2019-05-16 14:45:45 +02:00
rgarcia
11437a1d40 add budget investment stats 2019-05-16 13:41:49 +02:00
rgarcia
be757f79d0 cleans up 2019-05-16 13:37:47 +02:00
rgarcia
b628631769 fixes specs 2019-05-16 13:37:47 +02:00
rgarcia
1f8d19c8ba adds basic graph specs 2019-05-16 13:37:47 +02:00