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

Syncing it up #114

Closed
wants to merge 51 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c5887fb
feat: Add custom proposal states
Quentinchampenois Dec 22, 2023
6a6db38
fix: Default filter params on proposals controller
Quentinchampenois Dec 22, 2023
db9cccb
lint: Fix rubocop offenses
Quentinchampenois Dec 22, 2023
a2e3d08
fix: PP specs
Quentinchampenois Dec 22, 2023
bc942d9
fix: Explore meetings system specs
Quentinchampenois Dec 22, 2023
88747d6
Merge pull request #92 from OpenSourcePolitics/feat/custom_proposals_…
simonaszilinskas Dec 22, 2023
f0109be
Merge branch 'master' into develop
Quentinchampenois Jan 3, 2024
8b406ee
feat Bump Modules and add migrations
simonaszilinskas Jan 3, 2024
d54b80f
revert: Downgrade Decidim version (#95)
Quentinchampenois Jan 3, 2024
1235668
fix: Make the Half Signup TOS configurable with env var
Quentinchampenois Jan 15, 2024
3ad9a8a
fix: Button budgets projects focus on click
Quentinchampenois Jan 15, 2024
8db1071
fix: Add Rails secret for half signup TOS
Quentinchampenois Jan 16, 2024
486585e
fix: Remove Google translate bar when loaded
Quentinchampenois Jan 16, 2024
16c0875
fix: Change budgets_booth upstream branch
Quentinchampenois Jan 16, 2024
1c25c73
fix: Bump module budgets booth
Quentinchampenois Jan 17, 2024
1094f23
fix: Update budgets booth revision
Quentinchampenois Jan 17, 2024
37d9a0f
fix: Fix button add vote in modal
Quentinchampenois Jan 18, 2024
c14ff06
Merge pull request #98 from OpenSourcePolitics/fix/custos_graphiques
simonaszilinskas Jan 18, 2024
65753e5
fix: warning on gems dependencies (#99)
moustachu Jan 19, 2024
5342106
Merge branch 'master' into develop
moustachu Jan 19, 2024
a96607b
bump half sign up to have phone numeric keyboard
simonaszilinskas Jan 30, 2024
4e735b8
Bump CI to ruby 2.7.7
moustachu Jan 30, 2024
f29f431
Merge pull request #101 from OpenSourcePolitics/feature/phone-numeric…
simonaszilinskas Jan 30, 2024
535e2d3
Update the dependencies to latest version
alecslupu Feb 5, 2024
ac348e2
Merge branch 'chore/update-gems' of https://github.com/alecslupu-pfa/…
moustachu Feb 8, 2024
ea7d02d
fix: Refactor language selector for consistent accessibility (#103)
simonaszilinskas Mar 19, 2024
c79fbd1
fix: Update module half signup & module custom proposal states
Quentinchampenois Apr 9, 2024
a32fc54
fix: Bump module ptp
Quentinchampenois Apr 9, 2024
1f0cb2c
fix: Change homepage proposals upstream
Quentinchampenois Apr 9, 2024
9259b2f
fix: Update Half Signup initializer
Quentinchampenois Apr 9, 2024
c30b0b2
fix: Ensure cancel voting button is not present
Quentinchampenois Apr 9, 2024
d4745f1
feat: Bump half signup
Quentinchampenois Apr 10, 2024
1b9e5c9
bump: Half signup
Quentinchampenois Apr 10, 2024
32dc51b
feat: Add budget booth x Half Signup
Quentinchampenois Apr 10, 2024
db23f43
refactor: Gems order
Quentinchampenois Apr 10, 2024
f48e386
fix: Remove deprecated system specs
Quentinchampenois Apr 10, 2024
84f57c3
feat: Use half signup feat/budget_booth_0.26
Quentinchampenois Apr 10, 2024
b4aa53a
feat: Enhancements and modules bumps
Quentinchampenois Apr 10, 2024
cc80f61
backport: Fix decidim-templates usage (#12536)
moustachu Apr 10, 2024
9e93403
backport: Fix decidim-templates dep
Quentinchampenois Apr 11, 2024
38504f2
fix: Remove budgets index view overrides (#107)
simonaszilinskas Apr 19, 2024
eec94bf
revert to the old version of halfsignup until the new one is compatible
simonaszilinskas Apr 29, 2024
67505ed
fix: Bump homepage proposals
Quentinchampenois May 31, 2024
a32fdb2
Update half_sign_up and budgets_booth
alecslupu Jun 5, 2024
8fcbd7a
Merge pull request #111 from alecslupu-pfa/feature/update-half-signup
simonaszilinskas Jun 6, 2024
17295b1
Update homepage propopsals
alecslupu Jun 15, 2024
d534f07
Merge pull request #112 from alecslupu-pfa/fix/homepage-proposals
simonaszilinskas Jun 17, 2024
a6f1da6
Update _language_chooser.html.erb
simonaszilinskas Jun 17, 2024
39e3a01
Merge pull request #113 from OpenSourcePolitics/navbar-language-choos…
simonaszilinskas Jun 19, 2024
c441c45
Hardcode the In-person Workshop Idea translation because it doesn't r…
simonaszilinskas Oct 7, 2024
d33c86a
Merge pull request #116 from OpenSourcePolitics/translation-in-person…
simonaszilinskas Oct 8, 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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [ push ]
env:
CI: "true"
SIMPLECOV: "true"
RUBY_VERSION: 2.7.1
RUBY_VERSION: 2.7.7
RAILS_ENV: test
NODE_VERSION: 16.9.1
RUBYOPT: '-W:no-deprecated'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ ruby RUBY_VERSION
gem "decidim", "~> #{DECIDIM_VERSION}.0"
gem "decidim-conferences", "~> #{DECIDIM_VERSION}.0"

# gem "acts_as_textcaptcha", "~> 4.5.1"
gem "acts_as_textcaptcha", "~> 4.5.1"
gem "decidim-budgets_paper_ballots", git: "https://github.com/digidemlab/decidim-module-budgets_paper_ballots", branch: DECIDIM_BRANCH
gem "decidim-decidim_awesome"
gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up", branch: DECIDIM_BRANCH
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
gem "decidim-homepage_proposals", git: "https://github.com/alecslupu-pfa/decidim-module_homepage_proposals", branch: "feature/reset-filters"
gem "decidim-homepage_proposals", git: "https://github.com/alecslupu-pfa/decidim-module_homepage_proposals", branch: "fix/scopes-filter"
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH
gem "decidim-slider", git: "https://github.com/alecslupu-pfa/decidim-module-slider", branch: "main"
gem "decidim-spam_detection"
Expand All @@ -27,7 +26,8 @@ gem "decidim-smsauth", github: "OpenSourcePolitics/decidim-module-ptp", branch:
gem "decidim-sms-twilio", github: "OpenSourcePolitics/decidim-module-ptp", branch: "feature/0.26/zip-code-voting"

# NOTE: Custom proposal states must be before simple_proposal
gem "decidim-custom_proposal_states", git: "https://github.com/alecslupu-pfa/decidim-module-custom_proposal_states", branch: "chore/fix-module-dependency"
gem "decidim-custom_proposal_states", git: "https://github.com/alecslupu-pfa/decidim-module-custom_proposal_states", branch: DECIDIM_BRANCH
gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up", branch: "feat/budget_booth_0.26"
gem "decidim-simple_proposal", git: "https://github.com/mainio/decidim-module-simple_proposal", branch: DECIDIM_BRANCH

gem "dotenv-rails"
Expand Down
Loading
Loading