Commits · main · ASCI-public / MEMAP

26 Apr, 2022 2 commits
- Merge branch 'dev-branch' into 'main' · 171a86f1
  Jan Mayer authored Apr 26, 2022
```
resolved sim-longer-than-profile bug

See merge request !4
```
  171a86f1
- resolved sim-longer-than-profile bug · db6f65fd
  Jan Mayer authored Apr 26, 2022
  
  db6f65fd
11 Mar, 2022 1 commit
- Update README.md · ac9966a0
  Jan Mayer authored Mar 11, 2022
  
  ac9966a0
10 Mar, 2022 24 commits
- Update .gitlab-ci.yml · 6e125cf9
  Jan Mayer authored Mar 10, 2022
  
  6e125cf9
- Merge branch 'dev-branch' into 'main' · 1c8ff8d8
  Jan Mayer authored Mar 10, 2022
```
Release final project version

See merge request !3
```
  1c8ff8d8
- Merge branch 'main' into 'dev-branch' · d875c5e4
  Jan Mayer authored Mar 10, 2022
```
# Conflicts:
#   .gitlab-ci.yml
```
  d875c5e4
- Update .gitlab-ci.yml · 24c4205c
  Jan Mayer authored Mar 10, 2022
  
  24c4205c
- Update .gitlab-ci.yml · 616318aa
  Jan Mayer authored Mar 10, 2022
  
  616318aa
- Update .gitlab-ci.yml · d7725a83
  Jan Mayer authored Mar 10, 2022
  
  d7725a83
- Update .gitlab-ci.yml · d669ebf9
  Jan Mayer authored Mar 10, 2022
  
  d669ebf9
- Update .gitlab-ci.yml · 4177e394
  Jan Mayer authored Mar 10, 2022
  
  4177e394
- extended pipeline · 8b8f5d45
  Jan Mayer authored Mar 10, 2022
  
  8b8f5d45
- dependency update · d9f29b49
  Jan Mayer authored Mar 10, 2022
  
  d9f29b49
- Update README.md · 01f1067f
  Jan Mayer authored Mar 10, 2022
  
  01f1067f
- Add new file · 8c064586
  Jan Mayer authored Mar 10, 2022
  
  8c064586
- typo · fc945196
  Jan Mayer authored Mar 10, 2022
  
  fc945196
- reshape dependencies · 953ef22e
  Jan Mayer authored Mar 10, 2022
  
  953ef22e
- Update .gitlab-ci.yml · 3ca465c3
  Jan Mayer authored Mar 10, 2022
  
  3ca465c3
- Update .gitlab-ci.yml · 7545af05
  Jan Mayer authored Mar 10, 2022
  
  7545af05
- test pipeline · 6b238788
  Jan Mayer authored Mar 10, 2022
  
  6b238788
- Update .gitlab-ci.yml · fc93b0e6
  Jan Mayer authored Mar 10, 2022
  
  fc93b0e6
- Add new file · 5c927778
  Jan Mayer authored Mar 10, 2022
  
  5c927778
- Update .gitlab-ci.yml file · 158d28d6
  Jan Mayer authored Mar 10, 2022
  
  158d28d6
- Update .gitlab-ci.yml file · c4545647
  Jan Mayer authored Mar 10, 2022
  
  c4545647
- Update .gitlab-ci.yml file · e326240e
  Jan Mayer authored Mar 10, 2022
  
  e326240e
- Add new file · aae7f53f
  Jan Mayer authored Mar 10, 2022
  
  aae7f53f
- Update README.md · 4d4e323d
  Jan Mayer authored Mar 10, 2022
  
  4d4e323d
01 Mar, 2022 5 commits
- new JSON files · 939e34a6
  Jan Mayer authored Mar 01, 2022
  
  939e34a6
- v110 with file logging · 8b3dc7d2
  Jan Mayer authored Mar 01, 2022
  
  8b3dc7d2
- Merge branch 'dev-branch' into 'main' · 3a4c8640
  Jan Mayer authored Mar 01, 2022
```
datamodel consistency

See merge request !2
```
  3a4c8640
- added 2Buildings as Submodule · ba358e53
  Jan Mayer authored Mar 01, 2022
  
  ba358e53
- remove MockUp Dir · 8eb88323
  Jan Mayer authored Mar 01, 2022
  
  8eb88323
19 Feb, 2022 1 commit
- adjustments after testing · fd1b8a3f
  Jan Mayer authored Feb 19, 2022
  
  fd1b8a3f
18 Feb, 2022 2 commits
- adaption to datamodel · f784b190
  Jan Mayer authored Feb 18, 2022
  
  f784b190
- cleanup · 91d0076d
  Jan Mayer authored Feb 18, 2022
  
  91d0076d
17 Feb, 2022 1 commit
- 2HousesDemoforLab _V1 · 9be13a19
  Jan Mayer authored Feb 17, 2022
  
  9be13a19
15 Feb, 2022 1 commit
- cherry-pick changes from eTwin Dev · e2e5833c
  Jan Mayer authored Feb 15, 2022
  
  e2e5833c
28 Jan, 2022 3 commits
- Delete README.md · 69718e2e
  Jan Mayer authored Jan 28, 2022
  
  69718e2e
- Update README.md · 2384bf75
  Jan Mayer authored Jan 28, 2022
  
  2384bf75
- Merge branch 'master' into 'main' · 34cb9915
  Jan Mayer authored Jan 28, 2022
```
upload code

See merge request !1
```
  34cb9915