Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
arildm committed Sep 18, 2024
2 parents 684b485 + e0d88d9 commit 544e07d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## [Unreleased]

## [9.7.1] - 2024-09-18

### Fixed

- Read default settings before using them (for instance, `backendURLMaxLength` is used in calls to `/corpus_info` etc)

## [9.7.0] - 2024-09-17

### Added
Expand Down Expand Up @@ -257,6 +263,7 @@
- Lots of bug fixes for the sidebar

[unreleased]: https://github.com/spraakbanken/korp-frontend/compare/master...dev
[9.7.1]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.7.1
[9.7.0]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.7.0
[9.6.0]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.6.0
[9.5.3]: https://github.com/spraakbanken/korp-frontend/releases/tag/v9.5.3
Expand Down
2 changes: 1 addition & 1 deletion app/markup/about.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="modal-header">
<h2>Korp version 9.7.0</h2>
<h2>Korp version 9.7.1</h2>
<span ng-click="clickX()" class="close-x">×</span>

</div>
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/data_init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,14 @@ export async function fetchInitialData(authDef: Promise<boolean>) {
return
}

// Start fetching locales asap. Await and read it later, in the Angular context.
initLocales()

if (settings.config_dependent_on_authentication) {
await authDef
}

// Start fetching locales asap. Await and read it later, in the Angular context.
initLocales()
setDefaultConfigValues()

// Fetch corpus configuration and metadata
const config = await getConfig()
Expand All @@ -257,8 +259,6 @@ export async function fetchInitialData(authDef: Promise<boolean>) {
require("./parallel/stats_proxy")
}

setDefaultConfigValues()

if (!settings.parallel) {
settings.corpusListing = new CorpusListing(settings.corpora)
} else {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "korp-frontend",
"version": "9.7.0",
"version": "9.7.1",
"dependencies": {
"@fortawesome/fontawesome-free": "6.2.1",
"@types/angular-dynamic-locale": "^0.1.35",
Expand Down

0 comments on commit 544e07d

Please sign in to comment.