Skip to content

Redesign: sync develop and feature/redesign#10967

Merged
ferblape merged 170 commits intofeature/redesignfrom
redesign/sync-develop-2
Jul 4, 2023
Merged

Redesign: sync develop and feature/redesign#10967
ferblape merged 170 commits intofeature/redesignfrom
redesign/sync-develop-2

Conversation

@alecslupu
Copy link
Copy Markdown
Contributor

@alecslupu alecslupu commented Jun 7, 2023

🎩 What? Why?

This PR aims to sync the latest develop branch with the feature/redesign branch.

♥️ Thank you!

alecslupu and others added 30 commits April 4, 2023 12:02
* Update to stylelint 15.3.0

* Remove deprecated rules

* Sync design files
* Add direct action to block this participant

* Add callout

* Running linters

* Running erb linters

* Apply product review recommendations

* Change the assertion text

* Apply review recommendations

* Add specs for hide content models

* Add spec for moderation tools

* Remove unusued context

* Refactor the jobs

* Add release notes

* Running spelling linters

* Apply review recommendation
* Fix loofah open dependency

* Update rack

* Update rails to 6.1.7.3

* Change the development branch

* Update decidim-generators/spec/lib/generators_spec.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

* Update decidim-generators/lib/decidim/generators.rb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>

---------

Co-authored-by: Fran Bolívar <francisco.bolivar@nazaries.com>
…0644)

* Ensure the correct page is loaded before running the specs

* Expect the correct page before proceeding

* Fetch the trustees in correct order
* Improve the link handling

* Improve further the link handling

* More iterations

* Another iteration

* Enforce http or https protocols

* Temporary commit

* Running linters

* Refactor the links controller

* Apply review recommendations

* Add handling for invalid url

* Further improve the controller
* Install and configure Prettier

* Update the SCSS files to match Prettier format

* Add npm prettify command

* Finish the linting

* Run linter
* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (French, Canada)

* New translations en.yml (French, Canada)

* New translations en.yml (Spanish, Paraguay)

* New translations en.yml (Spanish, Paraguay)

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

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

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (French, Canada)

* New translations en.yml (French, Canada)

* New translations en.yml (French)

* New translations en.yml (French)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

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

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)

* New translations en.yml (Romanian)
…10688)

* Change the layout helper to set the correct rgb code

* Revert #10424
* Upgrade node from 16.9.1 to 16.10.0

* Upgrade node from 16.10.0 to 16.13.0

* Adjusting specs

* Fix node versions

* Apply review recommendations
…orrectly (#10677)

* initial commit

* notificationspec

* shared-example

* meeting-debate-specs-open

* tests-unfinished

* tests-finished

* test-content-change

* content-change

* refactored-tests

* moved-test-specific-shared-context-to-test

* resolved-conflict

---------

Co-authored-by: Antti Hukkanen <antti.hukkanen@mainiotech.fi>
…10714)

* Fix Shakapacker error

* Fixing more shakapacker issue templates

* Fixing the stylesheet pack tag
* fix initiatives display when not initialized

* fix tests

* Update initiative_types_controller_spec.rb

* linter

---------

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
* Fix: Video embeds are not shown in short_description field

* Add test for ParticipatoryProcess

* Add admin_support for Blog

* Add decidim-budget admin sanitization

* Add decidim-consultations

* Enable iframes for decidim-pages

* Enable iframes for decidim-proposals

* Enable iframes for decidim-debates

* Enable iframes for decidim-sortitions

* Enable full editor in decidim-elections

* Enable full content in decidim-surveys

* revert sortitions

* Running Linters

* Revert proposals fields

* Fix Election spec

* Fix decidim assemblies

* Implement new restrictions

* Fix the scrubbers

* Add more restrictions to the scrubber scrubber

* Sort the restricted tags

* Revert strip tags for questions in consultations

* Fix consultations change requests
* Fix initiative creation missing form fields

* Add new form fields to spec

* Replace single quotes with double quotes

* Fix failing test

* Improve initiative create and edit form

Add form_field for initiative_type to create form
Move form_field for state to the end on edit form
add help text to author-select
fix specs

* normalize en.yml

* Add hidden field for initiative_type

* Update decidim-initiatives/config/locales/en.yml

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix order of fields

* Update decidim-initiatives/app/controllers/decidim/initiatives/create_initiative_controller.rb

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>

* Fix spec

* Add missing hashtag to creation command

* Add missing trailing newline

---------

Co-authored-by: Andrés Pereira de Lucena <andreslucena@users.noreply.github.com>
* Add the `stylelint-prettier` rules to the stylelint rules

* Remove the prettier step from the lint code workflow (CI)
* More Erb Lint

* Fixing Style/HashSyntax

* Update brakeman ignore after template has been changed
* Fix edge case in initiative creation

* Fix user redirect when missing data

* Running linters
* Add multiple templates to quill

* Remove the full toolbar reference, to use the form builder default

* Consolidate decidim editor

* Running linters

* Fix the toolbar usage in the application

* Fixing failing specs

* Add tests for customized toolbars

* Fixing failing spec

* Implement more review recommendations

* Fix failing spec, removing multimedia format
@alecslupu alecslupu force-pushed the redesign/sync-develop-2 branch 2 times, most recently from fd08074 to 551a48b Compare June 26, 2023 21:43
@alecslupu alecslupu force-pushed the redesign/sync-develop-2 branch from 551a48b to f758daa Compare June 27, 2023 05:04
ElviaBth and others added 4 commits June 28, 2023 09:00
…11090)

* Add a condition to default_filter_status method

* add test to check if does not filter selected by default

* add method to improve readability
* Check for supported locale in Emoji picker

* Apply suggestion from code review

* Add spec

* Fix spellchecker offense

* Fix spec
@alecslupu alecslupu force-pushed the redesign/sync-develop-2 branch 3 times, most recently from 9ec51b9 to d719ede Compare June 29, 2023 11:12
@alecslupu alecslupu force-pushed the redesign/sync-develop-2 branch 2 times, most recently from 30979ac to 2cc4d3e Compare June 29, 2023 19:40
@alecslupu alecslupu force-pushed the redesign/sync-develop-2 branch from 2cc4d3e to 5c8e0f3 Compare June 29, 2023 20:55
alecslupu and others added 9 commits July 1, 2023 09:44
* feature/redesign:
  Redesign: vertical flow for each sort of layout (#10883)
  Redesign: visual adjustments (#11100)
  Redesign: search + Card S (#11087)
  Redesign: adjust context links (#11095)
  Redesign: groups conversations + activate redesign in decidim core tests (old ci workflows) (#11073)
  style error pages (#11108)
@entantoencuanto entantoencuanto force-pushed the redesign/sync-develop-2 branch from eeae55f to 50d0a32 Compare July 3, 2023 17:16
@ferblape ferblape merged commit a8c475a into feature/redesign Jul 4, 2023
@ferblape ferblape deleted the redesign/sync-develop-2 branch July 4, 2023 07:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

project: redesign Barcelona City Council contract

Projects

None yet

Development

Successfully merging this pull request may close these issues.