Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

DARIAH-DE Aggregator Services
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

97e0c6dc

Verified Commit 97e0c6dc authored 2 years ago by Ubbo Veentjer

Downloads
- Plain Diff

Merge branch 'release/1.5.0'

parents 4b65e85d 78a2c4cf

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 15
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

.classpath 0 additions, 240 deletions

.classpath
.gitignore 2 additions, 0 deletions

.gitignore
.gitlab-ci.yml 153 additions, 0 deletions

.gitlab-ci.yml
.m2/settings.xml 11 additions, 0 deletions

.m2/settings.xml
.project 1 addition, 1 deletion

.project
Dockerfile 22 additions, 0 deletions

Dockerfile
Jenkinsfile_OLD 0 additions, 0 deletions

Jenkinsfile_OLD
README.md 5 additions, 0 deletions

README.md
docs/html.rst 4 additions, 4 deletions

docs/html.rst
docs/index.rst 3 additions, 3 deletions

docs/index.rst
pom.xml 159 additions, 86 deletions

pom.xml
src/main/java/info/textgrid/services/aggregator/util/TextGridRepProvider.java 7 additions, 1 deletion

...extgrid/services/aggregator/util/TextGridRepProvider.java
src/main/webapp/WEB-INF/beans.xml 1 addition, 4 deletions

src/main/webapp/WEB-INF/beans.xml
src/main/webapp/stylesheets/tohtml.xsl 1 addition, 1 deletion

src/main/webapp/stylesheets/tohtml.xsl
src/test/java/info/textgrid/services/aggregator/SearchResultListTest.java 1 addition, 1 deletion

...fo/textgrid/services/aggregator/SearchResultListTest.java

with 370 additions and 341 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment