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

Merged d3_changes into develop #45

Merged
merged 5 commits into from
Oct 5, 2022
Merged

Merged d3_changes into develop #45

merged 5 commits into from
Oct 5, 2022

Conversation

PatrickAdelberger
Copy link
Member

@PatrickAdelberger PatrickAdelberger commented Sep 8, 2022

Branch to resolve the merge conflicts between d3_changes and develop.

Merge:
d3_changes into develop

Note:
PR #40 can be closed.

@PatrickAdelberger PatrickAdelberger marked this pull request as draft September 8, 2022 11:58
@PatrickAdelberger PatrickAdelberger marked this pull request as ready for review September 8, 2022 12:08
* move RouterScrollToTop to coral_public

* fix TS errors

* move canvas-confetti to coral_public

* update git dependencies
Copy link
Member

@keckelt keckelt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay

@keckelt keckelt merged commit 27530c8 into develop Oct 5, 2022
@keckelt keckelt deleted the dev_d3_merge branch October 5, 2022 08:47
keckelt added a commit that referenced this pull request Jan 12, 2023
* Prepare github changes

* Remove circleci

* Release 3.1.0 (#42)

* prepare next dev version

* Fix colors assignment in plots (#41)

* Prepare github changes

* Remove circleci

* prepare release 3.1.0

* Update publish.yml

Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Anita Steiner <[email protected]>

* prepare next dev version

* Use `Font Awesome 6 Free` in `font-family` (#39)

* Use `Font Awesome 6 Free` in `font-family`

Requires datavisyn/tdp_core#732

* Update Lineup to 4.6.2

Co-authored-by: Klaus Eckelt <[email protected]>

* Update fontawesome

* Merge visyn_scripts

* Release 4.0.0 (#46)

* prepare next dev version

* Fix colors assignment in plots (#41)

* Prepare github changes

* Remove circleci

* prepare next dev version

* Use `Font Awesome 6 Free` in `font-family` (#39)

* Use `Font Awesome 6 Free` in `font-family`

Requires datavisyn/tdp_core#732

* Update Lineup to 4.6.2

Co-authored-by: Klaus Eckelt <[email protected]>

* Update fontawesome

* Merge visyn_scripts

* prepare release 4.0.0

Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Holger Stitz <[email protected]>

* prepare next dev version

* Merged `d3_changes` into `develop`  (#45)

* use d3v7 and d3v3 imports
remove depenencies to d3
add dependency to tdp_core

* remove console log

* Dev d3 merge fix (#47)

* move RouterScrollToTop to coral_public

* fix TS errors

* move canvas-confetti to coral_public

* update git dependencies

Co-authored-by: Klaus Eckelt <[email protected]>

* Automatically select root cohort if onboarding was already done (#48)

* Autoselect rootcohort if onboarding was done #579

* format code

* Remove grid lines from visualizations (#49)

remove gridlines #400

* fix type error

Co-authored-by: anita-steiner <>
Co-authored-by: Vanessa Stoiber <[email protected]>
Co-authored-by: Anita Steiner <[email protected]>
Co-authored-by: dvvanessastoiber <[email protected]>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
@dvvanessastoiber dvvanessastoiber mentioned this pull request Feb 9, 2023
2 tasks
keckelt added a commit that referenced this pull request Feb 10, 2023
* prepare next dev version

* Fix colors assignment in plots (#41)

* Prepare github changes

* Remove circleci

* prepare next dev version

* Use `Font Awesome 6 Free` in `font-family` (#39)

* Use `Font Awesome 6 Free` in `font-family`

Requires datavisyn/tdp_core#732

* Update Lineup to 4.6.2

Co-authored-by: Klaus Eckelt <[email protected]>

* Update fontawesome

* Merge visyn_scripts

* prepare next dev version

* Merged `d3_changes` into `develop`  (#45)

* use d3v7 and d3v3 imports
remove depenencies to d3
add dependency to tdp_core

* remove console log

* Dev d3 merge fix (#47)

* move RouterScrollToTop to coral_public

* fix TS errors

* move canvas-confetti to coral_public

* update git dependencies

Co-authored-by: Klaus Eckelt <[email protected]>

* Automatically select root cohort if onboarding was already done (#48)

* Autoselect rootcohort if onboarding was done #579

* format code

* Remove grid lines from visualizations (#49)

remove gridlines #400

* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* prepare release 4.1.0

---------

Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: Michael Pühringer <[email protected]>
puehringer added a commit that referenced this pull request Mar 6, 2023
* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* Release 4.1.0 (#54)

* prepare next dev version

* Fix colors assignment in plots (#41)

* Prepare github changes

* Remove circleci

* prepare next dev version

* Use `Font Awesome 6 Free` in `font-family` (#39)

* Use `Font Awesome 6 Free` in `font-family`

Requires datavisyn/tdp_core#732

* Update Lineup to 4.6.2

Co-authored-by: Klaus Eckelt <[email protected]>

* Update fontawesome

* Merge visyn_scripts

* prepare next dev version

* Merged `d3_changes` into `develop`  (#45)

* use d3v7 and d3v3 imports
remove depenencies to d3
add dependency to tdp_core

* remove console log

* Dev d3 merge fix (#47)

* move RouterScrollToTop to coral_public

* fix TS errors

* move canvas-confetti to coral_public

* update git dependencies

Co-authored-by: Klaus Eckelt <[email protected]>

* Automatically select root cohort if onboarding was already done (#48)

* Autoselect rootcohort if onboarding was done #579

* format code

* Remove grid lines from visualizations (#49)

remove gridlines #400

* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* prepare release 4.1.0

---------

Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: Michael Pühringer <[email protected]>

* prepare next dev version

* Migration to visyn_core (#55)

* Migration to visyn_core

* Linting

* Upgrade deps

---------

Co-authored-by: Michael Puehringer <[email protected]>

* Fix cohort

* Fix circular dependencies

* Further cleanup

* Fix async in loop

* Import

* Add todos for async inside loop errors

---------

Co-authored-by: Michael Pühringer <[email protected]>
Co-authored-by: Vanessa Stoiber <[email protected]>
Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: dvvanessastoiber <[email protected]>
Co-authored-by: Michael Puehringer <[email protected]>
thinkh added a commit that referenced this pull request May 15, 2023
* Remove `|| true` to show eslint errors

#693

* Run `lint:fix` to automatically fix formatting

#693

* Add missing component `RouterScrollToTop`

* Refactor src/app.ts into separate files src/app/*

Caleydo/cohort#693

* Rename app/Cohort to app/Coral

* Move colors to config/colors

Caleydo/cohort#693

* Move rest to base/rest

Caleydo/cohort#693

* Move ScrollLinker from util file to utils/ScrollLinker

Caleydo/cohort#693

* Remove unused color schemes

Caleydo/cohort#693

* Extract CohortColorSchema from util to separate file

Caleydo/cohort#693

* Merge CohortColorSchema with config/colors

Caleydo/cohort#693

* Move utilCustomEvents to base/events

Caleydo/cohort#693

* Move utilIdTypes to config/entities

Caleydo/cohort#693

* Move utilLabels to utils/labels

Caleydo/cohort#693

* Merge Tooltip into AColumn and remove export

Caleydo/cohort#693

* Rename event to event2 for nested event

Caleydo/cohort#693

* Merge CohortInterfaces into app/interfaces

Caleydo/cohort#693

* Use `ICohort` instead `Cohort`

Caleydo/cohort#693

- Replace `Cohort` with `ICohort` were possible
- Add interfaces `IInputCohort` and `IOutputCohort`
- Move classes `InputCohort` and `OutputCohort` to Cohort.ts
- Move public functions and properties from `Cohort` to interface `ICohort`
- Move interfaces and enums from `Cohort` to app/interfacoes
- Replace `Array<...>` with `...[]` syntax

* Reorder functions in utlis/labels

Caleydo/cohort#693

* Eslint and typescript errors (#56)

* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* Release 4.1.0 (#54)

* prepare next dev version

* Fix colors assignment in plots (#41)

* Prepare github changes

* Remove circleci

* prepare next dev version

* Use `Font Awesome 6 Free` in `font-family` (#39)

* Use `Font Awesome 6 Free` in `font-family`

Requires datavisyn/tdp_core#732

* Update Lineup to 4.6.2

Co-authored-by: Klaus Eckelt <[email protected]>

* Update fontawesome

* Merge visyn_scripts

* prepare next dev version

* Merged `d3_changes` into `develop`  (#45)

* use d3v7 and d3v3 imports
remove depenencies to d3
add dependency to tdp_core

* remove console log

* Dev d3 merge fix (#47)

* move RouterScrollToTop to coral_public

* fix TS errors

* move canvas-confetti to coral_public

* update git dependencies

Co-authored-by: Klaus Eckelt <[email protected]>

* Automatically select root cohort if onboarding was already done (#48)

* Autoselect rootcohort if onboarding was done #579

* format code

* Remove grid lines from visualizations (#49)

remove gridlines #400

* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* prepare release 4.1.0

---------

Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: Michael Pühringer <[email protected]>

* prepare next dev version

* Migration to visyn_core (#55)

* Migration to visyn_core

* Linting

* Upgrade deps

---------

Co-authored-by: Michael Puehringer <[email protected]>

* Fix cohort

* Fix circular dependencies

* Further cleanup

* Fix async in loop

* Import

* Add todos for async inside loop errors

---------

Co-authored-by: Michael Pühringer <[email protected]>
Co-authored-by: Vanessa Stoiber <[email protected]>
Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: dvvanessastoiber <[email protected]>
Co-authored-by: Michael Puehringer <[email protected]>

* bug: merge data subtype object

* Fix client config typings

---------

Co-authored-by: Champari Oltion <[email protected]>
Co-authored-by: Michael Pühringer <[email protected]>
Co-authored-by: Vanessa Stoiber <[email protected]>
Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: dvvanessastoiber <[email protected]>
Co-authored-by: Michael Puehringer <[email protected]>
Co-authored-by: oltionchampari <[email protected]>
oltionchampari added a commit that referenced this pull request May 16, 2023
* Remove `|| true` to show eslint errors

#693

* Run `lint:fix` to automatically fix formatting

#693

* Add missing component `RouterScrollToTop`

* Refactor src/app.ts into separate files src/app/*

Caleydo/cohort#693

* Rename app/Cohort to app/Coral

* Move colors to config/colors

Caleydo/cohort#693

* Move rest to base/rest

Caleydo/cohort#693

* Move ScrollLinker from util file to utils/ScrollLinker

Caleydo/cohort#693

* Remove unused color schemes

Caleydo/cohort#693

* Extract CohortColorSchema from util to separate file

Caleydo/cohort#693

* Merge CohortColorSchema with config/colors

Caleydo/cohort#693

* Move utilCustomEvents to base/events

Caleydo/cohort#693

* Move utilIdTypes to config/entities

Caleydo/cohort#693

* Move utilLabels to utils/labels

Caleydo/cohort#693

* Merge Tooltip into AColumn and remove export

Caleydo/cohort#693

* Rename event to event2 for nested event

Caleydo/cohort#693

* Merge CohortInterfaces into app/interfaces

Caleydo/cohort#693

* Use `ICohort` instead `Cohort`

Caleydo/cohort#693

- Replace `Cohort` with `ICohort` were possible
- Add interfaces `IInputCohort` and `IOutputCohort`
- Move classes `InputCohort` and `OutputCohort` to Cohort.ts
- Move public functions and properties from `Cohort` to interface `ICohort`
- Move interfaces and enums from `Cohort` to app/interfacoes
- Replace `Array<...>` with `...[]` syntax

* Reorder functions in utlis/labels

Caleydo/cohort#693

* Eslint and typescript errors (#56)

* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* Release 4.1.0 (#54)

* prepare next dev version

* Fix colors assignment in plots (#41)

* Prepare github changes

* Remove circleci

* prepare next dev version

* Use `Font Awesome 6 Free` in `font-family` (#39)

* Use `Font Awesome 6 Free` in `font-family`

Requires datavisyn/tdp_core#732

* Update Lineup to 4.6.2

Co-authored-by: Klaus Eckelt <[email protected]>

* Update fontawesome

* Merge visyn_scripts

* prepare next dev version

* Merged `d3_changes` into `develop`  (#45)

* use d3v7 and d3v3 imports
remove depenencies to d3
add dependency to tdp_core

* remove console log

* Dev d3 merge fix (#47)

* move RouterScrollToTop to coral_public

* fix TS errors

* move canvas-confetti to coral_public

* update git dependencies

Co-authored-by: Klaus Eckelt <[email protected]>

* Automatically select root cohort if onboarding was already done (#48)

* Autoselect rootcohort if onboarding was done #579

* format code

* Remove grid lines from visualizations (#49)

remove gridlines #400

* Upgrade python deps (#51)

* Upgrade python deps

* Switch back to #develop

* prepare release 4.1.0

---------

Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: anita-steiner <>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: Michael Pühringer <[email protected]>

* prepare next dev version

* Migration to visyn_core (#55)

* Migration to visyn_core

* Linting

* Upgrade deps

---------

Co-authored-by: Michael Puehringer <[email protected]>

* Fix cohort

* Fix circular dependencies

* Further cleanup

* Fix async in loop

* Import

* Add todos for async inside loop errors

---------

Co-authored-by: Michael Pühringer <[email protected]>
Co-authored-by: Vanessa Stoiber <[email protected]>
Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: dvvanessastoiber <[email protected]>
Co-authored-by: Michael Puehringer <[email protected]>

* bug: merge data subtype object

* React 18 Migration

* Fix typings

* Fix client config typings

* Pin ordino, tourdino

* Add initial value to cohorts array

* Cleanup

* tsconfig

* Update package.json

---------

Co-authored-by: Holger Stitz <[email protected]>
Co-authored-by: Champari Oltion <[email protected]>
Co-authored-by: Michael Pühringer <[email protected]>
Co-authored-by: Vanessa Stoiber <[email protected]>
Co-authored-by: Klaus Eckelt <[email protected]>
Co-authored-by: Patrick <[email protected]>
Co-authored-by: dvvanessastoiber <[email protected]>
Co-authored-by: Michael Puehringer <[email protected]>
Co-authored-by: oltionchampari <[email protected]>
Co-authored-by: Moritz Heckmann <[email protected]>
@thinkh thinkh mentioned this pull request Aug 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants