Compare commits

...

6 Commits

19 changed files with 122 additions and 43 deletions

View File

@ -1,5 +1,5 @@
{
"version": "0.23.1-210130",
"version": "0.24.0-210327",
"meta": {
"title": "Decidim",
"desc-cs": "Platforma pro účast občanů",
@ -8,7 +8,7 @@
},
"containers": {
"decidim": {
"image": "decidim_0.23.1-210130",
"image": "decidim_0.24.0-210327",
"depends": [
"decidim-postgres"
],

View File

@ -1,4 +1,4 @@
IMAGE decidim_0.23.1-210130
IMAGE decidim_0.24.0-210327
FROM decidim-nginx_1.18.0-210106
# https://github.com/Platoniq/decidim-install/blob/master/decidim-bionic.md
@ -11,11 +11,11 @@ RUN EOF
apk --no-cache add imagemagick libpq nodejs procps tzdata
# Install build dependencies
apk --no-cache add --virtual .deps build-base git libxml2-dev libxslt-dev postgresql-dev zlib-dev
apk --no-cache add --virtual .deps build-base git libxml2-dev libxslt-dev linux-headers postgresql-dev zlib-dev
# Install Decidim
bundle config build.nokogiri --use-system-libraries
gem install decidim
gem install decidim -v 0.24.0
cd /srv
decidim decidim-app
EOF

View File

@ -4,25 +4,26 @@ source "https://rubygems.org"
ruby RUBY_VERSION
gem "decidim", "0.23.1"
gem "decidim-conferences", "0.23.1"
gem "decidim-consultations", "0.23.1"
gem "decidim-initiatives", "0.23.1"
# gem "decidim-templates", "0.23.1"
gem "decidim", "0.24.0"
gem "decidim-conferences", "0.24.0"
gem "decidim-consultations", "0.24.0"
# gem "decidim-elections", "0.24.0"
gem "decidim-initiatives", "0.24.0"
# gem "decidim-templates", "0.24.0"
gem "bootsnap", "~> 1.3"
gem "puma", ">= 4.3.5"
gem "puma", ">= 5.0.0"
gem "uglifier", "~> 4.1"
gem "faker", "~> 1.9"
gem "faker", "~> 2.14"
gem "wicked_pdf", "~> 1.4"
group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
gem "decidim-dev", "0.23.1"
gem "decidim-dev", "0.24.0"
end
group :development do
@ -41,25 +42,25 @@ group :production do
end
# Modules
# gem "decidim-access_requests", github: "mainio/decidim-module-access_requests" # Supported until 0.22.0
# gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator" # Supported until 0.22.0, not indended for production use
# gem "decidim-access_requests", github: "mainio/decidim-module-access_requests" # Supported until 0.23.0.dev
# gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator" # Supported until 0.23.0, not indended for production use
# gem "decidim-antivirus", github: "mainio/decidim-module-antivirus" # Supported until 0.22.0
# gem "decidim-budgets_enhanced", github: "OpenSourcePolitics/decidim-module-budgets_enhanced", branch: "0.22-dev" # Supported until 0.19.0, development branch exists up to 0.22.0
gem "decidim-calendar", github: "alabs/decidim-module-calendar"
gem "decidim-comparative_stats", github: "Platoniq/decidim-module-comparative_stats"
# gem "decidim-cookies", github: "OpenSourcePolitics/decidim-module_cookies" # Supported until 0.21.0
gem "decidim-decidim_awesome", github: "Platoniq/decidim-module-decidim_awesome"
# gem "decidim-department_admin", github: "gencat/decidim-department-admin" # Supported until 0.21.0
# gem "decidim-cookies", github: "OpenSourcePolitics/decidim-module_cookies" # Supported until 0.22.0
# gem "decidim-decidim_awesome", github: "Platoniq/decidim-module-decidim_awesome" # Supported until 0.23.3
# gem "decidim-department_admin", github: "gencat/decidim-department-admin" # Supported until 0.23.0
gem "decidim-direct_verifications", github: "Platoniq/decidim-verifications-direct_verifications"
# gem "decidim-favorites", github: "mainio/decidim-module-favorites" # Required by ideas, plans
# gem "decidim-feedback", github: "mainio/decidim-module-feedback" # Required by ideas
# gem "decidim-ideas", github: "mainio/decidim-module-ideas" # Supported until 0.23.0, has graphql dependency problems
gem "decidim-ldap", github: "diputacioBCN/decidim-diba", glob: "decidim-ldap/decidim-ldap.gemspec"
gem "decidim-navbar_links", github: "OpenSourcePolitics/decidim-module-navbar_links", branch: "0.23-stable"
gem "decidim-navigation_maps", github: "Platoniq/decidim-module-navigation_maps"
# gem "decidim-ldap", github: "diputacioBCN/decidim-diba", glob: "decidim-ldap/decidim-ldap.gemspec" # Supported until 0.18.0, working until 0.23.3
# gem "decidim-navbar_links", github: "OpenSourcePolitics/decidim-module-navbar_links", branch: "0.23-stable" # Supported until 0.23.2
# gem "decidim-navigation_maps", github: "Platoniq/decidim-module-navigation_maps" # Supported until 0.23.3
# gem "decidim-plans", github: "mainio/decidim-module-plans" # Supported until 0.22.0
# gem "decidim-process_groups_content_block", github: "mainio/decidim-module-process_groups_content_block" # Supported until 0.22.0
# gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer" # Supported until 0.22.0
# gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer" # Supported until 0.23.0
gem "decidim-time_tracker", github: "Platoniq/decidim-module-time_tracker", branch: "main"
# gem "decidim-unique_identity", github: "OpenSourcePolitics/decidim-module-unique-identity" # Supported until 0.18.0
gem "decidim-url_aliases", github: "OpenSourcePolitics/decidim-urlaliases"

View File

@ -14,16 +14,16 @@ Decidim.configure do |config|
# of languages will be equal or a subset of the list in this file.
config.available_locales = [:cs, :sk, :en, :de, :fr, :es]
# Restrict access to the system part with an authorized ip list.
# You can use a single ip like ("1.2.3.4"), or an ip subnet like ("1.2.3.4/24")
# You may specify multiple ip in an array ["1.2.3.4", "1.2.3.4/24"]
# config.system_accesslist_ips = ["127.0.0.1"]
# Sets the default locale for new organizations. When creating a new
# organization from the System area, system admins will be able to overwrite
# this value for that specific organization.
config.default_locale = :cs
# Restrict access to the system part with an authorized ip list.
# You can use a single ip like ("1.2.3.4"), or an ip subnet like ("1.2.3.4/24")
# You may specify multiple ip in an array ["1.2.3.4", "1.2.3.4/24"]
# config.system_accesslist_ips = ["127.0.0.1"]
# Defines a list of custom content processors. They are used to parse and
# render specific tags inside some user-provided content. Check the docs for
# more info.
@ -32,10 +32,71 @@ Decidim.configure do |config|
# Whether SSL should be enabled or not.
# config.force_ssl = true
# Geocoder configuration
# Map and Geocoder configuration
#
# == HERE Maps ==
# config.maps = {
# provider: :here,
# api_key: Rails.application.secrets.maps[:api_key],
# static: { url: "https://image.maps.ls.hereapi.com/mia/1.6/mapview" }
# }
#
# == OpenStreetMap (OSM) services ==
# To use the OSM map service providers, you will need a service provider for
# the following map servers or host all of them yourself:
# - A tile server for the dynamic maps
# (https://wiki.openstreetmap.org/wiki/Tile_servers)
# - A Nominatim geocoding server for the geocoding functionality
# (https://wiki.openstreetmap.org/wiki/Nominatim)
# - A static map server for static map images
# (https://github.com/jperelli/osm-static-maps)
#
# When used, please read carefully the terms of service for your service
# provider.
#
# config.maps = {
# provider: :osm,
# api_key: Rails.application.secrets.maps[:api_key],
# dynamic: {
# tile_layer: {
# url: "https://tiles.example.org/{z}/{x}/{y}.png?key={apiKey}&{foo}",
# api_key: true,
# foo: "bar=baz",
# attribution: %(
# <a href="https://www.openstreetmap.org/copyright" target="_blank">&copy; OpenStreetMap</a> contributors
# ).strip
# # Translatable attribution:
# # attribution: -> { I18n.t("tile_layer_attribution") }
# }
# },
# static: { url: "https://staticmap.example.org/" },
# geocoding: { host: "nominatim.example.org", use_https: true }
# }
#
# == Combination (OpenStreetMap default + HERE Maps dynamic map tiles) ==
# config.maps = {
# provider: :osm,
# api_key: Rails.application.secrets.maps[:api_key],
# dynamic: {
# provider: :here,
# api_key: Rails.application.secrets.maps[:here_api_key]
# },
# static: { url: "https://staticmap.example.org/" },
# geocoding: { host: "nominatim.example.org", use_https: true }
# }
# Geocoder configurations if you want to customize the default geocoding
# settings. The maps configuration will manage which geocoding service to use,
# so that does not need any additional configuration here. Use this only for
# the global geocoder preferences.
# config.geocoder = {
# static_map_url: "https://image.maps.ls.hereapi.com/mia/1.6/mapview",
# here_api_key: Rails.application.secrets.geocoder[:here_api_key]
# # geocoding service request timeout, in seconds (default 3):
# timeout: 5,
# # set default units to kilometers:
# units: :km,
# # caching (see https://github.com/alexreisner/geocoder#caching for details):
# cache: Redis.new,
# cache_prefix: "..."
# }
# Custom resource reference generator method. Check the docs for more info.
@ -51,12 +112,6 @@ Decidim.configure do |config|
# processed by Decidim, this value helps reduce the size of the files.
# config.image_uploader_quality = 80
# The maximum file size of an attachment
# config.maximum_attachment_size = 10.megabytes
# The maximum file size for a user avatar
# config.maximum_avatar_size = 10.megabytes
# The number of reports which a resource can receive before hiding it
# config.max_reports_before_hiding = 3
@ -90,13 +145,6 @@ Decidim.configure do |config|
# Time window were users can access the website even if their email is not confirmed.
# config.unconfirmed_access_for = 2.days
# Etherpad configuration. Check the docs for more info.
# config.etherpad = {
# server: <your url>,
# api_key: <your key>,
# api_version: <your version>
# }
# A base path for the uploads. If set, make sure it ends in a slash.
# Uploads will be set to `<base_path>/uploads/`. This can be useful if you
# want to use the same uploads place for both staging and production
@ -200,6 +248,36 @@ Decidim.configure do |config|
# radio buttons collection input field form for a Decidim::Component
# step setting :amendments_visibility.
# config.amendments_visibility_options = %w(all participants)
# Machine Translation Configuration
#
# Enable machine translations
config.enable_machine_translations = false
#
# If you want to enable machine translation you can create your own service
# to interact with third party service to translate the user content.
#
# An example class would be something like:
#
# class MyTranslationService
# attr_reader :text, :original_locale, :target_locale
#
# def initialize(text, original_locale, target_locale)
# @text = text
# @original_locale = original_locale
# @target_locale = target_locale
# end
#
# def translate
# # Actual code to translate the text
# end
# end
#
# config.machine_translation_service = "MyTranslationService"
# Defines the name of the cookie used to check if the user allows Decidim to
# set cookies.
# config.consent_cookie_name = "decidim-cc"
end
Rails.application.config.i18n.available_locales = Decidim.available_locales