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

Update to version 0.10 #243

Merged
merged 25 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d7115a8
New feature: customizable etiquette rules (#1)
microstudi Oct 7, 2022
b0959f7
Merge branch 'decidim-ice:main' into main
microstudi Jan 9, 2023
743fc4f
Setup admin accountablity (#6)
antopalidi Jan 16, 2023
b043399
Merge branch 'main' of github.com:decidim-ice/decidim-module-decidim_…
microstudi Jan 23, 2023
7719858
Merge branch 'main' into develop
microstudi Jan 30, 2023
0666824
View and controllers (#7)
antopalidi Feb 1, 2023
fefd20a
Merge branch 'main' into develop
microstudi Feb 8, 2023
d5bccc9
Search and filtering (#8)
antopalidi Feb 17, 2023
6163113
Export excel/csv (#9)
antopalidi Feb 18, 2023
1a97b89
configurable roles from initializer (#10)
microstudi Feb 18, 2023
10958f9
Show superadmins in admin accountability (#12)
microstudi Feb 20, 2023
606734e
Admin accountability (#207)
microstudi Feb 20, 2023
e09e87e
Merge branch 'develop' of github.com:decidim-ice/decidim-module-decid…
microstudi Oct 6, 2023
5a99411
Merge branch 'main' into develop
microstudi Oct 6, 2023
9f4732c
Fix forced downcase in custom redirect urls (#240)
ElviaBth Nov 2, 2023
de30639
Graded proposal voting (#238)
microstudi Nov 2, 2023
a75b81d
add missing images
microstudi Nov 2, 2023
1493c7b
New Crowdin updates (#241)
pokecodebot Nov 3, 2023
43a61bd
allow to configure proposal sorting in the admin (#242)
microstudi Nov 3, 2023
a180288
New Crowdin updates (#244)
pokecodebot Nov 4, 2023
805f2fe
New Crowdin updates (#245)
pokecodebot Nov 9, 2023
4e6db57
generalize extra fields table for future uses (#247)
microstudi Nov 9, 2023
209cd1f
Merge branch 'main' into develop
microstudi Nov 9, 2023
6c5eaf6
prevent breaking if component is not included
microstudi Nov 13, 2023
a3858a4
downgrade bundler 2.7
microstudi Nov 13, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.5
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1

jobs:
lint-report:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.0.0
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/precompile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.5
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1

jobs:
lint-report:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

services:
postgres:
Expand All @@ -31,7 +31,7 @@ jobs:
DATABASE_HOST: localhost

steps:
- uses: actions/checkout@v2.0.0
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/tests-legacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ on:
pull_request:

env:
CI: 1
SIMPLECOV: 1
NODE_VERSION: 16.9.1
RUBY_VERSION: 2.7.7
BUNDLE_GEMFILE: Gemfile.legacy

jobs:
tests-legacy:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
Expand All @@ -25,6 +27,8 @@ jobs:
features: enabled
- rspec: system/*_spec.rb
features: enabled
- rspec: system/awesome_map
features: enabled
fail-fast: false

services:
Expand All @@ -44,7 +48,7 @@ jobs:
DATABASE_HOST: localhost

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -53,15 +57,17 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: actions/setup-node@master
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup Test App
run: bundle exec rake test_app

- name: General RSpec with config vars enabled
- name: General RSpec with config vars ${{ matrix.features }}
run: bundle exec rspec spec/${{ matrix.rspec }}
env:
FEATURES: ${{ matrix.features }}
SIMPLECOV: 1
CODECOV: 1

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ on:
pull_request:

env:
CI: 1
SIMPLECOV: 1
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.0.5
RUBY_VERSION: 3.0.6
BUNDLE_GEMFILE: Gemfile

jobs:
tests-latest:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
include:
Expand All @@ -25,6 +27,8 @@ jobs:
features: enabled
- rspec: system/*_spec.rb
features: enabled
- rspec: system/awesome_map
features: enabled
fail-fast: false

services:
Expand All @@ -44,7 +48,7 @@ jobs:
DATABASE_HOST: localhost

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 1

Expand All @@ -53,15 +57,17 @@ jobs:
ruby-version: ${{ env.RUBY_VERSION }}
bundler-cache: true

- uses: actions/setup-node@master
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup Test App
run: bundle exec rake test_app

- name: General RSpec with config vars enabled
- name: General RSpec with config vars ${{ matrix.features }}
run: bundle exec rspec spec/${{ matrix.rspec }}
env:
FEATURES: ${{ matrix.features }}
SIMPLECOV: 1
CODECOV: 1

- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
Expand Down
22 changes: 14 additions & 8 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
# frozen_string_literal: true

SimpleCov.start do
root ENV.fetch("ENGINE_ROOT", nil)
if ENV["SIMPLECOV"]
SimpleCov.start do
# We ignore some of the files because they are never tested
add_filter "/config/"
add_filter "/db/"
add_filter "lib/decidim/decidim_awesome/version.rb"
add_filter "/spec"
end

add_filter "lib/decidim/decidim_awesome/version.rb"
add_filter "/spec"
end

SimpleCov.command_name ENV.fetch("COMMAND_NAME", nil) || File.basename(Dir.pwd)
SimpleCov.merge_timeout 1800

SimpleCov.merge_timeout 1800
if ENV["CI"]
require "simplecov-cobertura"
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
end
end
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
CHANGELOG
=========

v0.10.0
------

Compatibility:
- Decidim v0.27.4
- Decidim v0.26.8

Features:
- Migrate to [Deface](https://github.com/spree/deface) for overrides
- Introduce Weighted Voting with configurable manifests for different types of votings with grades
- Fix wrong behaviour showing proposals on map
- Introduced new sorting options for proposals. Added alphabetical sorting, reverse sorting, sorting by votes first and last.

v0.9.3
------

Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ gem "decidim-decidim_awesome", path: "."
gem "bootsnap", "~> 1.4"

gem "puma", ">= 5.5.1"
gem "uglifier", "~> 4.1"

gem "faker", "~> 2.14"

Expand Down
Loading
Loading