Skip to content

Commit

Permalink
Merge pull request #44 from datavisyn/release-11.0.0
Browse files Browse the repository at this point in the history
Release 11.0.0
  • Loading branch information
Anita Steiner authored Feb 23, 2022
2 parents cd03373 + 2ac13e7 commit bd9e54e
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion dist/main/LoginCredentials.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/main/LoginCredentials.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/phovea.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/rest/SecurityStoreGeneratedRest.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/rest/SecurityStoreGeneratedRest.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if(pluginsToTransform.length > 0) {
}

/**
* TODO check if we can process inline webpack loaders (e.g. as found in https://github.com/phovea/phovea_ui/blob/master/src/_bootstrap.ts)
* TODO check if we can process inline webpack loaders (e.g. as found in https://github.com/datavisyn/tdp_core/blob/develop/src/webpack/_bootstrap.ts)
* see also https://jestjs.io/docs/en/webpack#mocking-css-modules
*/
module.exports = {
Expand Down Expand Up @@ -46,4 +46,4 @@ module.exports = {
moduleNameMapper: {
"^.+\\.(css|less|scss|sass|png|jpg|gif)$": "identity-obj-proxy"
}
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "phovea_security_store_generated",
"description": "",
"version": "10.0.0",
"version": "11.0.0",
"author": {
"name": "datavisyn GmbH",
"email": "[email protected]",
Expand Down Expand Up @@ -69,7 +69,7 @@
"docker_packages.txt"
],
"dependencies": {
"phovea_security_flask": "^8.0.0"
"tdp_core": "^13.0.0"
},
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion phovea_registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Licensed under the new BSD license, available at http://caleydo.org/license
**************************************************************************** */

import {PluginRegistry} from 'phovea_core';
import {PluginRegistry} from 'tdp_core';
import reg from './dist/phovea';

/**
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pydng==1.1.2
phovea_server>=7.2.0,<8.0.0
phovea_security_flask>=8.0.0,<9.0.0
phovea_server>=8.0.0,<9.0.0
tdp_core>=13.0.0,<14.0.0
2 changes: 1 addition & 1 deletion src/main/LoginCredentials.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {BaseUtils} from 'phovea_core';
import {BaseUtils} from 'tdp_core';
import {SecurityStoreGeneratedRest} from '../rest';

export class LoginCredentials {
Expand Down
2 changes: 1 addition & 1 deletion src/phovea.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) The Caleydo Team. All rights reserved.
* Licensed under the new BSD license, available at http://caleydo.org/license
**************************************************************************** */
import {IRegistry} from 'phovea_core';
import {IRegistry} from 'tdp_core';

//register all extensions in the registry following the given pattern
export default function (registry: IRegistry) {
Expand Down
2 changes: 1 addition & 1 deletion src/rest/SecurityStoreGeneratedRest.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {AppContext} from 'phovea_core';
import {AppContext} from 'tdp_core';

export class SecurityStoreGeneratedRest {
static getGeneratedUsername(): Promise<string> {
Expand Down

0 comments on commit bd9e54e

Please sign in to comment.