Skip to content

Commit

Permalink
Merge pull request #430 from vrk-kpa/LIKA-590_fix_xroad_graphs_view
Browse files Browse the repository at this point in the history
LIKA-590: Fix xroad graphs view
  • Loading branch information
Zharktas authored Feb 15, 2024
2 parents bea990e + 449cdfa commit 89d41a9
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 15,457 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
image: openknowledge/ckan-dev:2.9
services:
solr:
image: ckan/ckan-solr-dev:2.9
image: ckan/ckan-solr:2.9
postgres:
image: ckan/ckan-postgres-dev:2.9
env:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
image: openknowledge/ckan-dev:2.9
services:
solr:
image: ckan/ckan-solr-dev:2.9
image: ckan/ckan-solr:2.9
postgres:
image: ckan/ckan-postgres-dev:2.9
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,6 @@ main_css:
contents:
- apicatalog/main.css

chartjs_js:
filters: rjsmin
output: ckanext-apicatalog/%(version)s_chartjs.js
contents:
- xroad_stats/js/libs/Chart.js
- xroad_stats/js/libs/chartjs-datalabels.js

chartjs_css:
output: ckanext-apicatalog/%(version)s_chartjs.css
contents:
- xroad_stats/css/Chart.css

xroad_statistics_js:
filters: rjsmin
output: ckanext-apicatalog/%(version)s_xroad-statistics.js
extra:
preload:
- base/main
- apicatalog/chartjs_js
contents:
- xroad_stats/js/xroad_statistics.js

xroad_statistics_css:
output: ckanext-apicatalog/%(version)s_xroad-statistics.css
extra:
preload:
- apicatalog/chartjs_css
contents:
- xroad_stats/css/xroad_statistics.css

datetimepicker_js:
filters: rjsmin
output: ckanext-apicatalog/%(version)s_datetimepicker.js
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 89d41a9

Please sign in to comment.