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

0.26 canada #27

Closed
wants to merge 12 commits into from
Closed

0.26 canada #27

wants to merge 12 commits into from

Conversation

microstudi
Copy link

@microstudi microstudi commented Sep 14, 2022

Branch with the backports required for the Green Party of Canada Decidim instance.

NOT TO MERGE

Backports:

microstudi and others added 8 commits August 26, 2022 22:31
* update ux for diff

* force update

* prevent arrays in diff

* fix methods in helper

* restore deleted method in helper

* fix errors

* Update diff_cell.rb

* use dig to avoid nil errors
* add  time_zone configutation to users

* add tests: time_zone in account_form

* add tests: update account with time_zone

* change default timezone

* change validates :time_zone and tests

* change validates :time_zone

* fix validates

* normalize locale, change validates time_zone in account_form

* add tests

* fix organization_time_zone

* add a couple of tests

Co-authored-by: antopalidi <[email protected]>
# Conflicts:
#	decidim-meetings/app/models/decidim/meetings/meeting.rb
…anada

# Conflicts:
#	decidim-meetings/app/models/decidim/meetings/meeting.rb
# Conflicts:
#	decidim-meetings/spec/models/meeting_spec.rb
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant