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

wip: update decidim 0.28.0 #596

Draft
wants to merge 120 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
79f374c
wip: update decidim 0.28.0
ayuki-joto Mar 13, 2024
a5248f9
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Mar 18, 2024
6c136cd
wip: add packages
ayuki-joto Mar 18, 2024
c062867
wip: add decidim icons
ayuki-joto Mar 18, 2024
103c99a
wip: update packs
ayuki-joto Mar 18, 2024
652974b
wip: update check.yaml
ayuki-joto Mar 18, 2024
54207c3
fix: spec
ayuki-joto Mar 18, 2024
353a726
remove Capybara settings in rails_helper.rb
takahashim Mar 18, 2024
8d6c754
copy user_profile_spec.rb from v0.28.0
takahashim Mar 18, 2024
7b5728e
copy .rubocop.yml from Decidim v0.28.0
takahashim Mar 18, 2024
79c7cdc
ruboop: ignore some files
takahashim Mar 18, 2024
db24585
ruboop: ignore some cops
takahashim Mar 18, 2024
72f1824
rubocop -a
takahashim Mar 18, 2024
6495113
remove unused rubocop yamls
takahashim Mar 18, 2024
74b3b6e
fix panolint error
takahashim Mar 18, 2024
c52fdff
Merge pull request #27 from takahashim/remove-capybara-settings
ayuki-joto Mar 19, 2024
6b6b5cc
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Mar 19, 2024
3c1ddff
fix: conflict
ayuki-joto Mar 19, 2024
10eabae
fix: bundler version
ayuki-joto Mar 19, 2024
de6dd40
Merge branch 'feat/update-decidim-0-28-0' into fix-rubocop
ayuki-joto Mar 19, 2024
e8e51fd
Merge pull request #28 from takahashim/fix-rubocop
ayuki-joto Mar 19, 2024
e6b4c02
fix: rubocop
ayuki-joto Mar 19, 2024
abb22c3
fix: add packages
ayuki-joto Mar 19, 2024
dffb9c6
feat: update gems
ayuki-joto Apr 3, 2024
e4f541a
feat: update packages
ayuki-joto Apr 3, 2024
154a9c7
feat: add csp settings
ayuki-joto Apr 5, 2024
3c16a54
fix css for admin
takahashim Apr 5, 2024
b3653de
resolve rubocop warnings
takahashim Apr 5, 2024
f8f8db0
Merge pull request #29 from takahashim/fix-admin-css
ayuki-joto Apr 6, 2024
68f6b18
refactor: update packages
ayuki-joto Apr 6, 2024
680e95f
copy app/packs/src/decidim/editor/extensions/decidim_kit
takahashim Apr 7, 2024
2ee0f29
copy app/packs/src/decidim/editor/toolbar.js
takahashim Apr 7, 2024
ebc76a6
Add HtmlEdit extension for Tiptap
takahashim Apr 7, 2024
3dcd5df
fix to add popupContainer
takahashim Apr 7, 2024
d450c33
fix style
takahashim Apr 7, 2024
3421dae
add missing locale
takahashim Apr 7, 2024
3ece869
fix tag handling from/to editor
takahashim Apr 7, 2024
4e2c8a6
remove files for quill
takahashim Apr 7, 2024
e39a81c
Merge pull request #30 from takahashim/custom-html-edit
ayuki-joto Apr 7, 2024
dd4eae9
copy from v0.28.0
takahashim Apr 8, 2024
38e744c
fix options
takahashim Apr 8, 2024
dc25ee1
rubocop: ignore rule `RSpec/Rails/NegationBeValid`
takahashim Apr 8, 2024
aabfda0
WIP
takahashim Apr 8, 2024
73e351e
support user_extension
takahashim Apr 8, 2024
3c4be9b
fix locale
takahashim Apr 8, 2024
4549505
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Apr 8, 2024
bf2e49a
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Apr 8, 2024
62f1ae8
add decidim-user_extension
takahashim Apr 8, 2024
f76c0fd
fix decidim-user_extension
takahashim Apr 8, 2024
3cde068
shakapacker: add load path
takahashim Apr 8, 2024
76f90e7
load css
takahashim Apr 8, 2024
e2cff45
fix locale
takahashim Apr 8, 2024
7fbf15b
update view
takahashim Apr 8, 2024
c441137
fix specs
takahashim Apr 8, 2024
9cae951
fix specs for decidim-comments (comment order)
takahashim Apr 10, 2024
8a7c909
Merge pull request #31 from takahashim/fix-specs-v028
ayuki-joto Apr 12, 2024
afdbe57
Merge pull request #32 from takahashim/fix-specs-v028-2
ayuki-joto Apr 12, 2024
8d2d545
Merge branch 'feat/update-decidim-0-28-0' of github.com:ayuki-joto/de…
ayuki-joto Apr 12, 2024
e1b273d
refactor: fix lint
ayuki-joto Apr 12, 2024
48ddf2f
copy from v0.28.0
takahashim Apr 12, 2024
ba5fbd3
Use full name of class `AssemblyPresenter`
takahashim Apr 12, 2024
e73d875
ditto
takahashim Apr 15, 2024
0c6fb61
Merge pull request #33 from takahashim/fix-assembly-presenter
ayuki-joto Apr 16, 2024
89f3f50
refactor: add polis
ayuki-joto Apr 19, 2024
d2f3792
feat: update decidim v 0.28.1
ayuki-joto Jun 3, 2024
f2314f4
update DEVELOPMENT.md for 0.28.1
takahashim Jun 10, 2024
33ed046
force to use :ja locale
takahashim Jun 14, 2024
02108de
Merge pull request #35 from takahashim/fix-locale-in-specs
ayuki-joto Jun 17, 2024
31593e6
Merge pull request #34 from takahashim/fix-doc-0-28-1
ayuki-joto Jun 17, 2024
0c8165b
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Jul 9, 2024
57b865d
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Jul 16, 2024
8197eab
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Jul 31, 2024
5429507
fix: update lock file
ayuki-joto Jul 31, 2024
8f203a2
fix: update lock file
ayuki-joto Jul 31, 2024
892fe95
fix: refactor update lint
ayuki-joto Aug 1, 2024
34511f2
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Aug 6, 2024
b14e672
Use postgresql image in ghcr.io/codeforjapan
takahashim Aug 5, 2024
8fe26b9
Merge pull request #36 from takahashim/fix-028
ayuki-joto Aug 26, 2024
0487341
Merge branch 'main' into fix-028-b
takahashim Aug 26, 2024
50afa4a
Merge pull request #37 from takahashim/fix-028-b
ayuki-joto Aug 27, 2024
861a2ec
Merge branch 'feat/update-decidim-0-28-0' of github.com:ayuki-joto/de…
ayuki-joto Aug 27, 2024
18778e7
fix: refactor fix conflict migrations
ayuki-joto Aug 28, 2024
0a9871f
dcp_loginの28系への対応
sion908 Nov 18, 2024
bd7c7e9
WIP
takahashim Nov 18, 2024
845e51d
bin/rails decidim:upgrade
takahashim Nov 18, 2024
4c30234
fix rubocop
takahashim Nov 18, 2024
f142562
refactor: update css
ayuki-joto Nov 25, 2024
92507d2
add p7zip
takahashim Nov 25, 2024
3fff1f0
use @geoman-io/leaflet-geoman-free v2.14.2
takahashim Nov 25, 2024
4e8f9c7
Merge pull request #39 from takahashim/update-0283
ayuki-joto Nov 26, 2024
ce637f6
fbのアイコンがいるらしい
sion908 Nov 30, 2024
fdce077
refactor: update decidim awe_some
ayuki-joto Dec 3, 2024
c1e0fb5
アイコン周りのしょり
sion908 Dec 9, 2024
217564c
Merge pull request #38 from TheDesignium/28
ayuki-joto Dec 10, 2024
d82f01c
Merge branch 'main' of github.com:ayuki-joto/decidim-cfj into feat/up…
ayuki-joto Dec 10, 2024
d243a70
refactor: fix conflict
ayuki-joto Dec 10, 2024
75d2acf
Add new content block: Last Comment
takahashim Dec 23, 2024
1ca87dc
Add translations
takahashim Dec 23, 2024
d69cac5
rubocop
takahashim Dec 25, 2024
5630c06
add renamed cli: mogrify
takahashim Dec 25, 2024
cef7d64
add renamed cli: mogrify
takahashim Dec 25, 2024
970178e
use TagEdit instead of HtmlEdit
takahashim Dec 26, 2024
bb10732
add renamed cli: mogrify
takahashim Dec 25, 2024
225c828
update blogs posts template from v0.28.3
takahashim Dec 26, 2024
f178a58
Add Iframe node
takahashim Dec 26, 2024
1bd7164
doc: remove descrition for old editor
takahashim Dec 26, 2024
4f39470
Merge pull request #40 from codeforjapan/add-last-comments3
ayuki-joto Dec 26, 2024
1f99bb9
Merge pull request #41 from takahashim/fix-locale-ja
ayuki-joto Dec 26, 2024
a4e1d25
Merge pull request #42 from takahashim/use-tag-edit
ayuki-joto Dec 26, 2024
ec86adf
Merge pull request #43 from takahashim/update-blogs-posts-show
ayuki-joto Dec 26, 2024
c6b78e4
make emitUpdate true in setContent to enable immediate changes
takahashim Dec 28, 2024
3523426
Add LastCommentActivitiesCell and Comments::LastCommentActivityCell
takahashim Dec 28, 2024
8f8b960
Remove modified content_blocks
takahashim Dec 28, 2024
45c44c6
Merge pull request #44 from takahashim/fix-setContent
ayuki-joto Dec 28, 2024
e3ba7de
fix locales in v0.28
takahashim Dec 28, 2024
36cb6be
fix line icon
takahashim Dec 28, 2024
343e172
Merge pull request #45 from takahashim/add-last_comment_activity
ayuki-joto Dec 30, 2024
c1bcc78
Merge pull request #46 from takahashim/remove-assemblies-content_blocks
ayuki-joto Dec 30, 2024
d064929
Merge pull request #47 from takahashim/update-locale-ja
ayuki-joto Dec 30, 2024
2521ef6
Merge pull request #48 from takahashim/fix-line-icon
ayuki-joto Dec 30, 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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,5 @@ yarn-debug.log*
public/sw.js
public/sw.js.map
app/views/static/api/*
tailwind.config.js
app/views/static/docs/*
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.6
3.1.1
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:16.13.0-bullseye-slim as node
FROM node:18.17.1-bullseye-slim as node

FROM ruby:3.0.6-slim-bullseye
FROM ruby:3.1.1-slim-bullseye

# for build-dep
RUN echo "deb-src http://deb.debian.org/debian bullseye main" >> /etc/apt/sources.list
Expand Down Expand Up @@ -32,12 +32,10 @@ RUN apt build-dep -y imagemagick && \
make install && \
ldconfig

ENV YARN_VERSION=v1.22.15

# node install
COPY --from=node /usr/local/bin/node /usr/local/bin/node
COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
COPY --from=node /opt/yarn-${YARN_VERSION} /opt/yarn
COPY --from=node /opt/yarn-* /opt/yarn
RUN ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \
&& ln -s /opt/yarn/bin/yarn /usr/local/bin/yarnpkg \
&& ln -s /usr/local/bin/node /usr/local/bin/nodejs \
Expand Down
24 changes: 12 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source "https://rubygems.org"

ruby RUBY_VERSION

gem "decidim", "0.27.4"
gem "decidim", "0.28.0"

gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-module-decidim_awesome.git", branch: "v0.9.3-2023-08-31"

gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "027-ja"

gem "decidim-navigation_maps", git: "https://github.com/codeforjapan/decidim-module-navigation_maps.git", branch: "v1.3.4-2024-01-28"
gem "decidim-polis", git: "https://github.com/codeforjapan/decidim-polis.git", branch: "update-0-27-4"
gem "decidim-decidim_awesome", git: "https://github.com/codeforjapan/decidim-module-decidim_awesome.git", branch: "develop"
#
# gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "027-ja"
#
# gem "decidim-navigation_maps", git: "https://github.com/codeforjapan/decidim-module-navigation_maps.git", branch: "v1.3.4-2024-01-28"
# gem "decidim-polis", git: "https://github.com/codeforjapan/decidim-polis.git", branch: "update-0-27-4"

gem "bootsnap"

Expand All @@ -31,26 +31,26 @@ gem "newrelic_rpm"
gem "omniauth-line_login", path: "omniauth-line_login"
gem "omniauth-rails_csrf_protection"

gem "decidim-user_extension", path: "decidim-user_extension"
# gem "decidim-user_extension", path: "decidim-user_extension"

gem "slack-ruby-client"

group :development, :test do
gem "byebug", "~> 11.0", platform: :mri
gem "figaro"

gem "decidim-dev", "0.27.4"
gem "decidim-dev", "0.28.0"
gem "dotenv-rails"
gem "factory_bot_rails"
gem "rspec-rails"
end

group :development do
gem "letter_opener_web", "~> 2.0"
gem "letter_opener_web"
gem "listen", "~> 3.1"
gem "rubocop-faker"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
gem "spring"
gem "spring-watcher-listen"
gem "web-console", "~> 4.2"
end

Expand Down
Loading
Loading