Merged
Conversation
Contributor
Contributor
Author
|
@mrcasals are you sure? #4708 (comment) |
Contributor
|
@aitorlb whoops, sorry about that! Yes, I'm sure, as per my reply there 😄 |
Contributor
Author
|
@mrcasals can I use merge, instead? |
Contributor
|
@aitorlb yeah, use whatever technique you want, but you need to bring the PR up to date 😄 |
Contributor
Author
|
@mrcasals but this is a backport, I'm confused. |
Contributor
|
@aitorlb you need to update this with the correct base branch, in this case |
Contributor
Author
|
@mrcasals Thanks |
mrcasals
approved these changes
Jan 8, 2019
moustachu
added a commit
to OpenSourcePolitics/decidim
that referenced
this pull request
Feb 8, 2019
* fix display of comments count when comment has been moderated * [BACKPORT] Use latest docker image for test env (decidim#4731) * Use latest docker image for test env * Bump Ruby version to match the one in tests * Fix conferences dependencies * Fix bundle version * Fix bundles * Backport decidim#4708 to 0.16-stable (decidim#4721) * Backport decidim#4708 to 16-stable * Add CHANGELOG entry * Add ability to toggle user groups by organization (decidim#4681) (decidim#4735) * Added a switch to organizations to disable user groups feature * Set user_groups_enabled attribute value in admin and system admin Default value is true, and can be modified by admins. * User groups methods moved to a new concern from UserProfile * Disable user groups when on core user pages * Disable user_groups on amendments * Disable user groups on admin * Disable user groups on proposals * Add changelog entry * [BACKPORT] MetricResolver filtering correction (decidim#4736) * [BACKPORT] MetricResolver filtering correction * Added CHANGELOG entry * Fix loading translations on comments (decidim#4728) (decidim#4739) This way they won't fail when there's a problem * New Crowdin translations (decidim#4738) * New translations en.yml (German) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Hungarian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (German) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (German) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Basque) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Italian) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Polish) * New translations en.yml (Italian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Indonesian) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Italian) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Dutch) * New translations en.yml (Catalan) * New translations en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Basque) * New translations en.yml (Galician) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Catalan) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Basque) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Catalan) * New translations en.yml (Dutch) * New translations en.yml (Dutch) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (French) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (Dutch) * New translations en.yml (Galician) * New translations en.yml (Galician) * New translations en.yml (French) * New translations en.yml (Finnish) * New translations en.yml (Dutch) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Finnish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Turkish) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Swedish) * New translations en.yml (Finnish (plain)) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Turkish) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Ukrainian with many plural form) * New translations en.yml (Ukrainian with many plural form) * New translations en.yml (Ukrainian with many plural form) * New translations en.yml (Ukrainian with many plural form) * New translations en.yml (Ukrainian with many plural form) * New translations en.yml (Ukrainian with many plural form) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Finnish (plain)) * New translations en.yml (Russian with many plural form) * New translations en.yml (Russian with many plural form) * New translations en.yml (Russian with many plural form) * New translations en.yml (Russian with many plural form) * New translations en.yml (Russian with many plural form) * New translations en.yml (Russian with many plural form) * New translations en.yml (Swedish) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Swedish) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese, Brazilian) * New translations en.yml (Portuguese) * New translations en.yml (Spanish) * New translations en.yml (Polish) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Portuguese) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Swedish) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Swedish) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish) * New translations en.yml (Spanish, Paraguay) * New translations en.yml (Spanish, Paraguay) * Update bundles * 🐛 current_feature deprecated * Adds environment to open data export task to avoid errors (decidim#4743) * 🌐 FR --> Concertations #378 * 🌐 FR --> Concertations #378 * 🌐 FR --> Concertations #378 * Fix action authorizer with blank permissions 0.16 backport (decidim#4746) * Ignore blank permission options in action authorizer * Add CHANGELOG * 🐛 #417 : fix exports translatable_attr when first line is empty - add `empty_translatable` helper to provide blank values - fix `Decidim::Proposals::ProposalSerializer` - fix `Decidim::Comments::CommentSerializer` - fix `Decidim::Accountability::ResultSerializer` - TODO : need specific tests on headers * :robot: rubocop offense `C: Style/StringLiterals` * :bug: #360 fix survey choices export for free text option * ✨ #216 Survey answer date * ✨ #226 Survey answer date * 🤖 * 🐛 #421 fix Proposal mention links - only replace link when url contains "proposals" path - prevent switching between components with same item id * ✨ add mentions for Accountibility Results - add new `ContentProccessor` objects (`Parser` & `Renderer`) - add new `ResultPresenter` * ✨ add mentions for Budgets Projects - add new `ContentProccessor` objects (`Parser` & `Renderer`) - add new `ProjectPresenter` * ✅ fix tests for content parser * Backport decidim#4778 to 0.16-stable (decidim#4777) * Move code parent assemblies from index to partial * Refactor filtered assemblies query * Refactor filter assemblies helper and partial * Change tests * Add CHANGELOG entry * 🐛 fixes #344 for `NotifyProposalsMentionedJob` * 🐛 fixes #344 for `NotifyProposalsMentionedJob` * 🤖 rubocop #344 * ✅ fixes tests for #344 * 🤖 rubocop * Backport participatory text related evoutives and fixes. (decidim#4801) * Backport participatory text related evoutives and fixes. * Add changelog entry. * Update decidim_app-design Gemfile.lock. * Update decidim-generators Gemfile.lock. * Sort this PR's changelog entries for the next v0.16.1. * [TEST] Update participatory_text.odt document version with non ASCII symbols. * Backport decidim#4811 to 0.16-stable (decidim#4815) * Fix attachments not being inherited and add test * Add CHANGELOG entry * 🐛 fixes Pagination in assemblies #459 * 🐛 ✉️ add opt out notifications mail link - #RGPD * 🐛 unused keys * 🐛 💚 test_main * 🐛 💚 test_main * 🌐 💚 after patch
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
🎩 What? Why?
Backport #4708 to
0.16-stable📋 Subtasks
CHANGELOGentry