forked from consuldemocracy/consuldemocracy
-
Notifications
You must be signed in to change notification settings - Fork 15
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Upstream] New CRUD for budget groups and headings #1768
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Dec 19, 2018
microweb10
changed the title
[Upstream] New CRUD de budget groups and headings
[Upstream] New CRUD for budget groups and headings
Dec 19, 2018
microweb10
force-pushed
the
crud_budget_and_usa
branch
from
December 19, 2018 13:41
e49c886
to
161a78a
Compare
houndci-bot
reviewed
Dec 19, 2018
app/controllers/admin/site_customization/content_blocks_controller.rb
Outdated
Show resolved
Hide resolved
app/controllers/admin/site_customization/content_blocks_controller.rb
Outdated
Show resolved
Hide resolved
app/controllers/admin/site_customization/content_blocks_controller.rb
Outdated
Show resolved
Hide resolved
microweb10
force-pushed
the
crud_budget_and_usa
branch
2 times, most recently
from
December 19, 2018 17:50
2b2bb46
to
7a8a033
Compare
javierm
approved these changes
Dec 19, 2018
voodoorai2000
approved these changes
Dec 20, 2018
decabeza
approved these changes
Dec 27, 2018
microweb10
force-pushed
the
crud_budget_and_usa
branch
from
December 28, 2018 08:56
8fb267e
to
1056bd9
Compare
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
In this PR consuldemocracy#3043 there were some change requests. In order to keep moving we decided to merge the PR and do the changes ourselves.
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.
microweb10
force-pushed
the
crud_budget_and_usa
branch
from
December 28, 2018 09:19
1056bd9
to
3908250
Compare
houndci-bot
reviewed
Dec 28, 2018
microweb10
force-pushed
the
crud_budget_and_usa
branch
from
December 28, 2018 11:01
3908250
to
6acbe41
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
References
PR consuldemocracy#3038
PR consuldemocracy#3043
PR consuldemocracy#3106
Does this PR need a Backport to CONSUL?
Backport only these commits:
bad9047
8f3fbea
6acbe41