Skip to content

Commit

Permalink
Feature/upstream moderation (#48)
Browse files Browse the repository at this point in the history
* Add upstream moderation

* Squashed commit of the following:

commit 1be43a1
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Wed Mar 20 09:14:38 2019 +0100

    New Crowdin translations (decidim#4985)

    Enjoy!

commit b0d608c
Author: Marc Riera <mrc2407@gmail.com>
Date:   Wed Mar 20 08:57:57 2019 +0100

    [Backport] Bring decidim#4980 and decidim#4978 to 0.16 (decidim#4984)

    #### 🎩 What? Why?
    This PR backports decidim#4980 and decidim#4978 to 0.16.

    #### 📌 Related Issues
    - Related to decidim#4978, decidim#4980

    #### 📋 Subtasks
    - [x] Add `CHANGELOG` entry

commit c188c31
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Mon Mar 18 16:06:57 2019 +0100

    New Crowdin translations (decidim#4968)

    * New translations en.yml (Czech)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * 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 (Italian)

    * New translations en.yml (Italian)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Catalan)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Catalan)

    * New translations en.yml (Spanish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Catalan)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (German)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Swedish)

    * New translations en.yml (Arabic)

    * Update comments bundle

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Finnish (plain))

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Arabic)

    * New translations en.yml (Finnish (plain))

    * New translations en.yml (Catalan)

    * New translations en.yml (Arabic)

commit 7372946
Author: Marc Riera <mrc2407@gmail.com>
Date:   Mon Mar 18 09:14:47 2019 +0100

    [BACKPORT] Fix user presenter for user groups (decidim#4974)

    * Fix user presenter for user groups (decidim#4973)

    * Fix user presenter for user groups

    The user groups do not have a `.deleted?` method defined for them
    which caused the user presenter to break the notifications view
    in case the notification was linking to a group user.

    * Add CHANGELOG entry

    * Fix changelog

commit c5b711d
Author: Marc Riera <mrc2407@gmail.com>
Date:   Wed Mar 13 09:13:45 2019 +0100

    [Backport] Fix authorization workflows index (decidim#4963)

    * Let admins visit the authorization workflows index page

    * Add changelog

commit 700fe2d
Author: Marc Riera <mrc2407@gmail.com>
Date:   Wed Mar 13 08:42:29 2019 +0100

    [BACKPORT] Don't render profile URL if user has no nickname (decidim#4962)

    * Don't render profile URL if user has no nickname

    * Add changelog

commit 7c82e9d
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Tue Mar 12 08:53:39 2019 +0100

    New Crowdin translations (decidim#4959)

    * 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)

commit 066d830
Author: Marc Riera <mrc2407@gmail.com>
Date:   Mon Mar 11 13:12:16 2019 +0100

    [BACKPORT] Skip callbacks on follower counters migration (decidim#4955)

    * Skip callbacks on follower counters migration

    * Add changelog

commit b5e534d
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Fri Mar 8 08:47:30 2019 +0100

    New Crowdin translations (decidim#4948)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Spanish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Hungarian)

    * New translations en.yml (German)

    * New translations en.yml (Swedish)

    * New translations en.yml (Finnish)

commit b81e09d
Author: Marc Riera <mrc2407@gmail.com>
Date:   Thu Mar 7 15:04:29 2019 +0100

    Fix meeting questionnaire migration (decidim#4949)

commit d663fee
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Mon Mar 4 12:57:04 2019 +0100

    New Crowdin translations (decidim#4925)

    * New translations en.yml (Basque)

    * New translations en.yml (Portuguese)

    * New translations en.yml (Portuguese)

    * New translations en.yml (Portuguese)

    * New translations en.yml (Polish)

    * New translations en.yml (Portuguese)

    * New translations en.yml (Polish)

    * 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 (Portuguese)

    * New translations en.yml (Polish)

    * 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 (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 (Polish)

    * New translations en.yml (Polish)

    * New translations en.yml (Basque)

    * New translations en.yml (Italian)

    * New translations en.yml (Italian)

    * New translations en.yml (Italian)

    * New translations en.yml (Portuguese, Brazilian)

    * New translations en.yml (Indonesian)

    * 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, Mexico)

    * 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 (Swedish)

    * New translations en.yml (Spanish, Paraguay)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Portuguese, Brazilian)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Indonesian)

    * New translations en.yml (Polish)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Dutch)

    * New translations en.yml (Dutch)

    * New translations en.yml (Dutch)

    * New translations en.yml (Czech)

    * New translations en.yml (Dutch)

    * New translations en.yml (Czech)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Dutch)

    * New translations en.yml (Dutch)

    * New translations en.yml (Czech)

    * 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 (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Finnish)

    * 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 (Galician)

    * 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 (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 (Finnish)

    * New translations en.yml (Galician)

    * New translations en.yml (Galician)

    * New translations en.yml (Galician)

    * New translations en.yml (French)

    * New translations en.yml (Galician)

    * New translations en.yml (Galician)

    * New translations en.yml (Russian with many plural form)

    * New translations en.yml (Russian with many plural form)

    * New translations en.yml (Ukrainian with many plural form)

    * 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 (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 (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 (Ukrainian with many plural form)

commit 490ef8e
Author: Oriol Gual <oriolgual@users.noreply.github.com>
Date:   Mon Mar 4 10:57:31 2019 +0100

    Debates dates are optional (decidim#4921)

commit de4b9b5
Author: Ivan Vergés <ivan@platoniq.net>
Date:   Fri Mar 1 11:28:42 2019 +0100

    fix wrong check of avatar_url in /oauth/me controller 0.16 backport (decidim#4917) (decidim#4919)

    * fix wrong check of avatar_url in /oauth/me controller that leads to a 500 error

    In Decidim intallations configured to use external services as file provider
    (such as AWS-S3), if a user has an avatar cannot authenticate using the builtin
    OAuth server due an error checking the url in the credentials_controller

    * fix rubocop complain

    * [ci_skip] Changelog fix entry

commit e14897b
Author: Oriol Gual <oriolgual@users.noreply.github.com>
Date:   Wed Feb 20 11:02:55 2019 +0100

    Backport more bugfixes (decidim#4883)

    * Don't allow unknown process filters

    * Don't count withdrawn proposals when publishing one

    * Add start and end times to debates card

    * Fix debates ordering

    * Update CHANGELOG

commit 7454642
Author: Oriol Gual <oriolgual@users.noreply.github.com>
Date:   Mon Feb 18 17:00:42 2019 +0100

    Backport bugfixes (decidim#4863)

    * Remove SMS authorization presenter call since it doesn't exist

    * Use MD5 for proposals search indexes

    * Remove etiquetter validator for admins

    * Order recent proposals by published date

    * Scope users search to current organization

    * Use user group as author when present in a comment

    * Allow HTML content at debates page

    * Fix proposal body rendering in activity cell

    * Fix free text answers exporting

    * Better handling with empty fields when exporting

    * Search initiatives at admin at the whole text, not just starting with

    * Order meetings at admin

    * Update CHANGELOG

    * Add missing admin link for proposals. Closes decidim#4834

    * Update CHANGELOG

commit a2c5fe3
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Mon Feb 18 17:00:19 2019 +0100

    New Crowdin translations (decidim#4860)

    * New translations en.yml (Spanish, Paraguay)

    * New translations en.yml (Turkish)

    * New translations en.yml (Basque)

    * New translations en.yml (Portuguese)

    * New translations en.yml (Portuguese, Brazilian)

    * New translations en.yml (Spanish)

    * New translations en.yml (Original)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Turkish)

    * New translations en.yml (Turkish)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (French)

    * New translations en.yml (Catalan)

    * New translations en.yml (Dutch)

    * New translations en.yml (Indonesian)

    * New translations en.yml (Indonesian)

    * New translations en.yml (Indonesian)

    * New translations en.yml (Polish)

    * Readd missing keys

    * Readd missing keys

    * New translations en.yml (Original)

    * Revert "New translations en.yml (Original)"

    This reverts commit 2d52564.

commit 7f6129e
Author: Aitor Lopez Beltran <aitor.lb@coditramuntana.com>
Date:   Sat Feb 16 01:36:05 2019 +0100

    Backport decidim#4852 to 0.16 stable (decidim#4855)

    * Backport decidim#4852 to 0.16-stable

    * Add CHANGELOG entry

commit 8ecaa23
Author: decidim-bot <decidim-bot@users.noreply.github.com>
Date:   Sat Feb 16 01:33:31 2019 +0100

    New Crowdin translations (decidim#4781)

    * New translations en.yml (Indonesian)

    * New translations en.yml (Spanish)

    * New translations en.yml (Spanish, Paraguay)

    * New translations en.yml (Dutch)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Catalan)

    * New translations en.yml (German)

    * New translations en.yml (Russian with many plural form)

    * New translations en.yml (Ukrainian with many plural form)

    * New translations en.yml (Turkish)

    * New translations en.yml (Finnish)

    * New translations en.yml (Spanish)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * New translations en.yml (Spanish, Paraguay)

    * New translations en.yml (Spanish)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Catalan)

    * New translations en.yml (Turkish)

    * New translations en.yml (Czech)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Czech)

    * New translations en.yml (Catalan)

    * New translations en.yml (Catalan)

    * 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 (plain))

    * New translations en.yml (Original)

    * New translations en.yml (Spanish, Mexico)

    * New translations en.yml (Spanish)

    * New translations en.yml (Catalan)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Original)

    * New translations en.yml (Hungarian)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * New translations en.yml (Original)

    * 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 (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 (Catalan)

    * 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)

    * Fix locales

    * Fix specs

    * More spec fixes

    * Spec fixes

commit c7ace25
Author: Aitor Lopez Beltran <aitor.lb@coditramuntana.com>
Date:   Fri Feb 15 08:56:26 2019 +0100

    Backport decidim#4718 to 0.16 stable (decidim#4847)

    * Backport decidim#4718 to 0.16 stable

    * Add CHANGELOG entry

commit f523607
Author: Aitor Lopez Beltran <aitor.lb@coditramuntana.com>
Date:   Wed Feb 13 14:49:49 2019 +0100

    Backport decidim#4828 to 0.16 stable (decidim#4836)

    * Backport decidim#4828 to 0.16-stable

    * Add CHANGELOG entry

commit d587a42
Author: Oliver Valls <tramuntanal@gmail.com>
Date:   Mon Feb 11 17:01:13 2019 +0100

    Backport/more participatory text features (decidim#4817)

    * [REFACTOR] Save participatory text drafts.

    * [REFACTOR] All participatory texts cards open by default.

    * [FEATURE] Option to reset participatory text file.

    * [I18N] Use "discard" terminology.

    * Update links to PR in changelog.

    * [TEST] Update literals in tests.

    * [TEST] Fix flacky test.

commit 5c460f7
Author: Aitor Lopez Beltran <aitor.lb@coditramuntana.com>
Date:   Mon Feb 4 15:56:46 2019 +0100

    Backport decidim#4811 to 0.16-stable (decidim#4815)

    * Fix attachments not being inherited and add test

    * Add CHANGELOG entry

commit 99eacbd
Author: Oliver Valls <tramuntanal@gmail.com>
Date:   Tue Jan 29 15:29:18 2019 +0100

    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.

commit 2fa4618
Author: Aitor Lopez Beltran <aitor.lb@coditramuntana.com>
Date:   Tue Jan 22 16:04:29 2019 +0100

    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

commit 586b2a2
Author: Oriol Gual <oriolgual@users.noreply.github.com>
Date:   Fri Jan 11 09:22:44 2019 +0100

    Fix action authorizer with blank permissions 0.16 backport (decidim#4746)

    * Ignore blank permission options in action authorizer

    * Add CHANGELOG

commit b7599a8
Author: Leonardo Diez <leiodd@gmail.com>
Date:   Thu Jan 10 14:41:23 2019 +0100

    Adds environment to open data export task to avoid errors (decidim#4743)

COMMAND HISTORY
```shell
$ git merge -s recursive -Xfind-renames=25% -Xsubtree=decidim-proposals -Xpatience --squash decidim/0.16-stable

$ git ls-tree -dr HEAD --name-only | grep proposal

$ git ls-files | grep proposal

$ git mv spec/cells/decidim/questions/proposal_activity_cell_spec.rb spec/cells/decidim/questions/question_activity_cell_spec.rb

$ git ls-tree -dr HEAD --name-only | grep proposal

```

* update Gemfile.lock

* Add view upstream_moderation

* ⤵️ last fixes on upstream from Proposals

* change filter for non treated Question on front

* Committee can moderate on Questions admin

* Committee can access Moderation admin pages

* Add mailer for new note created

* Fix question note mailer

* Add anchor for question note

* Add french translation

* Normalize fr and en

* use url and not path when using in mailer

* Use deliver later instead of now

* :fix: add notifications for committee / service decidim#582 decidim#583 decidim#584

* Add process_admin role permission

* Fix components visibility issue

* 🐛 remove Service from "Awaiting moderation" event #24

* 🐛 fix HTML in card_m cells #23

* Fix undefined method 'file' for nil:NilClass

* Add validate question event

* 🔖 ⬆️ bump 0.16.1

* Feature/admin search filters (#41)

* Backport of `feature/admin-proposals-filter` branch (fb5e0f8) decidim#476

* 🔖 ⬆️ bump 0.16.1

* Feature/display answers in admin notes (#42)

* 🚧 Display answers in admin notes

* 💄 UX fixes

* Display publishing date #38

- The publishing date = the moment the question changes state for `evaluating` or `accepted`.
- Screen for question view
- Screen for admin /manage
- Screen for admin /edit
- Screen for admin /question_notes
- Screen for admin /question_answers

* Display publishing date #38 (#43)

- The publishing date = the moment the question changes state for `evaluating` or `accepted`.
- Screen for question view
- Screen for admin /manage
- Screen for admin /edit
- Screen for admin /question_notes
- Screen for admin /question_answers

* 🐛 fix recipients on `Decidim::Questions::Admin::AnswerQuestion` #40

* Update Question reference when treated by admins #35 #36 (#44)

* Use bundler 2

* 🐛 fixes for OpenSourcePolitics/decidim-questions#38

* 🐛 fixes for OpenSourcePolitics/decidim-questions#35

* Move questions between components (#34)

* Move questions between components

* Add notifications

* Add specs

* Don't inherit

* Add the right permissions

* Update Version

* Add missing translations

* 🐛 fix duplicate publication date on admin views

* 🐛 manage custom reference when moving questions #30 #35 #36

* 🐛 [admin] add `pending` state to filter

* ⬆️ 🐛 i18n & css fixes

* 🐛 fix for process admin `:edit-link`

* Choose which specific people instead of a role in question recipients (#32)

* Choose which specific people instead of a role in question recipients

* Fix recipients ids and better code

* Add specs & locales

* Add migration to migrate existing questions

* Filter questions for service users

* Add missing translations

* Fix seeds

* Add missing translation
  • Loading branch information
armandfardeau committed May 29, 2019
1 parent 67ea2af commit 3762090
Show file tree
Hide file tree
Showing 136 changed files with 9,381 additions and 10,966 deletions.
7 changes: 7 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ jobs:
keys:
- bundler-dependencies-{{ checksum "Gemfile.lock" }}

- run:
name: Configure Bundler
command: |
echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
source $BASH_ENV
gem install bundler
- run:
name: Install dependencies
command: bundle install
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"

ruby RUBY_VERSION

gem "decidim", git: "https://github.com/OpenSourcePolitics/decidim", branch: "0.16-stable"
gem "decidim", git: "https://github.com/OpenSourcePolitics/decidim", branch: "0.16-upstream_moderation"
gem "decidim-questions", path: "."

gem "bootsnap", "~> 1.3"
Expand All @@ -19,7 +19,7 @@ gem "faker", "~> 1.9"
group :development, :test do
gem "byebug", "~> 10.0", platform: :mri

gem "decidim-dev", git: "https://github.com/OpenSourcePolitics/decidim", branch: "0.16-stable"
gem "decidim-dev", git: "https://github.com/OpenSourcePolitics/decidim", branch: "0.16-upstream_moderation"
end

group :development do
Expand Down
188 changes: 94 additions & 94 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
GIT
remote: https://github.com/OpenSourcePolitics/decidim
revision: 8075b1c6d598dc1815d6e2fc9a0e609cfaa8c196
branch: 0.16-stable
revision: dd08c007407b323aee2722345cb1897759bcb353
branch: 0.16-upstream_moderation
specs:
decidim (0.16.0)
decidim-accountability (= 0.16.0)
decidim-admin (= 0.16.0)
decidim-api (= 0.16.0)
decidim-assemblies (= 0.16.0)
decidim-blogs (= 0.16.0)
decidim-budgets (= 0.16.0)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim-debates (= 0.16.0)
decidim-forms (= 0.16.0)
decidim-generators (= 0.16.0)
decidim-meetings (= 0.16.0)
decidim-pages (= 0.16.0)
decidim-participatory_processes (= 0.16.0)
decidim-proposals (= 0.16.0)
decidim-sortitions (= 0.16.0)
decidim-surveys (= 0.16.0)
decidim-system (= 0.16.0)
decidim-verifications (= 0.16.0)
decidim-accountability (0.16.0)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim (0.16.1)
decidim-accountability (= 0.16.1)
decidim-admin (= 0.16.1)
decidim-api (= 0.16.1)
decidim-assemblies (= 0.16.1)
decidim-blogs (= 0.16.1)
decidim-budgets (= 0.16.1)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
decidim-debates (= 0.16.1)
decidim-forms (= 0.16.1)
decidim-generators (= 0.16.1)
decidim-meetings (= 0.16.1)
decidim-pages (= 0.16.1)
decidim-participatory_processes (= 0.16.1)
decidim-proposals (= 0.16.1)
decidim-sortitions (= 0.16.1)
decidim-surveys (= 0.16.1)
decidim-system (= 0.16.1)
decidim-verifications (= 0.16.1)
decidim-accountability (0.16.1)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
kaminari (~> 1.0)
searchlight (~> 4.1)
decidim-admin (0.16.0)
decidim-admin (0.16.1)
active_link_to (~> 1.0)
decidim-core (= 0.16.0)
decidim-core (= 0.16.1)
devise (~> 4.2)
devise-i18n (~> 1.2)
devise_invitable (~> 1.7)
jquery-rails (~> 4.3)
sassc (~> 1.12, >= 1.12.1)
sassc-rails (~> 1.3)
decidim-api (0.16.0)
decidim-api (0.16.1)
graphiql-rails (~> 1.4, < 1.5)
graphql (~> 1.6, < 1.8.11)
rack-cors (~> 1.0)
sprockets-es6 (~> 0.9.2)
decidim-assemblies (0.16.0)
decidim-core (= 0.16.0)
decidim-blogs (0.16.0)
decidim-admin (= 0.16.0)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim-assemblies (0.16.1)
decidim-core (= 0.16.1)
decidim-blogs (0.16.1)
decidim-admin (= 0.16.1)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
httparty (~> 0.16.0)
jquery-tmpl-rails (~> 1.1)
kaminari (~> 1.0)
decidim-budgets (0.16.0)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim-budgets (0.16.1)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
kaminari (~> 1.0)
searchlight (~> 4.1)
decidim-comments (0.16.0)
decidim-core (= 0.16.0)
decidim-comments (0.16.1)
decidim-core (= 0.16.1)
jquery-rails (~> 4.0)
decidim-core (0.16.0)
decidim-core (0.16.1)
active_link_to (~> 1.0)
autoprefixer-rails (~> 8.0)
batch-loader (~> 1.2)
Expand All @@ -68,8 +68,8 @@ GIT
cells-rails (~> 0.0.9)
charlock_holmes (>= 0.7.6)
date_validator (~> 0.9.0)
decidim-api (= 0.16.0)
devise (~> 4.3)
decidim-api (= 0.16.1)
devise (~> 4.6)
devise-i18n (~> 1.2)
doorkeeper (~> 4.4)
doorkeeper-i18n (~> 4.0)
Expand Down Expand Up @@ -109,16 +109,16 @@ GIT
uglifier (~> 4.0)
valid_email2 (~> 2.1)
wisper (~> 2.0)
decidim-debates (0.16.0)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim-debates (0.16.1)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
kaminari (~> 1.0)
searchlight (~> 4.1)
decidim-dev (0.16.0)
decidim-dev (0.16.1)
byebug (~> 10.0)
capybara (~> 3.0)
db-query-matchers (~> 0.9.0)
decidim (= 0.16.0)
decidim (= 0.16.1)
erb_lint (~> 0.0.22)
factory_bot_rails (~> 4.8)
i18n-tasks (~> 0.9.18)
Expand All @@ -137,66 +137,66 @@ GIT
system_test_html_screenshots (~> 0.1.1)
webmock (~> 3.0)
wisper-rspec (~> 1.0)
decidim-forms (0.16.0)
decidim-core (= 0.16.0)
decidim-generators (0.16.0)
decidim-core (= 0.16.0)
decidim-meetings (0.16.0)
decidim-forms (0.16.1)
decidim-core (= 0.16.1)
decidim-generators (0.16.1)
decidim-core (= 0.16.1)
decidim-meetings (0.16.1)
cells-erb (~> 0.1.0)
cells-rails (~> 0.0.9)
decidim-core (= 0.16.0)
decidim-forms (= 0.16.0)
decidim-core (= 0.16.1)
decidim-forms (= 0.16.1)
httparty (~> 0.16.0)
icalendar (~> 2.4)
jquery-tmpl-rails (~> 1.1)
kaminari (~> 1.0)
searchlight (~> 4.1)
decidim-pages (0.16.0)
decidim-core (= 0.16.0)
decidim-participatory_processes (0.16.0)
decidim-core (= 0.16.0)
decidim-proposals (0.16.0)
decidim-pages (0.16.1)
decidim-core (= 0.16.1)
decidim-participatory_processes (0.16.1)
decidim-core (= 0.16.1)
decidim-proposals (0.16.1)
acts_as_list (>= 0.9)
cells-erb (~> 0.1.0)
cells-rails (~> 0.0.9)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
doc2text (>= 0.4.0)
kaminari (~> 1.0)
ransack (~> 2.0)
redcarpet (>= 3.4)
social-share-button (~> 1.0)
decidim-sortitions (0.16.0)
decidim-admin (= 0.16.0)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
decidim-proposals (= 0.16.0)
decidim-sortitions (0.16.1)
decidim-admin (= 0.16.1)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
decidim-proposals (= 0.16.1)
social-share-button (~> 1.0)
decidim-surveys (0.16.0)
decidim-core (= 0.16.0)
decidim-forms (= 0.16.0)
decidim-system (0.16.0)
decidim-surveys (0.16.1)
decidim-core (= 0.16.1)
decidim-forms (= 0.16.1)
decidim-system (0.16.1)
active_link_to (~> 1.0)
decidim-core (= 0.16.0)
decidim-core (= 0.16.1)
devise (~> 4.2)
devise-i18n (~> 1.2)
devise_invitable (~> 1.7)
jquery-rails (~> 4.3)
sassc (~> 1.12, >= 1.12.1)
sassc-rails (~> 1.3)
decidim-verifications (0.16.0)
decidim-core (= 0.16.0)
decidim-verifications (0.16.1)
decidim-core (= 0.16.1)

PATH
remote: .
specs:
decidim-questions (0.16.0)
decidim-questions (0.16.1)
acts_as_list (>= 0.9)
cells-erb (~> 0.1.0)
cells-rails (~> 0.0.9)
decidim-comments (= 0.16.0)
decidim-core (= 0.16.0)
doc2text (>= 0.3.3)
decidim-comments (= 0.16.1)
decidim-core (= 0.16.1)
doc2text (>= 0.4.0)
kaminari (~> 1.0)
ransack (~> 2.0)
redcarpet (>= 3.4)
Expand Down Expand Up @@ -265,7 +265,7 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
batch-loader (1.4.0)
batch-loader (1.4.1)
bcrypt (3.1.12)
better_html (1.0.13)
actionview (>= 4.0)
Expand All @@ -280,13 +280,13 @@ GEM
msgpack (~> 1.0)
builder (3.2.3)
byebug (10.0.2)
capybara (3.18.0)
capybara (3.21.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
regexp_parser (~> 1.5)
xpath (~> 3.2)
carrierwave (1.3.1)
activemodel (>= 4.0.0)
Expand Down Expand Up @@ -434,7 +434,7 @@ GEM
jquery-tmpl-rails (1.1.0)
rails (>= 3.1.0)
json (2.2.0)
jwt (2.1.0)
jwt (2.2.1)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
Expand Down Expand Up @@ -486,7 +486,7 @@ GEM
msgpack (1.2.10)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
multipart-post (2.1.1)
mustache (1.1.0)
netrc (0.11.0)
nio4r (2.3.1)
Expand Down Expand Up @@ -528,7 +528,7 @@ GEM
parser (2.6.3.0)
ast (~> 2.4.0)
pg (1.1.4)
pg_search (2.1.7)
pg_search (2.2.0)
activerecord (>= 4.2)
activesupport (>= 4.2)
powerpack (0.1.2)
Expand All @@ -539,7 +539,7 @@ GEM
premailer-rails (1.10.2)
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
public_suffix (3.0.3)
public_suffix (3.1.0)
puma (3.12.1)
rack (2.0.7)
rack-attack (5.4.2)
Expand Down Expand Up @@ -595,8 +595,8 @@ GEM
virtus (~> 1.0.5)
wisper (>= 1.6.1)
redcarpet (3.4.0)
redis (4.1.0)
regexp_parser (1.4.0)
redis (4.1.1)
regexp_parser (1.5.1)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.1)
Expand Down Expand Up @@ -646,9 +646,9 @@ GEM
rubocop-rspec (1.30.0)
rubocop (>= 0.58.0)
ruby-ole (1.2.12.2)
ruby-progressbar (1.10.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (1.2.2)
rubyzip (1.2.3)
safe_yaml (1.0.5)
sass (3.4.25)
sassc (1.12.1)
Expand All @@ -662,18 +662,18 @@ GEM
sprockets-rails
tilt
searchlight (4.1.0)
selenium-webdriver (3.142.0)
selenium-webdriver (3.142.3)
childprocess (>= 0.5, < 2.0)
rubyzip (~> 1.2, >= 1.2.2)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
smart_properties (1.13.1)
smart_properties (1.14.0)
social-share-button (1.2.0)
coffee-rails
spreadsheet (1.2.3)
spreadsheet (1.2.4)
ruby-ole (>= 1.0)
spring (2.0.2)
activesupport (>= 4.2)
Expand Down Expand Up @@ -711,7 +711,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unicode-display_width (1.5.0)
unicode-display_width (1.6.0)
valid_email2 (2.3.1)
activemodel (>= 3.2)
mail (~> 2.5)
Expand Down Expand Up @@ -760,7 +760,7 @@ DEPENDENCIES
web-console (~> 3.5)

RUBY VERSION
ruby 2.5.3p105
ruby 2.6.0p0

BUNDLED WITH
2.0.1
1.17.3
Loading

0 comments on commit 3762090

Please sign in to comment.