Commit Graph

5383 Commits

Author SHA1 Message Date
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
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
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
decabeza
6f1e7abedd Improves styles for milestones documents 2018-12-04 17:31:04 +01:00
decabeza
61c7b9a02b Changes width of additional documents container 2018-12-04 17:30:54 +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
Javi Martín
56df8050df Use @cards.each instead of @cards.find_each
Using `find_each` ignores the scope order we set in `Widget::Card.body`,
and since we don't expect to have thousands of cards, using batches
isn't necessary.

This way we remove the "WARN Scoped order and limit are ignored, it's
forced to be batch order and batch size" message we were getting in the
specs.
2018-11-29 20:10:23 +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
Alberto
1a89e52931 Merge pull request #3054 from consul/globalize-tabs
[Backport] Globalize tabs
2018-11-26 14:58:38 +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
decabeza
2c06008370 Improves social share message to budget investments 2018-11-22 11:35:09 +01:00
João Lutz
34b58a5208 Adds draft phase functionality in legislation processes 2018-11-19 22:18:50 -02:00
Matheus Miranda
06f07b1139 Add map to sidebar on Heading's page
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
2018-11-16 09:05:23 +01:00
decabeza
46671fe447 Removes unnecessary pages 2018-11-15 11:52:57 +01:00
decabeza
b364e0ec38 Improves pages markup 2018-11-15 11:05:50 +01:00
decabeza
315ed77618 Removes unnecessary condition 2018-11-14 13:56:14 +01:00
decabeza
3a718d88c0 Shows help link only if feature is enabled 2018-11-14 12:45:52 +01:00
decabeza
dfa7148406 Shows unselected message only on balloting or later phase 2018-11-12 17:23:58 +01:00
Alberto
06969e0ec7 Merge pull request #3027 from microweb10/issue-3026
Improve action buttons aspect for small screens
2018-11-12 15:38:13 +01:00
behraaang
3278b35729 partial added, render an investment 2018-11-10 23:08:11 +03:30
Julian Herrero
085a01a493 improve action buttons aspect for small screens 2018-11-08 16:45:50 +01:00
Julian Herrero
3975e5145a improve action buttons aspect for small screens 2018-11-08 16:45:36 +01:00
Julian Herrero
bb81a4dad4 improve action buttons aspect for small screens 2018-11-08 16:45:07 +01:00
Julian Herrero
62a4fe985e improve action buttons aspect for small screens 2018-11-08 16:44:09 +01:00
Julian Herrero
9af8741191 improve visualization for small resolution 2018-11-08 12:11:38 +01:00
decabeza
7dd530dad7 Adds missing for to budget exections status label tag 2018-11-07 18:25:18 +01:00
decabeza
ba1a6b4cc8 Display first image available for milestones 2018-11-07 18:09:23 +01:00
decabeza
d698a724ac Moves milestone image to a partial 2018-11-07 18:09:20 +01:00
decabeza
7d55f64aac Adds link to milestones on budgets index page 2018-11-07 18:08:03 +01:00
Alberto
0209957fb4 Merge pull request #3020 from consul/legislation-key-dates
[Backport] Fixes legislation processes key dates active class
2018-11-07 17:42:24 +01:00
Javier Martín
bad750a896 Merge pull request #2864 from consul/backport_1543-budget_execution_list
Budget execution list
2018-11-07 15:44:57 +01:00
decabeza
04ea068f90 Fixes legislation processes key dates active class 2018-11-07 13:14:41 +01:00
decabeza
c049be6dae Improves message when there are no budgets 2018-11-06 18:11:13 +01:00