Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
astagi authored Oct 10, 2024
2 parents e376150 + 96731f5 commit 0056e81
Show file tree
Hide file tree
Showing 7 changed files with 7,954 additions and 8,818 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ COPY _posts _posts
COPY assets assets
COPY en en
COPY it it
COPY scripts scripts
COPY 403.html .
COPY 404.html .
COPY 500.html .
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ GEM
fiber-annotation (0.2.0)
fiber-local (1.0.0)
forwardable-extended (2.6.0)
google-protobuf (3.25.3)
google-protobuf (3.25.3-aarch64-linux)
google-protobuf (3.25.3-arm64-darwin)
google-protobuf (3.25.3-x86-linux)
google-protobuf (3.25.3-x86_64-darwin)
google-protobuf (3.25.3-x86_64-linux)
google-protobuf (3.25.5)
google-protobuf (3.25.5-aarch64-linux)
google-protobuf (3.25.5-arm64-darwin)
google-protobuf (3.25.5-x86-linux)
google-protobuf (3.25.5-x86_64-darwin)
google-protobuf (3.25.5-x86_64-linux)
hashery (2.1.2)
html-proofer (5.0.8)
addressable (~> 2.3)
Expand Down Expand Up @@ -133,7 +133,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.3.3)
rexml (3.3.6)
strscan
rouge (4.2.0)
ruby-rc4 (0.1.5)
Expand Down Expand Up @@ -171,7 +171,7 @@ GEM
tzinfo-data (1.2024.1)
tzinfo (>= 1.0.0)
unicode-display_width (2.5.0)
webrick (1.8.1)
webrick (1.8.2)
yell (2.2.2)
zeitwerk (2.6.13)

Expand Down
2 changes: 1 addition & 1 deletion _layouts/software-subcat-pa.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h1 style="font-size: 3rem">{{ page.title }}</h1>

<div class="container list-item-sorting">
<div class="row row-eq-height">
{% for pa in pa_list limit: 60 %}
{% for pa in pa_list %}

{% assign pa_name = pa.entityName | default: pa.ipa %}

Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.3'

services:
elasticsearch:
image: docker.io/italia/publiccode-tools-elasticsearch:ceb40894eaa142c8aec55c8dbcc9df038ec491e1
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ module.exports = {
'!assets/js/swagger-custom.js',
],
coverageReporters: ['text'],
testEnvironment: 'jsdom',
setupFiles: ['<rootDir>/assets/js/setup-tests.js'],
};
16,741 changes: 7,937 additions & 8,804 deletions package-lock.json

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
"version": "2.4.0",
"license": "BSD-3-Clause",
"dependencies": {
"axios": "^1.4.0",
"axios": "^1.7.7",
"bootstrap-italia": "^1.5.1",
"chart.js": "^2.9.4",
"datatables.net-dt": "^1.10.19",
"design-react-kit": "^3.3.3",
"dompurify": "^3.1.3",
"elasticsearch": "^15.0.0",
"jest-environment-jsdom": "^29.7.0",
"jquery": "^3.5.0",
"js-yaml": "^4.0.0",
"lodash.debounce": "^4.0.8",
"micromatch": "^4.0.8",
"owl.carousel": "^2.3.4",
"perfect-scrollbar": "^1.5.0",
"photoswipe": "^4.1.3",
Expand Down Expand Up @@ -59,7 +62,7 @@
"eslint-config-italia": "^1.0.2",
"eslint-plugin-json": "^2.1.2",
"gh-pages": "^5.0.0",
"jest": "^26.6.3",
"jest": "^29.7.0",
"mini-css-extract-plugin": "^2.7.6",
"pa11y-ci": "^2.4.0",
"postcss": "^8.4.31",
Expand All @@ -70,7 +73,7 @@
"sass": "^1.66.1",
"sass-loader": "^13",
"style-loader": "^3",
"webpack": "^5.88.2",
"webpack": "^5.95.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.9.0"
Expand Down

0 comments on commit 0056e81

Please sign in to comment.