Commits · 6c78b2743e9d462998352bbc7266c23d74e038a5 · Discuss Data Project / Discuss Data

20 Feb, 2020 1 commit
- feat(ddusers.views): add redirect to shib urls · 6c78b274
  hynek authored Feb 20, 2020
  
  6c78b274
19 Feb, 2020 5 commits
- Merge branch 'bugfix/ci-cs' into 'develop' · aad33e32
  hynek authored Feb 19, 2020
```
fix(gitlab-ci): revert container test image tag to commit_sha

See merge request !33
```
  aad33e32
- ci(gitlab): revert container test image tag to commit_sha · f7aa4a1c
  hynek authored Feb 19, 2020
```
container scanning defaults to this image name if CI_APPLICATION_TAG is not set
```
  f7aa4a1c
- fix(gitlab-ci): revert container test image tag to commit_sha · 3a9bb03a
  hynek authored Feb 19, 2020
```
container scanning defaults to this image name if CI_APPLICATION_TAG is not set
```
  3a9bb03a
- Merge branch 'bugfix/import-error' into 'develop' · 6baab313
  hynek authored Feb 19, 2020
```
fix(ddusers.views): correct import of PublicationForm

See merge request !32
```
  6baab313
- fix(ddusers.views): correct import of PublicationForm · 9f8adbc6
  hynek authored Feb 19, 2020
  
  9f8adbc6
18 Feb, 2020 11 commits
- Merge branch 'feature/ci-cs' into 'develop' · c82f6dfa
  hynek authored Feb 18, 2020
```
fix(container-scanning): remove custom variables

See merge request !31
```
  c82f6dfa
- fix(container-scanning): remove custom variables · 9367bd1e
  hynek authored Feb 18, 2020
  
  9367bd1e
- Merge branch 'feature/elastic-search' into 'develop' · 591b9396
  hynek authored Feb 18, 2020
```
Feature/elastic search

See merge request !30
```
  591b9396
- Merge branch 'feature/token-api' into 'develop' · 9523d2b7
  hynek authored Feb 18, 2020
```
Feature/token api

See merge request !29
```
  9523d2b7
- Merge branch 'develop' into 'feature/token-api' · 6e597be6
  hynek authored Feb 18, 2020
```
# Conflicts:
#   config/settings/base.py
```
  6e597be6
- style(ddusers/views): clean up messy imports · b1071e19
  hynek authored Feb 18, 2020
  
  b1071e19
- ci(gitlab): move testing commands into one script file · 1e1a0149
  hynek authored Feb 18, 2020
  
  1e1a0149
- ci(gitlab): bring up full stack for testing · 22c2002d
  hynek authored Feb 18, 2020
  
  22c2002d
- Merge branch 'feature/elastic-search' of... · 83d526ec
  felix.herrmann authored Feb 18, 2020
```
Merge branch 'feature/elastic-search' of gitlab.gwdg.de:discuss-data/discuss-data into feature/elastic-search
```
  83d526ec
- feat(search): add filtering to search (corresponding fields in form not implemented yet) · af70c12e
  felix.herrmann authored Feb 18, 2020
  
  af70c12e
- ci(gitlab): use running container for tests · 2992d8fd
  hynek authored Feb 18, 2020
  
  2992d8fd
17 Feb, 2020 9 commits
- ci(gitlab): prevent removing container before last script in test stage · 831d9f70
  hynek authored Feb 17, 2020
  
  831d9f70
- feat(search): add filter for user listing · d91bbbbe
  felix.herrmann authored Feb 17, 2020
  
  d91bbbbe
- feat(search): add filters to search logic and ui · 7b1f25d2
  felix.herrmann authored Feb 17, 2020
  
  7b1f25d2
- Merge branch 'feature/elastic-search' into 'develop' · dbe25cc1
  hynek authored Feb 17, 2020
```
Feature/elastic search

See merge request !28
```
  dbe25cc1
- build: revert to the direct static import of jquery and intercooler · 67a9150c
  hynek authored Feb 17, 2020
```
django-intercooler does not work with intercooler and jquery included with vendors.js; let it import
the files directly in the base template file until another solution is found
```
  67a9150c
- build(docker): let django wait for elasticsearch · e16ba4b9
  hynek authored Feb 17, 2020
```
add curl to dockerfile; provide a check for the availability of elasticsearch in entrypoint script
```
  e16ba4b9
- ci(gitlab): fix typo to run pre-merge build on merge_requests only · 2187fb09
  hynek authored Feb 17, 2020
  
  2187fb09
- ci(gitlab): fix branch to run pre-merge build from master to merge-requests · 3dbfefb0
  hynek authored Feb 17, 2020
  
  3dbfefb0
- ci(gitlab): build an image for testing pre-merge results · 3f798c56
  hynek authored Feb 17, 2020
```
gitlab creates a detached state with the merged result that needs an own image to be tested against
the exspected results
```
  3f798c56
14 Feb, 2020 13 commits
- ci(docker): let django service require elastic search; add search index build on startup · 90fd57cc
  hynek authored Feb 14, 2020
  
  90fd57cc
- build(npm): add intercooler to dev-dependencies · cbef1f0b
  hynek authored Feb 14, 2020
  
  cbef1f0b
- feat(gulp): add intercooler to vendor.js build · e6fc674f
  hynek authored Feb 14, 2020
  
  e6fc674f
- refactor(base.html): remove intercooler.js from template · c83a7893
  hynek authored Feb 14, 2020
  
  c83a7893
- fix(ci.yml): fix volume definition for elasticsearch · 2d88508d
  hynek authored Feb 14, 2020
  
  2d88508d
- fix(ci.yml): add elastic search volume and service · c98b9cd6
  hynek authored Feb 14, 2020
  
  c98b9cd6
- fix(templates): fix height of user image on dataset header · 2fd29d0d
  felix.herrmann authored Feb 14, 2020
  
  2fd29d0d
- fix(search): add template for listing search results · cc6885c2
  felix.herrmann authored Feb 14, 2020
  
  cc6885c2
- fix(templates): add blank template and intercooler js in base · 85989c6b
  felix.herrmann authored Feb 14, 2020
  
  85989c6b
- fix(templates): add new partials for dataset and prep · 2477bd53
  felix.herrmann authored Feb 14, 2020
  
  2477bd53
- fix(templates): reactor dataset · 85130f28
  felix.herrmann authored Feb 14, 2020
  
  85130f28
- fix(templates): filter None type datasets out · 2ee7df70
  felix.herrmann authored Feb 14, 2020
  
  2ee7df70
- fix(templates): refactoring of dataset prep area · 5e9521a2
  felix.herrmann authored Feb 14, 2020
  
  5e9521a2
13 Feb, 2020 1 commit
- refactor(docker-compose): rename es-volumes to comply with naming scheme · 4bf51f99
  hynek authored Feb 13, 2020
  
  4bf51f99