Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix/0.16 merge 2019 02 #484

Merged
merged 45 commits into from
Feb 8, 2019
Merged

Fix/0.16 merge 2019 02 #484

merged 45 commits into from
Feb 8, 2019

Conversation

moustachu
Copy link
Member

armandfardeau and others added 30 commits November 28, 2018 21:23
@armandfardeau
fix display of comments count when comment has been moderated
6720a71
@armandfardeau
Merge branch '0.12-stable' into Fix/comments-count-on-card
1502105
@mrcasals
[BACKPORT] Use latest docker image for test env (decidim#4731)
5c0099d 
* Use latest docker image for test env

* Bump Ruby version to match the one in tests

* Fix conferences dependencies

* Fix bundle version

* Fix bundles
@mrcasals
Backport decidim#4708 to 0.16-stable (decidim#4721)
cfb7cad 
* Backport decidim#4708 to 16-stable

* Add CHANGELOG entry
@mrcasals
Add ability to toggle user groups by organization (decidim#4681) (dec…
1d2a31c 
…idim#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
@MarcReniu @mrcasals
[BACKPORT] MetricResolver filtering correction (decidim#4736)
c003682 
* [BACKPORT] MetricResolver filtering correction

* Added CHANGELOG entry
@mrcasals
Fix loading translations on comments (decidim#4728) (decidim#4739)
f25919d 
This way they won't fail when there's a problem
@decidim-bot @mrcasals
New Crowdin translations (decidim#4738)
409f572 
* 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
@moustachu
🐛 current_feature deprecated
ec74043
@leio10 @mrcasals
Adds environment to open data export task to avoid errors (decidim#4743)
b7599a8
@moustachu
🌐 FR --> Concertations #378
9655b2e
@moustachu
🌐 FR --> Concertations #378
2d5fd40
@moustachu
🌐 FR --> Concertations #378
f61e69c
@oriolgual @mrcasals
Fix action authorizer with blank permissions 0.16 backport (decidim#4746
586b2a2 
)

* Ignore blank permission options in action authorizer

* Add CHANGELOG
@moustachu
🐛 #417 : fix exports translatable_attr when first line is empty
1f68332 
- 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
@moustachu
🤖 rubocop offense C: Style/StringLiterals
1feb86b
@moustachu
🐛 #360 fix survey choices export for free text option
9bc76f0
@moustachu
✨ #216 Survey answer date
5d20a4f
@moustachu
✨ #226 Survey answer date
cceff5d
@moustachu
Merge branch 'fix/0.12-i18n-exports' of https://github.com/OpenSource…
bcd307a 
…Politics/decidim into fix/0.12-i18n-exports
@moustachu
🤖
fc29dc4
@moustachu
Merge pull request #349 from OpenSourcePolitics/Fix/comments-count-on…
921bf14 
…-card

Fix display of comments count when comment has been moderated
@moustachu
🐛 #421 fix Proposal mention links
d46f80c 
- only replace link when url contains "proposals" path
- prevent switching between components with same item id
@moustachu
✨ add mentions for Accountibility Results
a4465f7 
- add new `ContentProccessor` objects (`Parser` & `Renderer`)
- add new `ResultPresenter`
@moustachu
✨ add mentions for Budgets Projects
24a479b 
- add new `ContentProccessor` objects (`Parser` & `Renderer`)
- add new `ProjectPresenter`
@moustachu
✅ fix tests for content parser
f04384d
@moustachu
Merge pull request #422 from OpenSourcePolitics/fix/0.12-content-proc…
9337964 
…essors

Fix/0.12 NEW content processors
@moustachu
Merge pull request #420 from OpenSourcePolitics/fix/0.12-i18n-exports
33cf249 
0.12 - Exports fixes
@oriolgual
Backport decidim#4778 to 0.16-stable (decidim#4777)
2fa4618 
* Move code parent assemblies from index to partial

* Refactor filtered assemblies query

* Refactor filter assemblies helper and partial

* Change tests

* Add CHANGELOG entry
@moustachu
🐛 fixes #344 for NotifyProposalsMentionedJob
d79a5af
moustachu and others added 15 commits January 25, 2019 15:33
@moustachu
🐛 fixes #344 for NotifyProposalsMentionedJob
cb70644
@moustachu
Merge branch '0.12-stable' of https://github.com/OpenSourcePolitics/d…
a175bdc 
…ecidim into 0.12-stable
@moustachu
🤖 rubocop #344
6b4fb85
@moustachu
✅ fixes tests for #344
9102953
@moustachu
🤖 rubocop
4390e33
@tramuntanal @oriolgual
Backport participatory text related evoutives and fixes. (decidim#4801)
99eacbd 
* 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.
@oriolgual
Backport decidim#4811 to 0.16-stable (decidim#4815)
5c460f7 
* Fix attachments not being inherited and add test

* Add CHANGELOG entry
@moustachu
🐛 fixes Pagination in assemblies #459
8a3d21e
@moustachu
🐛 ✉️ add opt out notifications mail link
9d03aa8 
- #RGPD
@moustachu
🐛 unused keys
32211af
@moustachu
Merge branch '0.12-stable' into fix/0.16-merge-2019-02
4318b89
@moustachu
Merge branch '0.16-decidim' into fix/0.16-merge-2019-02
bd1dbc5
@moustachu
🐛 💚 test_main
b28f463
@moustachu
🐛 💚 test_main
44c1682
@moustachu
🌐 💚 after patch
e7cb0ea
@moustachu moustachu added the 0.16-stable Version label Feb 8, 2019
@moustachu moustachu added this to the 0.16-stable-debug II milestone Feb 8, 2019
@moustachu moustachu self-assigned this Feb 8, 2019
@ghost ghost added the needs-review label Feb 8, 2019
@moustachu moustachu merged commit 307e4ed into 0.16-stable Feb 8, 2019
@ghost ghost removed the needs-review label Feb 8, 2019
@moustachu moustachu deleted the fix/0.16-merge-2019-02 branch February 8, 2019 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@moustachu moustachu

Labels
0.16-stable Version
Projects
None yet
Milestone
0.16-stable-debug II
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@moustachu @armandfardeau @mrcasals @MarcReniu @decidim-bot @leio10 @oriolgual @tramuntanal