Commits · 55f311ff5901d06f6894f3c709ef361346560685 · HCI-Development / decker-production

Jun 07, 2018

Merge remote-tracking branch 'origin/master' · 55f311ff
Kristof Korwisi authored 6 years ago

55f311ff

Merge latest remote-tracking branch 'decker-decker/master' to solve issue with... · 16fb7c9f

Kristof Korwisi authored 6 years ago

Merge latest remote-tracking branch 'decker-decker/master' to solve issue with current decker-production repository (resources weren't available).

# Conflicts:
#	.gitlab-ci.yml
No conflict here, deactivated test stage in decker/decker is deactivated in decker-production anyway.

16fb7c9f

Jun 06, 2018
- Minor changes to Dockerfile · 3c7773a3
  Kristof Korwisi authored 6 years ago
  
  3c7773a3
- Added libbz2-dev to be installed within the docker container. · 20e07733
  Kristof Korwisi authored 6 years ago
  
  20e07733
- Disabled build and test stage as a temporarily work around #45 · ff8236e4
  Kristof Korwisi authored 6 years ago
  
  ff8236e4
May 20, 2018
- Use Haskell zip package to embed resources · dd4cbe97
  Henrik Tramberend authored 6 years ago
  
  dd4cbe97
May 16, 2018
- Updated readme.md with fixed pipline-badge url · 98957135
  Kristof Korwisi authored 6 years ago
  
  98957135
May 14, 2018
- Merge remote-tracking branch 'decker-decker/master', modified .gitlab-ci.yml... · ce564c51
  Kristof Korwisi authored 6 years ago
  
  Merge remote-tracking branch 'decker-decker/master', modified .gitlab-ci.yml to exclude decker-decker/master-specific entries.
  ce564c51
May 13, 2018
- Improve slide separation · 7ef9f230
  Henrik Tramberend authored 6 years ago
  
  7ef9f230
May 11, 2018
- Remove for faster compiles · 4d128a8b
  Henrik Tramberend authored 6 years ago
  
  4d128a8b
May 09, 2018
- Merge branch 'ci-fix' into 'master' · 1ee8681d
  Kristof Korwisi authored 6 years ago
  
  Fix CI build error. Was caused by changed locale path See merge request decker/decker!10
  1ee8681d
- Merge remote-tracking branch 'origin/master' into ci-fix · d7cea5e2
  Kristof Korwisi authored 6 years ago
  
  d7cea5e2
May 07, 2018
- Removed COPY statement from Dockerfile, added pandoc-citeproc-flag... · efac8671
  Kristof Korwisi authored 6 years ago
  
  Removed COPY statement from Dockerfile, added pandoc-citeproc-flag embed_data_files to stack.yaml to ensure availability of locales.
  efac8671
- Improvrove naming · ff180f16
  Henrik Tramberend authored 6 years ago
  
  ff180f16
- Fix CI build error. Was caused by changed locale path · 4edda2d3
  Kristof Korwisi authored 6 years ago
  
  4edda2d3
May 06, 2018
- Create a decker executable for download from the CI pipeline · cfc1cdf0
  Henrik Tramberend authored 6 years ago
  
  cfc1cdf0
- Add downloadable artifacts to CI build · 51db40ad
  Henrik Tramberend authored 6 years ago
  
  51db40ad
- Tweaking · dc88785d
  Henrik Tramberend authored 6 years ago
  
  dc88785d
- Add CI test stage · 24739919
  Henrik Tramberend authored 6 years ago
  
  24739919
- Make tests great again · 8e3f67af
  Henrik Tramberend authored 6 years ago
  
  8e3f67af
- Fix capitalization · 8e9aa02f
  Henrik Tramberend authored 6 years ago
  
  8e9aa02f
- Fixes · 698a7df6
  Henrik Tramberend authored 6 years ago
  
  698a7df6
- Move to the much simpler package.yaml · f7a24bec
  Henrik Tramberend authored 6 years ago
  
  f7a24bec
- Add CI badge · cb32359e
  Henrik Tramberend authored 6 years ago
  
  cb32359e
- Use docker only for jobs that need it · 42346e18
  Henrik Tramberend authored 6 years ago
  
  42346e18
- Try with my own runner · 4d981875
  Henrik Tramberend authored 6 years ago
  
  4d981875
May 05, 2018
- Well, it seems we need a different runner for that · a490f587
  Henrik Tramberend authored 6 years ago
  
  a490f587
- Try stack docker CI build · 6303b969
  Henrik Tramberend authored 6 years ago
  
  6303b969
- Remove generated file · 7b16fb7a
  Henrik Tramberend authored 6 years ago
  
  7b16fb7a
- Merge remote-tracking branch 'refs/remotes/origin/master' · 7364c288
  Henrik Tramberend authored 6 years ago
  
  7364c288
May 04, 2018
- Merge branch 'master' of gitlab2.informatik.uni-wuerzburg.de:decker/decker · f1858425
  Henrik Tramberend authored 6 years ago
  
  f1858425
- Merge branch 'scss-modifications' into 'master' · eda28443
  Henrik Tramberend authored 6 years ago
  
  1. Move stylesheets from deck.html to decker.scss (solves issue #38); 2. Give… See merge request decker/decker!9
  eda28443
Apr 28, 2018
- Bump stack LTS to verision 11 · 0031291d
  Henrik Tramberend authored 6 years ago
  
  0031291d
Apr 27, 2018
- Merge branch 'master' of gitlab2.informatik.uni-wuerzburg.de:decker/decker · a90bb373
  Henrik Tramberend authored 6 years ago
  
  a90bb373
Apr 26, 2018
- Re-Add sensitivity to data-align center and right tags · d6707ae7
  Dominik Gall authored 6 years ago
  
  d6707ae7
Apr 23, 2018
- enabled mouse support again, add `set terminal svg`to avoid border · 7156ba51
  Marc Latoschik authored 6 years ago
  
  7156ba51
- Merge branch 'master' of gitlab2.informatik.uni-wuerzburg.de:decker/decker · a0d38839
  Henrik Tramberend authored 6 years ago
  
  a0d38839
- disabled mouse support for gnuplot-2-svg since it also draws a line · d7b3975b
  Marc Latoschik authored 6 years ago
  
  around the render canvas
  d7b3975b
Apr 22, 2018
- Refactor some inefficencies · e8633cf3
  Henrik Tramberend authored 6 years ago
  
  e8633cf3
- Put meta data CSS last after decker.css · de3b3d8c
  Henrik Tramberend authored 6 years ago
  
  de3b3d8c