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

add trusted-ids module #32

Merged
merged 39 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5e9ea39
Fix base64 gem version
laurajaime Apr 10, 2024
863da60
Fix base64 gem version
laurajaime Apr 10, 2024
a7b927d
Merge branch 'fix/base64_version' of github.com:ConsorciAOC/Decidim-C…
laurajaime Apr 10, 2024
3cc78d3
Fix base64 gem version
laurajaime Apr 10, 2024
cd08d10
Merge branch 'fix/base64_version' of github.com:ConsorciAOC/Decidim-C…
laurajaime Apr 10, 2024
21ce18c
add trusted-ids module
microstudi Apr 10, 2024
e3a61b2
add valid icon
microstudi Apr 10, 2024
07c027e
add oauth system test
microstudi Apr 11, 2024
4a6bd78
add oauth system test
microstudi Apr 11, 2024
b869925
Fix wicked_pdf version to 2.7.0
laurajaime Apr 16, 2024
310a779
Merge branch 'fix/wicked_pdf' into staging
laurajaime Apr 16, 2024
fc5e2cf
Add webpacker initializer
laurajaime Apr 16, 2024
cb70978
Merge branch 'fix/wicked_pdf' into staging
laurajaime Apr 16, 2024
6fba5af
Add missing translations of surveys
laurajaime Apr 16, 2024
4ab7c2d
Merge branch 'fix/wicked_pdf' into staging
laurajaime Apr 16, 2024
e79f68d
Add missing translations of surveys
laurajaime Apr 16, 2024
2939b49
Merge branch 'fix/wicked_pdf' into staging
laurajaime Apr 16, 2024
3d52017
Fix maps key in secrets file
tramuntanal Apr 26, 2024
36e3bb3
Merge branch 'fix/maps_key_in_secrets' of github.com:ConsorciAOC/Deci…
laurajaime Apr 29, 2024
7015088
Merge branch 'main' into add-trusted-ids
microstudi May 8, 2024
42f51fe
update gemfile
microstudi May 8, 2024
15d5d7b
Merge branch 'staging' into add-trusted-ids-staging
microstudi May 8, 2024
f080900
fix spec
microstudi May 8, 2024
1fb4064
fix spec
microstudi May 8, 2024
5bd5678
update trusted ids
microstudi May 30, 2024
5b2782a
Merge branch 'add-trusted-ids' into add-trusted-ids-staging
microstudi May 30, 2024
0e93d1a
fix strscan gem
microstudi May 30, 2024
9a46234
donwgrade net-smtp
microstudi May 30, 2024
0a15502
rubocop
microstudi May 31, 2024
f988b0b
adds reporting proposals module (fixmystreets)
microstudi Jun 12, 2024
6f87c98
fix rubocop issues
microstudi Jun 12, 2024
5aac618
remove extra tables
microstudi Jun 28, 2024
5e66f79
remove env var for deface
microstudi Jun 28, 2024
fae7064
restore overriden method name
microstudi Jun 28, 2024
8b8fb96
Use branch in reporting proposals module
laurajaime Oct 21, 2024
84f401c
Use release branch in reporting proposals module
laurajaime Oct 21, 2024
44be404
Temporal fix in translations
laurajaime Oct 21, 2024
ed8b659
More fixes...
laurajaime Oct 21, 2024
a62b1ed
Merge branch 'main' of github.com:ConsorciAOC/Decidim-Catalunya into …
laurajaime Oct 22, 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
5 changes: 0 additions & 5 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,6 @@ AllCops:
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 2.7

RSpec:
Patterns:
- "(?:^|/)spec/"
- "(?:^|/)test/"

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
EnforcedStyle: indent
Expand Down
18 changes: 12 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,32 @@
source "https://rubygems.org"

ruby RUBY_VERSION
DECIDIM_VERSION = { git: "https://github.com/CodiTramuntana/decidim.git", branch: "release/0.27-stable" }.freeze
DECIDIM_VERSION = { github: "CodiTramuntana/decidim", branch: "release/0.27-stable" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-conferences", DECIDIM_VERSION
gem "decidim-file_authorization_handler", git: "https://github.com/CodiTramuntana/decidim-file_authorization_handler.git", tag: "v0.27.1.7"
gem "decidim-file_authorization_handler", github: "CodiTramuntana/decidim-file_authorization_handler", tag: "v0.27.1.7"
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-templates", DECIDIM_VERSION

gem "decidim-decidim_awesome", "~> 0.10.0"
gem "decidim-via_oberta_authorization", path: "decidim-via_oberta_authorization"

gem "decidim-idcat_mobil", "~> 0.3.0"
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome", branch: "main"
tramuntanal marked this conversation as resolved.
Show resolved Hide resolved
# Simplified & mobile-first proposals creation (ie: fixmystreets behavior)
# gem "decidim-reporting_proposals", "~> 0.5.0"
gem "decidim-reporting_proposals", github: "CodiTramuntana/decidim-module-reporting-proposals", branch: "fix/missing_translations"
# VALiD & ViaOberta integration
gem "decidim-trusted_ids", github: "ConsorciAOC-PRJ/decidim-module-trusted-ids", branch: "main"

gem "decidim-cdtb"

gem "base64", "0.1.0"
gem "net-smtp", "~> 0.4.0"
gem "strscan", "3.0.0"

gem "bootsnap", "~> 1.3"
gem "wicked_pdf", "~> 2.7.0"

# Blob storage in the cloud

gem "azure-storage-blob"

gem "deface"
Expand Down
Loading
Loading