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

1687 Commits

Author SHA1 Message Date
Julian Nicolas Herrero
08a692341a Merge pull request #3150 from consul/backport-1769-crud_budget_and_usa 
[Backport] new CRUD budgets, content blocks and heading map
 2019-01-09 17:35:46 +01:00
João Lutz
47a33ea86c Enable options to show stats and results with any type of voter 2019-01-05 14:08:47 -02:00
rgarcia
e3eb87addb checks for deleted proposals 2019-01-04 15:25:13 +01:00
Julian Herrero
c5a7492128 add some improvements on budget headings 
Show information about longitude and latitude in a budget heading
Show information about custom content in a budget heading
Fix render of map (zoom scrollable and points clickable)
Fix typo in app/models/map_location.rb
 2019-01-02 10:46:46 +01:00
decabeza
6a580ede5b Improves layout of admin legislation homepage form 2018-12-28 18:23:12 +01:00
Alberto
63f7c18399 Merge pull request #3123 from consul/admin-questions 
[Backport] Admin poll questions index
 2018-12-26 11:32:28 +01:00
decabeza
9c827d6ce0 Adds poll name on admin poll questions index 2018-12-19 21:00:09 +01:00
decabeza
aebd29f7e2 Adds create question button to admin proposals show 2018-12-19 16:08:57 +01:00
Raimond Garcia
a8de5306c8 Merge pull request #3091 from dpgigorro/2791-homepage-for-legislation-process 
add homepage for legislation processes
 2018-12-19 11:14:24 +01:00
Julian Nicolas Herrero
2175339609 Merge pull request #3106 from consul/2918-crud_budget_groups_headings 
Change CRUD for budget groups and headings
 2018-12-18 10:23:24 +01:00
dperez
ff9a32c0a5 code reviewed 2018-12-15 18:04:24 +01:00
dperez
bef404c443 add homepage for legislation processes 2018-12-15 18:04:24 +01:00
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
Javi Martín
449f810255 Edit only existing languages in milestones summary 
Adding languages using this form would result in validation errors since
there's no way to fill in the title for the new translation.
 2018-12-12 15:15:01 +01:00
Javi Martín
70b4225542 Extract partial to display language tabs 2018-12-12 15:15:00 +01:00
Javier Martín
8bcf713d10 Merge pull request #3100 from consul/backport-2743-add_milestones_to_legislation_processes 
Add milestones to legislation processes
 2018-12-12 15:12:36 +01:00
Javi Martín
a42f5fab37 Add milestones summary to legislation processes 2018-12-11 20:19:48 +01:00
Javi Martín
03dc43a500 Manage legislation process milestones 2018-12-11 20:18:53 +01:00
Javi Martín
2fcbee6261 Manage proposal milestones 2018-12-11 20:09:47 +01:00
Javi Martín
8c45be7887 Show proposal info in admin 2018-12-11 20:09:30 +01:00
Javi Martín
d3f11c3b55 Add search form to proposals admin index 2018-12-11 20:09:30 +01:00
Javi Martín
4770217373 Add proposals index in admin 2018-12-11 20:09:30 +01:00
Javi Martín
64d6b7491a Make partial listing milestones reusable 
So it isn't specific to budget investments anymore.
 2018-12-11 19:22:55 +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
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
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
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
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
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
88a912061a Merge pull request #3025 from microweb10/issue-3024 
improve visualization for small resolution
 2018-12-02 20:00:42 +01:00
Javi Martín
9ad8c5728a Refactor legislation process subnav 2018-11-30 18:09:52 +01:00
Javi Martín
abf48af331 Rename draft_texts key to draft_versions 
This way we can refactor the legislation tabs, since now all translation
keys follow the same convention (using the same name as the active tab
name).
 2018-11-30 18:09:51 +01:00
Javi Martín
45a41a7528 Rename Admin::Proposals to Admin::HiddenProposals 
The same way we do it with users and budget investments.
 2018-11-30 18:04:55 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Raimond Garcia
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
Raimond Garcia
1b7a2adf56 Merge pull request #3034 from behraaang/bugfix/pagination-after-select 
Fix pagination after selecting/unselecting budget investment
 2018-11-27 11:04:41 +01:00
Raimond Garcia
2ef83619c3 Merge pull request #3048 from jaflutz/2930-draft-phase-processes 
Adds draft phase functionality in legislation processes
 2018-11-27 11:01:27 +01:00
Alberto
1bb50cbe47 Merge pull request #3056 from consul/administrator-id 
[Backport] Administrator ID
 2018-11-26 15:05:11 +01:00
Alberto
f535a90826 Merge pull request #3055 from consul/admin-poll-officers 
[Backport] Admin poll officers
 2018-11-26 15:03:55 +01:00
decabeza
6d7c5f1b78 Refactors admin administrators spec 
This refactoring avoids "Use let instead of an instance variable" rubocop warning
 2018-11-22 11:41:59 +01:00
decabeza
ae3a2ed3f3 Adds administrator id on admin administrators index page 2018-11-22 11:41:54 +01:00
decabeza
3670859fa3 Removes unused admin poll officers views, routes and controller 2018-11-22 11:40:11 +01:00
decabeza
8f27398bd1 Fixes globalize tabs when there is a lot of available locales 2018-11-22 11:37:26 +01:00
João Lutz
34b58a5208 Adds draft phase functionality in legislation processes 2018-11-19 22:18:50 -02:00