Skip to content

Commit

Permalink
Merge branch 'develop' into feature/jwt
Browse files Browse the repository at this point in the history
# Conflicts:
#	install/1_structure.sql
#	install/upgrade/8.9.0.sql
#	install/upgrade/upgrade.md
#	openatlas/static/js/functions.js
  • Loading branch information
BernhardKoschicek committed Jan 2, 2025
2 parents e784263 + 13cabca commit b37902e
Show file tree
Hide file tree
Showing 85 changed files with 11,077 additions and 7,387 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@ Please refer to our [contributing guidelines](CONTRIBUTING.md)

- **Stefan Eichert** - Idea, Concept and Data Modelling
([[email protected]](mailto:[email protected]))
- **Nina Richards** - Project Management and Bioarchaeological Expertise
([[email protected]](mailto:[email protected]))
- **Alexander Watzinger** - Lead Developer and Concept
([[email protected]](mailto:[email protected]))
- **Bernhard Koschiček-Krombholz** - Backend Development, API
([[email protected]](mailto:[email protected]))
- **Nina Richards** - Bioarchaeological Expertise
([[email protected]](mailto:[email protected]))
- **Olivia Reichl** - Frontend Development
([[email protected]](mailto:[email protected])
([[email protected]](mailto:[email protected]))
- **Katharina Wünsche** - Frontend Development
([Katharina [email protected]](mailto:Katharina [email protected]))
- **Jan Belik** - Logo Design and Design Consulting
([[email protected]](mailto:[email protected]))

Expand Down
2 changes: 1 addition & 1 deletion config/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from config.database_versions import DATABASE_VERSIONS

VERSION = '8.9.0'
VERSION = '8.10.0'
DATABASE_VERSION = DATABASE_VERSIONS[0]
DEMO_MODE = False # If activated some options are disabled, login is prefilled
DEBUG = False
Expand Down
Loading

0 comments on commit b37902e

Please sign in to comment.