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

Release Develop > Master #99

Merged
merged 25 commits into from
Sep 5, 2024
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
867d28f
fix: Modify default proposal states (#77)
Quentinchampenois Apr 18, 2024
9589201
feat: Addition of Extra User Fields Module (#79)
AyakorK May 2, 2024
40da147
feat: Add Friendly Signup (#78)
AyakorK May 2, 2024
44cfc45
feat: Add module budget booth (#81)
Quentinchampenois Jun 10, 2024
f6807e3
feat: Modules simple proposals & paper ballots (#82)
Quentinchampenois Jun 14, 2024
4391fe6
Merge branch 'master' into develop
Quentinchampenois Jun 14, 2024
f379315
feat: Add module budgets_importer (#84)
BarbaraOliveira13 Jun 14, 2024
31fd44b
fix: Override budgets importer projects index
Quentinchampenois Jun 17, 2024
26edb33
fix: incompat paper ballots and budgets importer
Quentinchampenois Jun 17, 2024
31df7c2
ci: ignore missing locales
Quentinchampenois Jun 17, 2024
d20edf3
Merge pull request #86 from OpenSourcePolitics/fix/budgets_importer
luciegrau Jun 24, 2024
ca40acf
fix: add french translation key for paper_ballot module (#88)
BarbaraOliveira13 Jun 24, 2024
8d962e8
fix:budget_importer (#89)
BarbaraOliveira13 Jun 26, 2024
05d840b
bump: Bump of simple proposal module (#90)
luciegrau Aug 1, 2024
1ecd4b6
fix: Downgrade wicked pdf (#91)
AyakorK Aug 7, 2024
185fddd
chore: Update docker compose command
Quentinchampenois Aug 9, 2024
f41e07e
fix(config): Force Rack attack to false
Quentinchampenois Aug 9, 2024
f1950f7
Upgrade decidim-custom_proposal_states (#92)
alecslupu Aug 12, 2024
1243e54
Update awesome with private fields (#93)
microstudi Aug 20, 2024
92170a7
fix: migration FixReferenceForAllResources when table does not exists
moustachu Aug 21, 2024
2f7bb08
bump fix notifications and mails send after voting (#96)
BarbaraOliveira13 Aug 26, 2024
32db02a
Bump: simple_proposal update (#97)
Stef-Rousset Aug 29, 2024
e6de726
Fix: Bump Decidim Awesome module (#95)
luciegrau Aug 29, 2024
71773a8
Fix export dropdown in admin proposals index (#98)
Stef-Rousset Aug 30, 2024
14bd3ed
Bump simple proposal module (#100)
luciegrau Sep 3, 2024
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
4 changes: 4 additions & 0 deletions .env-example
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ BACKUP_S3SYNC_ACCESS_KEY=
BACKUP_S3SYNC_SECRET_KEY=
BACKUP_S3SYNC_BUCKET=
BACKUP_S3RETENTION_ENABLED=
FRIENDLY_SIGNUP_OVERRIDE_PASSWORDS=1
FRIENDLY_SIGNUP_INSTANT_VALIDATION=1
FRIENDLY_SIGNUP_HIDE_NICKNAME=1
FRIENDLY_SIGNUP_USE_CONFIRMATION_CODES=1

# timeout session (in minutes)
DECIDIM_SESSION_TIMEOUT=
Expand Down
10 changes: 9 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@ gem "dotenv-rails", require: "dotenv/rails-now"
gem "decidim", "~> #{DECIDIM_VERSION}.0"

# External Decidim gems
gem "decidim-budgets_booth", github: "OpenSourcePolitics/decidim-module-ptp"
gem "decidim-budgets_importer", git: "https://github.com/OpenSourcePolitics/decidim-module-budgets_importer.git", branch: "main"
gem "decidim-budgets_paper_ballots", git: "https://github.com/digidemlab/decidim-module-budgets_paper_ballots"

gem "decidim-cache_cleaner"
gem "decidim-custom_proposal_states", git: "https://github.com/alecslupu-pfa/decidim-module-custom_proposal_states", branch: DECIDIM_BRANCH
gem "decidim-decidim_awesome", "~> 0.9.1"
gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: DECIDIM_BRANCH
gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: DECIDIM_BRANCH
gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
gem "decidim-simple_proposal", git: "https://github.com/opensourcepolitics/decidim-module-simple_proposal.git", branch: DECIDIM_BRANCH
gem "decidim-slider", git: "https://github.com/OpenSourcePolitics/decidim-module-slider", branch: "rc/0.27"
gem "decidim-spam_detection", "4.0.0"
gem "decidim-term_customizer", git: "https://github.com/opensourcepolitics/decidim-module-term_customizer.git", branch: "fix/multi-threading-compliant"
Expand All @@ -41,6 +48,7 @@ gem "sidekiq", "~> 6.0"
gem "sidekiq_alive", "~> 2.2"
gem "sidekiq-scheduler", "~> 5.0"
gem "sys-filesystem"
gem "wicked_pdf", "2.6.3"

group :development do
gem "listen", "~> 3.1"
Expand Down
Loading
Loading