consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,085 Commits 1 Branch 0 Tags
6439be44f120e82b4d9240a86217e68463dc9304
Commit Graph

11085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Herrero
6439be44f1 change CRUD for budget groups and headings 
To make it more consistent with the rest of the Admin panel,
the CRUD for budget groups and headings has been changed
from the old "all-in-one" form to a separate form for each resource.
 2018-12-14 16:34:54 +01:00
Julian Herrero
8fb8f70efd cleanup (due to new CRUD for budget groups and headings) 2018-12-14 15:37:25 +01:00
Julian Herrero
25e1afea48 fix map rendering for budget headings 2018-12-14 15:37:22 +01:00
Julian Herrero
01033e5371 change coordinates to make the map to be centered in Madrid 2018-12-12 11:00:16 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043 
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
 2018-12-11 18:21:14 +01:00
Julian Nicolas Herrero
9e759e0a39 Merge pull request #3043 from milber/content_blocks_for_headings 
Added feature to add content block to headings in sidebar
 2018-12-11 16:44:02 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page 
Add map to sidebar on Heading's page
 2018-12-11 16:32:35 +01:00
Alberto
05abcbe944 Merge pull request #3081 from consul/featured-proposals 
[Backport] Featured proposals
 2018-12-10 22:17:51 +01:00
Alberto
22790535c7 Merge pull request #3080 from consul/ui-design 
[Backport] UI design
 2018-12-10 22:16:32 +01:00
Javier Martín
bd363466a8 Merge pull request #3089 from consul/backport-polls-show 
Polls voted by
 2018-12-10 20:19:26 +01:00
Javier Martín
64e8dbf67b Merge pull request #3094 from consul/fix_trailing_whitespace 
Remove trailing whitespace
 2018-12-10 20:15:24 +01:00
Javier Martín
414a8031a0 Merge pull request #3088 from consul/pull_request_template 
Simplify pull request template
 2018-12-10 20:08:10 +01:00
Javier Martín
feb4af21c7 Merge pull request #3083 from consul/backport-milestone_polymorphic_path 
Make milestones controller polymorphic
 2018-12-10 18:37:15 +01:00
Javier Martín
364321bf33 Merge pull request #3090 from consul/backport-time_related_specs 
[Backport] Add frozen time condition to proposals phase spec
 2018-12-10 13:47:38 +01:00
Javi Martín
aa45c39d3e Remove trailing whitespace 2018-12-10 12:59:03 +01:00
Javier Martín
ef16efe5e4 Merge pull request #2899 from papayalabs/2980-hide-featured-section-with-no-cards 
Hide Featured section on Home Page if there are no cards
 2018-12-10 12:55:32 +01:00
Raimond Garcia
3781a9920e Merge pull request #3093 from salbertson/patch-1 
Add a "Reviewed by Hound" badge
 2018-12-10 10:32:53 +01:00
Raimond Garcia
74f7be540f Merge pull request #3037 from PierreMesure/add-web-sections-to-seeds 
Add web sections to seeds
 2018-12-10 10:30:24 +01:00
Scott Albertson
be9e046d68 Add a "Reviewed by Hound" badge 2018-12-09 18:36:15 -08:00
Javi Martín
a769c61c02 Add frozen time condition to proposals phase spec 
Backport the part of AyuntamientoMadrid@ea6fcb5 which hadn't been
backported yet.
 2018-12-07 15:09:07 +01:00
Pierre Mesure
3fcd701723 Add websections at the end of the seeds 2018-12-07 14:48:21 +01:00
Javi Martín
6a5e5729dd Simplify pull request template 2018-12-07 13:57:32 +01:00
Javier Martín
d90f068c73 Merge pull request #3085 from consul/backport-1196-fix_flaky_legislation_random_order_spec 
Fix flaky spec: Legislation Proposals Each user has a different and consistent random proposals order
 2018-12-05 19:16:43 +01:00
Julian Nicolas Herrero
6ee8b328ef Merge pull request #3067 from microweb10/issue-3051 
Fix failing spec: Budget::Investment Reclassification store_reclassified_votes stores the votes for a reclassified investment
 2018-12-05 17:21:38 +01:00
rgarcia
b601f6c33f adds method voted_by?(user) to polls 2018-12-05 14:31:58 +01:00
Alberto Garcia Cabeza
54fbae6339 adds links to login or verification on question answers 2018-12-05 14:31:58 +01:00
Javier Martín
3631ff7340 Merge pull request #3074 from consul/backport-refactor_legislation_process_subnav 
Refactor legislation process subnav
 2018-12-05 13:32:22 +01:00
Javier Martín
fc5a5e58de Merge pull request #3073 from consul/backport-rename_hidden_proposals 
[Backport] Rename Admin::Proposals to Admin::HiddenProposals
 2018-12-05 13:30:23 +01:00
Julian Herrero
0fc1e0503e store reclassified votes in order 
Make sure we create Budget::ReclassifiedVotes for an investment in the
same order that the previous Budget::Ballot:Lines were previously created.
 2018-12-05 13:13:49 +01:00
Javi Martín
09add3554f Create less records in random pagination tests 
We make the tests considerably faster, we make them more robust against
changes in the number of records shown per page, and we generate enough
records so the chance of randomly getting the same results twice in a
row is extremely low.
 2018-12-05 13:11:23 +01:00
Javi Martín
64167a86b4 Be more consistent using double quotes 2018-12-05 13:11:23 +01:00
Javi Martín
637c188bee Make test easier to follow 
Checking the contents of the second page while on the second page makes
more sense than checking them after going back to the first page.
 2018-12-05 13:11:22 +01:00
Javi Martín
f391023b7d Group related specs together 2018-12-05 13:08:24 +01:00
Javi Martín
1b46ba9ee6 Make legislation proposals random seed more robust 
Using a number with only two decimals means the seed is going to be the
same 1% of the time. Using ruby's default value for random numbers makes
it almost impossible to generate the same seed twice.

Using `rand` also simplifies the code, and it's what we use in the
budget investments controller.
 2018-12-05 13:03:10 +01:00
Javi Martín
07c22d289c Change the random seed before storing it 
Even though it probably doesn't change the behaviour, it's a bit strange
to set a seed, then storing it in the session, and then modifying it
again.
 2018-12-05 13:03:10 +01:00
Javi Martín
6f62d76c71 Simplify random seed conversion to float 
The method `to_f` already returns `0.0` instead of raising an exception
when handling non-numeric values.
 2018-12-05 13:03:10 +01:00
Javi Martín
ba7ca11cd8 Fix buggy parallel assignment 
In ruby, when we assign two variables to one value, the second variable
is set to `nil`.
 2018-12-05 13:02:39 +01:00
Javi Martín
35c18688e5 Remove obsolete method 
It was used in the `Translatable` concern, but it isn't used there
anymore.
 2018-12-05 12:28:36 +01:00
Javi Martín
ae22cd247a Use milestoneable to find/create a milestone 
This way we simplify the code and avoid strange cases like `params[:id]`
having an ID which doesn't belong to the current milestoneable.
 2018-12-05 12:28:36 +01:00
Javi Martín
c4448faf70 Move milestones code to admin/milestones 
All milestone controllers will inherit from `AdminMilestonesController`,
and all views will render the same content.
 2018-12-05 12:28:34 +01:00
Javi Martín
2e778b4073 Use milestoneable instead of investment 2018-12-05 12:23:57 +01:00
Javi Martín
2c2831beb0 Use polymorphic paths for milestones 2018-12-05 12:23:52 +01:00
Javier Martín
4f9ca04a84 Merge pull request #3057 from consul/backport-make-milestones-polymorphic 
[Backport] Make milestones polymorphic
 2018-12-05 12:12:04 +01:00
Julian Nicolas Herrero
99abc712fe Merge pull request #3065 from microweb10/poll_question_create_from_proposal_show 
Add missing feature spec: Admin poll questions Create from successful proposal show
 2018-12-05 10:11:08 +01:00
Julian Nicolas Herrero
14d4d175d4 Merge pull request #3064 from microweb10/budget_investments_valuator_group_spec 
Add missing feature spec Admin budget investments Edit Do not display valuators of an assigned group
 2018-12-05 10:10:09 +01:00
Alberto
7390ebc623 Merge pull request #3079 from consul/pages-texts 
[Backport] Removes references to deleted general terms page
 2018-12-04 18:46:43 +01:00
decabeza
37da986014 Adds settings for featured proposals 2018-12-04 18:04:36 +01:00
decabeza
609d2083f8 Changes proposals controller to always load featured proposals 2018-12-04 17:46:46 +01:00
decabeza
6f1e7abedd Improves styles for milestones documents 2018-12-04 17:31:04 +01:00