Skip to content

Sync with origin develop#18

Merged
alecslupu merged 24 commits intoi-need-another-coffee:developfrom
decidim:develop
Oct 15, 2020
Merged

Sync with origin develop#18
alecslupu merged 24 commits intoi-need-another-coffee:developfrom
decidim:develop

Conversation

@alecslupu
Copy link
Copy Markdown

🎩 What? Why?

Please describe your pull request.

📌 Related Issues

Link your PR to an issue

  • Related to #?
  • Fixes #?

Testing

Describe the best way to test or validate your PR.

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • AVOID breaking the continuous integration build.
  • AVOID making significant changes to the overall architecture.

📷 Screenshots

Please add screenshots of the changes you're proposing
Description

♥️ Thank you!

ivan-mr and others added 24 commits October 13, 2020 13:19
* Fix deprecated js loadMap on meetings index

* Fix lint error index.js.erb removing whitespace at end of line

* Fix same lint error on meetings index.js.erb whitespace at end of line
* New translations en.yml (Catalan)

* New translations en.yml (Catalan)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (French, Canada)

* New translations en.yml (French, Canada)

* New translations en.yml (French, Canada)

* New translations en.yml (Norwegian)

* New translations en.yml (Dutch)

* New translations en.yml (Dutch)

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

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Norwegian)

* New translations en.yml (Korean)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Somali)

* New translations en.yml (Oromo)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Somali)

* New translations en.yml (Oromo)

* New translations en.yml (Amharic)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Tigrinya)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Oromo)

* New translations en.yml (Amharic)

* New translations en.yml (Amharic)

* New translations en.yml (Korean)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Korean)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Korean)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Tigrinya)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (French)

* New translations en.yml (Bulgarian)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (Bulgarian)

* New translations en.yml (Bulgarian)

* New translations en.yml (Bulgarian)

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

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* Rebuild JS bundle

* New translations en.yml (Dutch)

* Rebuild JS bundle

Co-authored-by: Ramon Costa <ramon.costa@gmail.com>
* fix order for elections

* remove unneeded css class from test
* Add cache to hero cell

* Add cache to last activity

* Fix rubocop offenses

* Don't herit perform caching method

* add current locale to cache hash

* add current locale to cache hash

* Fix offenses

* Add comment on method cache_hash

* Revert back to original locale after test

* Use a regex instead of changing locale

* Fix offense
Changes this vocabulary specific for a city/municipal context to
something much more neutral.

Co-authored-by: Oliver Valls <199462+tramuntanal@users.noreply.github.com>
#6653)

It should access to the code at runtime, and access the environment variables.
* Add help section and page to Conferences

* Fix plural/singular in Consultations' help

* Fix i18n normalize
* Add scope filter to proposals import

* Update specs

* Fix offense

* Change approach: scope selector filtered by current budget's scope

* Remove unused key in locales

* Use symbol instead of string

* Add test

* Fix offense

* Render scope picker only when scopes are enabled

* Rename decidim_scope_id to scope_id

* Rename remaining decidim_scope_id vars to scope_id

* Fix test
* Remove show_statistics checkbox in Admin -> Settings -> Appearance

* Fix 'Missing magic comment' lint error

* Restore Homepage system spec

* Fix failing tests for Homepage system spec

* Add CHANGELOG entry with removed option

* Fix lint error in CHANGELOG.md
* Add config to allow online meetings

* Add online_meeting_url fields to DB

* Add fields to forms and commands

* Use `data-` attributes instead of specific field names

* Remove unused locales

* Fix JS

* Fix locale

* Fix forms specs

* Fix specs

* Hide meeting type and online url fields if online meetings are not allowed

* Show online meeting URL

* Ensure fields are hidden

* Fix meeting form

* Fix tests

* Add `type_of`meeting` column to meetings

It stores whether the meeting is in-person or online

* Filter meetings by type

* Add missing i18n string

* Validate URLs

* Address feedback

* Fix i18n

* Remove config option

* test: select the type of meeting before filling in location

* Move URL details to cell

* Fix form

* Fix icon

* Fix edit form

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
Co-authored-by: David Morcillo <david.morcillo@gmail.com>
* Adding cell instrumentation to display rails-cells information output

* Linters

* Refactory of the Instrumenter system, moved into Decidim ViewModel
* First try -fix issue #6545 (bottom margin card title); not sure it works.

* Second try -fix issue #6545 (bottom margin card title); still not sure it works

* Fix issue #6545 (bottom margin card title), 2n ed. femdev

* Fix issue #6545 (bottom margin card title), 2n ed. femdev

* Added missing margin between card title and author, issue #6545; includes styling conventions required by codeclimate automated test.
* Ensure strings in NotificationMailer

* Add specs

* Ensure all events return a string on `safe_resource_text`
@alecslupu alecslupu merged commit 9fde202 into i-need-another-coffee:develop Oct 15, 2020
roxanaopr pushed a commit that referenced this pull request Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.