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.

Sign up for GitHub

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

Develop into master #84

Merged
merged 18 commits into from
Dec 14, 2023
Merged

Develop into master #84

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d717718
bump homepage proposals
simonaszilinskas Nov 16, 2023
7bf2c97
Merge pull request #76 from OpenSourcePolitics/master
simonaszilinskas Nov 16, 2023
4c11bc9
rubocop
moustachu Nov 16, 2023
d8595d7
Merge pull request #78 from OpenSourcePolitics/temporary-bump
simonaszilinskas Nov 17, 2023
7cb9023
Update the module with the fix
simonaszilinskas Nov 23, 2023
bbdd0cf
fix how the bump is done
simonaszilinskas Nov 27, 2023
4bf0866
fix: Bump module homepage proposals (#79)
simonaszilinskas Nov 27, 2023
9564016
Update of the branch for homepage proposals
simonaszilinskas Nov 29, 2023
1ecadd8
Homepage proposals 2.0 fix (#80)
simonaszilinskas Nov 29, 2023
a714dec
Filter reset when changing category or scope
simonaszilinskas Nov 30, 2023
3311b1e
Merge branch 'develop' into homepage-proposals-2.0-fix
moustachu Nov 30, 2023
30ae5a3
fix: Multi-threading compliant term customizer
simonaszilinskas Nov 30, 2023
a7bea19
Merge pull request #81 from OpenSourcePolitics/homepage-proposals-2.0…
simonaszilinskas Nov 30, 2023
fba88bd
Urgent mini-bump
simonaszilinskas Dec 1, 2023
db9c3d1
add application override to proposal_m_cell.rb (#85)
simonaszilinskas Dec 11, 2023
9e8ae6f
feat: filter bad search bot in NGINX
moustachu Dec 11, 2023
d5a865b
Making card paragraph shorter in proposal_m_cell.rb
simonaszilinskas Dec 14, 2023
8a2789c
Merge branch 'master' into develop
moustachu Dec 14, 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
5 changes: 3 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ gem "decidim-budgets_paper_ballots", git: "https://github.com/digidemlab/decidim
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/OpenSourcePolitics/decidim-module_homepage_proposals.git", branch: DECIDIM_BRANCH
# gem "decidim-homepage_proposals", git: "https://github.com/OpenSourcePolitics/decidim-module_homepage_proposals.git", branch: DECIDIM_BRANCH
gem "decidim-homepage_proposals", git: "https://github.com/alecslupu-pfa/decidim-module_homepage_proposals", branch: "feature/reset-filters"
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH
gem "decidim-simple_proposal", git: "https://github.com/mainio/decidim-module-simple_proposal", branch: DECIDIM_BRANCH
gem "decidim-slider", git: "https://github.com/alecslupu-pfa/decidim-module-slider", branch: "main"
gem "decidim-spam_detection"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: DECIDIM_BRANCH
gem "decidim-term_customizer", git: "https://github.com/opensourcepolitics/decidim-module-term_customizer.git", branch: "fix/multi-threading-compliant-0.26"

gem "dotenv-rails"

Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ GIT
rgeo (~> 2.4)
rgeo-proj4 (~> 3.1)

GIT
remote: https://github.com/OpenSourcePolitics/decidim-module_homepage_proposals.git
revision: 3e17f0fe9403ea222f6c3f279a2ed264cc6109a5
branch: release/0.26-stable
specs:
decidim-homepage_proposals (1.0.2)
decidim-core (~> 0.26)

GIT
remote: https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler
revision: 488cc8827845ec1c5266aa499df2ebf9b20e02a3
Expand Down Expand Up @@ -58,6 +50,14 @@ GIT
decidim-slider (0.0.2)
decidim-core (~> 0.26.0)

GIT
remote: https://github.com/alecslupu-pfa/decidim-module_homepage_proposals
revision: 37ac5b73893ab532e06729bef6f5d3b4b6553f35
branch: feature/reset-filters
specs:
decidim-homepage_proposals (1.0.2)
decidim-core (~> 0.26)

GIT
remote: https://github.com/digidemlab/decidim-module-budgets_paper_ballots
revision: 3e5d2794f43b1c353e8a3116edf6daab9e3a26a7
Expand All @@ -77,9 +77,9 @@ GIT
decidim-proposals (~> 0.26.0)

GIT
remote: https://github.com/mainio/decidim-module-term_customizer.git
revision: f0d720710822f1231ea249dd71f978143d38a6c4
branch: release/0.26-stable
remote: https://github.com/opensourcepolitics/decidim-module-term_customizer.git
revision: f5208f3cad23cb68e502e77cb0d2d3d441d09e40
branch: fix/multi-threading-compliant-0.26
specs:
decidim-term_customizer (0.26.0)
decidim-admin (~> 0.26.0)
Expand Down
Loading