Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
955c20d
#2171: remove breadcrumb links Tables => Topics
wingechr Nov 24, 2025
ed341bb
fixed js error
wingechr Nov 24, 2025
55367eb
code quality
wingechr Nov 27, 2025
1aa60f1
harmonize wizard html template with topic view
wingechr Nov 27, 2025
8962c03
wizard: start to separate create and upload
wingechr Nov 27, 2025
4fd0620
harmonize wizard html template with topic view
wingechr Nov 27, 2025
7a61b83
Merge branch 'develop' into issues-upload-wizard
wingechr Nov 27, 2025
61865d6
Bump express from 5.1.0 to 5.2.1
dependabot[bot] Dec 1, 2025
f8682cf
Bump @modelcontextprotocol/sdk from 1.11.2 to 1.24.0
dependabot[bot] Dec 2, 2025
afc0722
Bump django from 5.1.14 to 5.1.15
dependabot[bot] Dec 3, 2025
65469fd
Bump urllib3 from 2.5 to 2.6.0
dependabot[bot] Dec 6, 2025
289033c
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 8, 2025
16e2789
Merge pull request #2182 from OpenEnergyPlatform/pre-commit-ci-update…
wingechr Dec 11, 2025
de79d70
Merge pull request #2183 from OpenEnergyPlatform/dependabot/npm_and_y…
wingechr Dec 11, 2025
2c5152c
Merge branch 'develop' into dependabot/npm_and_yarn/modelcontextproto…
wingechr Dec 11, 2025
be4fc91
Merge pull request #2187 from OpenEnergyPlatform/dependabot/pip/urlli…
wingechr Dec 11, 2025
0534abb
Merge pull request #2186 from OpenEnergyPlatform/dependabot/pip/djang…
wingechr Dec 11, 2025
3c0d216
Merge pull request #2184 from OpenEnergyPlatform/dependabot/npm_and_y…
wingechr Dec 11, 2025
04ec480
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Dec 15, 2025
06473c5
Merge pull request #2192 from OpenEnergyPlatform/pre-commit-ci-update…
wingechr Dec 18, 2025
1e04021
formatting
wingechr Dec 19, 2025
42595d6
code quality,load metaedit.js with vite
wingechr Dec 19, 2025
cbb487d
#2038: not show the properties menu
wingechr Dec 19, 2025
428b017
fix undeclared variables
wingechr Dec 19, 2025
9d2268f
properly indent oe meta edit app
wingechr Dec 19, 2025
2629120
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 19, 2025
6c62586
Merge pull request #2193 from OpenEnergyPlatform/issue-2038
wingechr Dec 19, 2025
7c2446b
changelog
wingechr Dec 19, 2025
fc06567
#2102 #2091 format year (from date) in scenario bundles
wingechr Dec 19, 2025
0800856
changelog
wingechr Dec 19, 2025
f20edb4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 19, 2025
366c818
Merge pull request #2194 from OpenEnergyPlatform/issues-bundles-2102-…
wingechr Dec 19, 2025
8da2e9b
formatting
wingechr Dec 19, 2025
e08d957
isRequired caused exception in browser when loading page
wingechr Dec 19, 2025
7da5306
sorting does not work if ids have spaces
wingechr Dec 19, 2025
e3cdfb1
better sorting: lower case string, sort arrays (list of dates)
wingechr Dec 19, 2025
dee0261
changelog
wingechr Dec 19, 2025
6c5a53f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 19, 2025
588cd6e
Merge pull request #2195 from OpenEnergyPlatform/issue-1974
wingechr Dec 19, 2025
bf15497
add @never_cache to all GET views in api that didnot have them
wingechr Dec 22, 2025
b716293
#1818 also add never_cache to dataedit views
wingechr Dec 22, 2025
9645b85
changelog
wingechr Dec 22, 2025
bf03afb
#1822 never_cache for get views in login app
wingechr Dec 22, 2025
a4dc92b
changelog
wingechr Dec 22, 2025
8467dc5
page for OE Family Steering Committee
wingechr Dec 22, 2025
bf2ecdb
don't show tag edit section if user does not have admin rights on table.
wingechr Dec 22, 2025
7503c07
#2169 keep search filter when going to next page
wingechr Dec 22, 2025
7ed10dc
reset ITEMS_PER_PAGE tooriginal value
wingechr Dec 22, 2025
7d2b6bb
changelog
wingechr Dec 22, 2025
3490c7b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 22, 2025
8c7bad0
Merge pull request #2196 from OpenEnergyPlatform/issue-2169-paginatio…
wingechr Dec 22, 2025
4c5a244
fix docstrings
wingechr Dec 22, 2025
d7a49e2
Merge branch 'develop' into issues-upload-wizard
wingechr Dec 22, 2025
f9a9427
margins
wingechr Dec 22, 2025
21eb60e
remove delete button from upload wizard
wingechr Dec 22, 2025
e5b8420
wizard.js via vite
wingechr Dec 22, 2025
5ae9fc6
#1199 When creating columns, "nullable" is set by default
wingechr Dec 22, 2025
d1b3d55
#1826 clarify valid names for columns and tables
wingechr Dec 22, 2025
17795ce
fix: docker/Dockerfile.vite to reduce vulnerabilities
snyk-bot Dec 23, 2025
81dcbd1
Merge pull request #2200 from OpenEnergyPlatform/snyk-fix-94f7d67e5cb…
wingechr Dec 23, 2025
dd44aa3
#1893 warn if file size is too large
wingechr Dec 23, 2025
a4fb643
removed unused function (deleteTable)
wingechr Dec 23, 2025
4d5d489
fomatting
wingechr Dec 23, 2025
ff3fb8d
changelog
wingechr Dec 23, 2025
8d13bea
Merge pull request #2199 from OpenEnergyPlatform/issues-upload-wizard
wingechr Dec 23, 2025
b5a72ae
prettierignore - dont ignore frontend anymore
wingechr Dec 23, 2025
d25b710
EOL
wingechr Dec 23, 2025
327a052
api refactoring
wingechr Dec 23, 2025
a53e607
comments
wingechr Dec 23, 2025
030dead
fix links, fix snyk warning
wingechr Jan 5, 2026
48dfca6
fix snyk warning: oeo_search_api_view
wingechr Jan 5, 2026
aa87797
hotfix: cannot add js to vite?
wingechr Jan 5, 2026
19d0f42
hotfix: revert to loading metaeditor without vite
wingechr Jan 5, 2026
62bfe22
Merge branch 'develop' into nfdi-security-issues-b
wingechr Jan 5, 2026
31476b3
Update oefamily-sc.html
han-f Jan 5, 2026
2e7418b
automated testing: trying to fix ssql error -> update ubuntu
wingechr Jan 7, 2026
95656fd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 7, 2026
80ecb7a
Merge pull request #2202 from OpenEnergyPlatform/nfdi-security-issues-b
wingechr Jan 7, 2026
c0742cc
steering committee - members
wingechr Jan 7, 2026
d5737ad
Merge pull request #2198 from OpenEnergyPlatform/issue-2089
wingechr Jan 7, 2026
34a5eea
changelog
wingechr Jan 7, 2026
19e0531
bumpversion
wingechr Jan 7, 2026
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: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.6.1
current_version = 1.6.2

[bumpversion:file:VERSION]

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/automated-testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
run-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
env:
# LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
# SEGFAULT_SIGNALS: all
Expand Down Expand Up @@ -55,8 +55,8 @@ jobs:
- name: Install linux dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y postgresql-client --no-install-recommends ca-certificates || apt-get install -y --no-install-recommends ca-certificates
sudo update-ca-certificates || update-ca-certificates
sudo apt-get install -y postgresql-client ca-certificates
sudo update-ca-certificates
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 25.11.0
rev: 25.12.0
hooks:
- id: black
- repo: https://github.com/pycqa/isort
Expand All @@ -21,7 +21,7 @@ repos:
- id: flake8
args: ["--max-line-length=88", "--ignore=E20,W503"] # black compatible
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v10.0.0-alpha.0
rev: v10.0.0-beta.0
hooks:
- id: eslint
additional_dependencies:
Expand Down
8 changes: 0 additions & 8 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,3 @@ mkdocs.yml

# django templates will be handled by djlint
*/templates/**/*.html

# ignore these for now
**/*.js
**/*.tsx
**/*.jsx
**/*.css
**/*.scss
**/*.jsonc
6 changes: 3 additions & 3 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cff-version: 1.6.1
cff-version: 1.6.2
message: "If you use this software, please cite it using these metadata."
authors:
- family-names: "Hülk"
Expand Down Expand Up @@ -28,7 +28,7 @@ authors:
title: "Open Energy Family - Open Energy Platform (OEP)"
type: software
license: AGPL-3.0-or-later
version: 1.6.1
version: 1.6.2
doi:
date-released: 2025-12-11
date-released: 2026-01-07
url: "https://github.com/OpenEnergyPlatform/oeplatform/"
13 changes: 13 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2081,6 +2081,19 @@ SPDX-FileCopyrightText = [
"2023 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut",
]

[[annotations]]
path = "base/templates/base/oefamily-sc.html"
precedence = "override"
SPDX-License-Identifier = "AGPL-3.0-or-later"
SPDX-FileCopyrightText = [
"2020 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut",
"2020 Ludwig Hülk <https://github.com/Ludee> © Reiner Lemoine Institut",
"2021 Christian Hofmann <https://github.com/christian-rli> © Reiner Lemoine Institut © Reiner Lemoine Institut",
"2022 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.",
"2023 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut",
]


[[annotations]]
path = "ontology/templates/ontology/about.html"
precedence = "override"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.1
1.6.2
2 changes: 1 addition & 1 deletion api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
__license__ = """
SPDX-FileCopyrightText: 2025 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.
SPDX-FileCopyrightText: 2025 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg
SPDX-FileCopyrightText: 2025 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg
Expand Down
Loading