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

fix: Update About link in header #70

Merged
merged 2 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 7 additions & 35 deletions OVERLOADS.md
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
# Overrides

## Fix date display on meeting show view
When updating decidim date format from french to american format, date on meeting show view doesn't change
* `app/cells/decidim/author/date.erb`
```html
<%= l creation_date.to_date, format: :decidim_short %>
```

## Fix meetings orders in indexes
* `app/controllers/decidim/meetings/meetings_controller.rb`
* `app/controllers/decidim/meetings/directory/meetings_controller.rb`


## Load decidim-awesome assets only if dependencie is present
* `app/views/layouts/decidim/_head.html.erb:33`

## Fix geocoded proposals
* `app/controllers/decidim/proposals/proposals_controller.rb:44`
```ruby
@all_geocoded_proposals = @base_query.geocoded.where.not(latitude: Float::NAN, longitude: Float::NAN)
```

## Fix meetings registration serializer
* `app/serializers/decidim/meetings/registration_serializer.rb`
## Fix UserAnswersSerializer for CSV exports
* `lib/decidim/forms/user_answers_serializer.rb`

## 28c8d74 - Add basic tests to reference package (#1), 2021-07-26
* `lib/extends/commands/decidim/admin/create_participatory_space_private_user_extends.rb`
* `lib/extends/commands/decidim/admin/impersonate_user_extends.rb`

## cd5c2cc - Backport fix/user answers serializer (#11), 2021-09-30
* `lib/decidim/forms/user_answers_serializer.rb`
* `app/cells/decidim/tos_page/sticky_form.erb`

## Update layout for budgets view
* `app/views/decidim/budgets/projects/index.html.erb`
Delete filters on budget view, 2023-07-10

459d4d9 - Sign In cleanup, 2020-10-08

* `app/extends/devise/OmniauthCallbacksControllerExtend.rb`
Expand Down Expand Up @@ -123,20 +113,6 @@ f510f63 - Remove order reminder from Sidekiq configuration and comment REDIS_URL
* `lib/omniauth/strategies/nyc.rb`
7a005e1 - Merge branch 'develop', 2021-12-03

## Fix metrics issue in admin dashboard
- **app/stylesheets/decidim/vizzs/_areachart.scss**
```scss
.area{
fill: rgba($primary, .2);;
}
```

## Add FC Connect SSO
- **app/views/decidim/devise/shared/_omniauth_buttons.html.erb**
```ruby
<% if provider.match?("france") %>
```

* `app/views/decidim/scopes/picker.html.erb`
c76437f - Modify cancel button behaviour to match close button, 2022-02-08

Expand All @@ -151,7 +127,3 @@ de6d804 - fix multipart object tagging (#40) (#41), 2021-12-24

* `lib/tasks/restore_dump.rake`
705e0ad - Run rubocop, 2021-12-01

## Update layout for budgets view
* `app/views/decidim/budgets/projects/index.html.erb`
Delete filters on budget view, 2023-07-10
95 changes: 0 additions & 95 deletions app/controllers/decidim/meetings/directory/meetings_controller.rb

This file was deleted.

158 changes: 0 additions & 158 deletions app/controllers/decidim/meetings/meetings_controller.rb

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/layouts/decidim/_wrapper.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ end

<div class="topbar__user show-for-medium">
<div class="topbar__user__login js-append">
<a class="main-nav" href="/processes/Citywidepb">About</a>
<a class="main-nav" href="/processes/Citywidepb2023">About</a>
</div>
</div>
<div class="topbar__user show-for-medium">
Expand Down
3 changes: 1 addition & 2 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<<<<<<< HEAD
# How to contribute to the Decidim of the New York City
# How to contribute to the Decidim of the New York City

We're really glad you're reading this, you might be interested by the code source of the New York City Decidim application.

Expand Down