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.

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

bcn-budget-v0.24 to 0.24-stable-bcn #12

Merged
merged 71 commits into from
Jun 2, 2021

Conversation

leio10
Copy link

@leio10 leio10 commented Jun 2, 2021

🎩 What? Why?

This PR adds all the changes from the bcn-budget-v0.24 branch to the 0.24-stable-bcn based on 0.24-stable.

verarojman and others added 30 commits May 5, 2021 13:29
…scope-list

PB04 Improvement of the scopes list view on the Budgets component landing page
verarojman and others added 20 commits May 31, 2021 13:08
…-improvements

Budgets 2021 improvements
…ect-add-spinner

add spinner when clicking a project
Show current phase dates in budgets index
* Use correct newsletter cell for web view (decidim#8025)

* Use correct newsletter cell for web view

* Add spec

* Fix rubocop offenses

* fix: downgrade Rails 6 method used

Co-authored-by: Vera Rojman <vrojman@protonmail.com>
* 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 (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Slovenian)

* New translations en.yml (Catalan)

* New translations en.yml (Bulgarian)

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

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

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (Japanese)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)

* New translations en.yml (French, Luxembourg)
@leio10 leio10 changed the title bcn budget v0.24 to 0.24-stable-bcn bcn-budget-v0.24 to 0.24-stable-bcn Jun 2, 2021
@leio10 leio10 merged commit 824f3c4 into release/0.24-stable-bcn Jun 2, 2021
@leio10 leio10 deleted the feature/bcn-budget-v0.24 branch June 2, 2021 11:21
@microstudi
Copy link
Collaborator

Please @leio10 don't do this again without warning, we had a heart attack here! 😅 also this branch should be merge when all the bug fixing is finished, there might still be some issues to correct!

@leio10
Copy link
Author

leio10 commented Jun 2, 2021

oh, sorry @microstudi, that's why I did it on a different branch to avoid breaking anything. 😬

I was trying to organize everything a bit to have a clear plan to do the update the Barcelona decidim. It would be nice if you can create PRs from the release/0.24-stable-bcn branch to keep it updated.

leio10 pushed a commit that referenced this pull request Jun 30, 2021
Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Co-authored-by: Vera Rojman <vera@platoniq.net>
Co-authored-by: Ivan Vergés <ivan@platoniq.net>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>
leio10 pushed a commit that referenced this pull request Jun 30, 2021
Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Co-authored-by: Vera Rojman <vera@platoniq.net>
Co-authored-by: Ivan Vergés <ivan@platoniq.net>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>

bcn-budget-v0.24 to 0.24-stable-bcn (#12)

Fix modal pop up when project exceeds budget amount (#13)


Check amount in add to order command (#14)


Fix 'Add line command' (#15)


Restyle project vote button (#16)


Change literal of button when budget is voted (#17)


show loading spinner only if no modals will open

Fix voted budgets and title bar hidden by focus mode (#18)
leio10 pushed a commit that referenced this pull request Jul 22, 2021
Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Co-authored-by: Vera Rojman <vera@platoniq.net>
Co-authored-by: Ivan Vergés <ivan@platoniq.net>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>

bcn-budget-v0.24 to 0.24-stable-bcn (#12)

Fix modal pop up when project exceeds budget amount (#13)


Check amount in add to order command (#14)


Fix 'Add line command' (#15)


Restyle project vote button (#16)


Change literal of button when budget is voted (#17)


show loading spinner only if no modals will open

Fix voted budgets and title bar hidden by focus mode (#18)
leio10 pushed a commit that referenced this pull request Jul 22, 2021
Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Co-authored-by: Vera Rojman <vera@platoniq.net>
Co-authored-by: Ivan Vergés <ivan@platoniq.net>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>
microstudi added a commit that referenced this pull request Apr 5, 2022
* bcn-budget-v0.24 to 0.24-stable-bcn (#12)

Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Co-authored-by: Vera Rojman <vera@platoniq.net>
Co-authored-by: Ivan Vergés <ivan@platoniq.net>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>

* Fix modal pop up when project exceeds budget amount (#13)

* Check amount in add to order command (#14)

* Fix 'Add line command' (#15)

* Restyle project vote button (#16)

* Change literal of button when budget is voted (#17)

* show loading spinner only if no modals will open

* Fix voted budgets and title bar hidden by focus mode (#18)

Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Co-authored-by: Vera Rojman <vera@platoniq.net>
Co-authored-by: decidim-bot <decidim-bot@users.noreply.github.com>
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.

4 participants