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

186 feature prepare ptj transfer #217

Merged
merged 29 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
82d2f29
Update Readme
c0nb4 Dec 11, 2024
06f0948
Update of contat mail
c0nb4 Dec 11, 2024
61793f3
Exchange of mail address
c0nb4 Dec 11, 2024
10cb655
Apply automatic changes
c0nb4 Dec 11, 2024
1c7144b
Temp change
c0nb4 Dec 18, 2024
5e557c7
Update data protection
c0nb4 Dec 18, 2024
d348146
Apply automatic changes
c0nb4 Dec 18, 2024
a007a39
Update Impressum
c0nb4 Dec 18, 2024
3eb62e9
Merge branch '186-feature-prepare-ptj-transfer' of https://github.com…
c0nb4 Dec 18, 2024
cd95028
Apply automatic changes
c0nb4 Dec 18, 2024
884d56e
Update Readme
c0nb4 Dec 11, 2024
6a79c19
Update of contat mail
c0nb4 Dec 11, 2024
17e6fcc
Exchange of mail address
c0nb4 Dec 11, 2024
502c67e
Apply automatic changes
c0nb4 Dec 11, 2024
39450b7
Temp change
c0nb4 Dec 18, 2024
934da82
Update data protection
c0nb4 Dec 18, 2024
a8cd496
Update Impressum
c0nb4 Dec 18, 2024
6703a0f
Apply automatic changes
c0nb4 Dec 18, 2024
79e1469
Apply automatic changes
c0nb4 Dec 18, 2024
963cac9
Merge branch '186-feature-prepare-ptj-transfer' of https://github.com…
c0nb4 Dec 20, 2024
8b290d5
Update Translation
c0nb4 Dec 20, 2024
0314f35
Update of Datenschuzthinweis
c0nb4 Dec 20, 2024
270fcd4
Englsh Translation of data protection and impressum
c0nb4 Dec 20, 2024
b11b656
Update po file
c0nb4 Dec 20, 2024
05603df
Fix: Fuzzy
c0nb4 Dec 20, 2024
07dfa3e
Fix: Fuzzy
c0nb4 Dec 20, 2024
fe9ef6f
Fix data protection
c0nb4 Dec 20, 2024
2977e63
changed double quptes to single quotes, so translation dont break
expeditionengineer Dec 20, 2024
c309405
removed shopping card texts from data protection notice
expeditionengineer Dec 20, 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
13 changes: 9 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,26 +125,31 @@ Thank you for helping us build a robust and comprehensive database system! If yo

## License / Copyright

This software was originally developed by the [Institute for Digital Networking of Buildings, Energy Supply Systems and Users](https://www.tu.berlin/en/dvg) at the Technical University of Berlin. Since 2025 the [Projektträger Jülich (PTJ)](https://www.ptj.de/en/landing-page) is responsible for the maintenance and further development of the software.

This repository is licensed under [MIT License](LICENSE).

This repo contains images, which have been created using the open-source [Privay Icons](https://github.com/Privacy-Icons/Privacy-Icons).
This repo contains images, which have been created using the open-source [Privay Icons](https://github.com/Privacy-Icons/Privacy-Icons).


# Funding
![Alt text](./img/BMWi_Logo_2021.svg)

We gratefully acknowledge the financial support by the Federal Ministry for Economic Affairs and Climate Action (BMWK), promotional reference: 03EWB004A-C.

# Contributors Software (in no particular order)
# Alumni

## Contributors Software (in no particular order)

Falk Cudok, Felix Rehmann, Rita Streblow, Martin Tobias Degner, Siling Chen, Ibukun Odeyemi, Kaifeng Xu, Ngoc Long Nguyen, Johanna Tengler, Marius Bieker

# Contributors Content (in no particular order)
## Contributors Content (in no particular order)

Astrid Aretz, Swantje Gährs, Jan Kegel, Torsten Grothmann, Valentin Rupp, Max von Grafenstein, Isabel Kiefaber, Falk Cudok, Felix Rehmann, Rita Streblow, Martin Tobias Degner, Siling Chen, Ibukun Odeyemi, Kaifeng Xu, Ngoc Long Nguyen, Johanna Tengler, Marius Bieker

# Contact

[[email protected]](mailto:[email protected])
[[email protected] ](mailto:[email protected])



Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified webcentral/src/locale/en/LC_MESSAGES/django.mo
Binary file not shown.
Loading
Loading