Commits · master · J-M / shyft · GitLab

Feb 23, 2021
- Merge branch 'ui_chart_bg' into 'master' · 364fff8b
  anybo authored Feb 23, 2021
  364fff8b
- Added support for chart bg color in stm ui export, dont export invalid colors... · d7e2d3fd
  anybo authored Feb 18, 2021
  d7e2d3fd
Feb 21, 2021
- Merge branch '697-new-bokeh-version-2-3' into 'master' · 9f8a9691
  Diako Darian authored Feb 21, 2021
  9f8a9691
- Resolve "New Bokeh version: 2.3" · a56fbc06
  Diako Darian authored Feb 21, 2021
  
  a56fbc06
Feb 19, 2021
- Merge branch 'readme_update' into 'master' · 074bc62a
  Sigbjørn Helset authored Feb 19, 2021
  074bc62a
- Update README.md · 6274d0a7
  Eivind Lyche Melvær authored Feb 19, 2021 and Sigbjørn Helset committed Feb 19, 2021
  
  6274d0a7
Feb 10, 2021
- Merge branch... · 9c8dfa4d
  Jens Askgaard authored Feb 10, 2021
  9c8dfa4d
- #682: It is now possible to explictly state that you do not want a blank... · 085b75c8
  Jens Askgaard authored Feb 10, 2021
  085b75c8
Feb 08, 2021
- Merge branch '693-pypi-token-fix' into 'master' · 0e3b83c3
  sigbjorn.helset@work authored Feb 08, 2021
  0e3b83c3
- allow unset pypi tokens · 3b2deb6b
  Sigbjørn Helset authored Feb 08, 2021
  
  3b2deb6b
- Update VERSION after MR from Jens · 2517e3ee
  Sigbjørn Helset authored Feb 08, 2021
  
  2517e3ee
- Merge branch '681-add-styles-as-default-for-message-viewer' into 'master' · 6589e36e
  Jens Askgaard authored Feb 08, 2021
  6589e36e
Feb 07, 2021
- Merge branch 'shop_license' into 'master' · d65dcbe2
  Sigbjørn Helset authored Feb 07, 2021
  d65dcbe2
- resolved VERSION · ad5c5ab1
  Sigbjørn Helset authored Feb 07, 2021
  
  ad5c5ab1
- cleanup, -ready to merge master · eb02ee6c
  Sigbjørn Helset authored Feb 07, 2021
  
  eb02ee6c
- win ok, retest of linux bld-pkg prior to merge · c6e56422
  Sigbjørn Helset authored Feb 07, 2021
  
  c6e56422
- windows and needed some more fix for cr-lf · ff3238d8
  Sigbjørn Helset authored Feb 07, 2021
  
  ff3238d8
- test win pkg and upload · f41407bd
  Sigbjørn Helset authored Feb 07, 2021
  
  f41407bd
- ensure to use different pypi tokens on upload · fde22190
  Sigbjørn Helset authored Feb 07, 2021
  
  fde22190
- cleanup tmp. conda pip file, and try to be specific on twine upload · 939089a7
  Sigbjørn Helset authored Feb 07, 2021
  
  939089a7
- yet another workaround for conda, using specific names for conda-pip packages... · 97a98f15
  Sigbjørn Helset authored Feb 07, 2021
  97a98f15
- add -pip to pypi package names uploaded to anaconda · 811d4afe
  Sigbjørn Helset authored Feb 07, 2021
  
  811d4afe
Feb 06, 2021
- tmp increase version, and test linux pkg as well · c600e9a1
  Sigbjørn Helset authored Feb 07, 2021
  
  c600e9a1
- provide conda pip packages and wheels · 8115dd39
  Sigbjørn Helset authored Feb 06, 2021
  
  8115dd39
Feb 05, 2021
- Update VERSION to trigger build pipeline · 7c68a9b3
  Eivind Lyche Melvær authored Feb 05, 2021
  
  7c68a9b3
- 681: Redo messageviewer til allow for styling for indvidual lines. Previous... · eebadcf1
  Jens Askgaard authored Feb 05, 2021
  eebadcf1
Feb 03, 2021
- More flexible handling of shop api license · f9d4371f
  anybo authored Feb 03, 2021
  
  f9d4371f
Jan 29, 2021
- Merge branch '683-cell-env-ts-pfx-fix' into 'master' · 9205696e
  Sigbjørn Helset authored Jan 29, 2021
  9205696e
- resolves #683 and #684 · 36d694aa
  Sigbjørn Helset authored Jan 29, 2021
  
  36d694aa
Jan 23, 2021
- Update VERSION, forgotten on last merge(manual procedure, last thing to do... · 61e09b9d
  Sigbjørn Helset authored Jan 23, 2021
  61e09b9d
Jan 22, 2021
- Merge branch '680-format-time-string-in-message-viewer' into 'master' · 807f1055
  Jens Askgaard authored Jan 22, 2021
  807f1055
Jan 21, 2021
- #680: Ensured more consistent formatting of time used in the message viewer.... · f04415f4
  Jens Askgaard authored Jan 21, 2021
  f04415f4
Jan 19, 2021
- Merge branch 'build_energy_market_off_option' into 'master' · b809517e
  Sigbjørn Helset authored Jan 19, 2021
  b809517e
- Create lists of sources and libs depending on BUILD_ENERGY_MARKET option · cd35697e
  Eivind Lyche Melvær authored Jan 19, 2021 and Sigbjørn Helset committed Jan 19, 2021
  
  cd35697e
Jan 14, 2021
- Merge branch 'STM_expose_flattened_attributes' into 'master' · 55812213
  Sigbjørn Helset authored Jan 14, 2021
  55812213
- STM: Expose flattened attributes dict · d5cae852
  Magne authored Jan 14, 2021 and Sigbjørn Helset committed Jan 14, 2021
  
  d5cae852
Jan 13, 2021
- Merge branch 'enable_windspeed_100m' into 'master' · d77a08ca
  Eivind Lyche Melvær authored Jan 13, 2021
  d77a08ca
- Update location of object file from geo.cpp from web_api to not collide with... · 4d1d1bac
  Erik Tjøtta authored Jan 13, 2021 and Eivind Lyche Melvær committed Jan 13, 2021
  4d1d1bac
- Merge branch 'angularBuilds' into 'master' · 037c6ef0
  Sigbjørn Helset authored Jan 13, 2021
  037c6ef0
- Angular builds · ec954c14
  Sigbjørn Helset authored Jan 13, 2021
  
  ec954c14