Skip to content

Commit

Permalink
Merge pull request #2544 from dzhw/release
Browse files Browse the repository at this point in the history
Release v1.0.99
  • Loading branch information
René Reitmann authored May 6, 2020
2 parents 3853e38 + 02f861e commit 90eb061
Show file tree
Hide file tree
Showing 95 changed files with 2,413 additions and 1,551 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- pip install git+https://github.com/dzhw/javasphinx.git --user
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
&& nvm install 13.9.0
&& nvm install 14.1.0
- npm install -g grunt-cli
script:
- "./deploy/build.sh unused $TRAVIS_BRANCH"
Expand All @@ -63,7 +63,7 @@ jobs:
- pip install git+https://github.com/dzhw/javasphinx.git --user
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd
~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh
&& nvm install 13.9.0
&& nvm install 14.1.0
- npm install -g grunt-cli
- wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key
| sudo apt-key add -
Expand Down
7 changes: 0 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -526,13 +526,6 @@ module.exports = function(grunt) {
src: [
'node_modules/bootstrap-sass/assets/fonts/bootstrap/*.*'
]
}, {
expand: true,
dot: true,
flatten: true,
cwd: 'src/main/webapp',
src: ['../../../node_modules/katex/dist/fonts/*.*'],
dest: '<%= yeoman.dist %>/assets/styles/fonts'
}]
},
dist: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@ citationHint
.. java:field:: @NotEmpty @Size private String citationHint
:outertype: Concept

Hint on how to cite this concept. Must not be empty and must not contain more than 2048 characters.
Hint on how to cite this concept. Markdown is supported. Must not be empty and must not contain more than 2048 characters.

description
^^^^^^^^^^^

.. java:field:: @NotNull @I18nStringSize @I18nStringEntireNotEmpty private I18nString description
:outertype: Concept

A description of the concept. It must be specified in German and English and it must not contain more than 2048 characters.
A description of the concept. Markdown is supported. It must be specified in German and English and it must not contain more than 2048 characters.

doi
^^^
Expand All @@ -108,7 +108,7 @@ license
.. java:field:: @Size private String license
:outertype: Concept

The license of this concept. Must not contain more than 1 MB characters.
The license of this concept. Markdown is supported. Must not contain more than 1 MB characters.

originalLanguages
^^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: DataSet

Arbitrary additional text for the dataset. Must not contain more than 2048 characters.
Arbitrary additional text for the dataset. Markdown is supported. Must not contain more than 2048 characters.

dataAcquisitionProjectId
^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: Instrument

Arbitrary additional text for this instrument. Must not contain more than 2048 characters.
Arbitrary additional text for this instrument. Markdown is supported. Must not contain more than 2048 characters.

conceptIds
^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: Question

Arbitrary annotations to this question. Must not contain more than 2048 characters.
Arbitrary annotations to this question. Markdown is supported. Must not contain more than 2048 characters.

conceptIds
^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: RelatedPublication

Arbitrary additional text for this publication. Must not contain more than 2048 characters.
Arbitrary additional text for this publication. Markdown is supported. Must not contain more than 2048 characters.

authors
^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: Study

Arbitrary additional text for this study. Must not contain more than 2048 characters.
Arbitrary additional text for this study. Markdown is supported. Must not contain more than 2048 characters.

authors
^^^^^^^
Expand Down Expand Up @@ -118,7 +118,7 @@ description
.. java:field:: @NotNull @I18nStringSize @I18nStringEntireNotEmpty private I18nString description
:outertype: Study

A description of the study. It must be specified in German and English and it must not contain more than 2048 characters.
A description of the study. Markdown is supported. It must be specified in German and English and it must not contain more than 2048 characters.

id
^^
Expand Down Expand Up @@ -164,7 +164,7 @@ studySeries
.. java:field:: @I18nStringSize @I18nStringEntireNotEmptyOptional @I18nStringMustNotContainComma private I18nString studySeries
:outertype: Study

The name of the series of studies to which this study belongs.. If specified it must be specified in German and English. It must not contain more than 512 characters and must not contain ",".
The name of the series of studies to which this study belongs. If specified it must be specified in German and English. It must not contain more than 512 characters and must not contain ",".

surveyDesign
^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ description
.. java:field:: @I18nStringSize private I18nString description
:outertype: GeographicCoverage

Free text description for additional information regarding the location.
Free text description for additional information regarding the location. Markdown is supported.

serialVersionUID
^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ description
.. java:field:: @NotNull @I18nStringEntireNotEmpty @I18nStringSize private I18nString description
:outertype: Population

A description of the population. It must be specified in all languages and it must not contain more than 2048 characters.
A description of the population. Markdown is supported. It must be specified in all languages and it must not contain more than 2048 characters.

geographicCoverages
^^^^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: Survey

Arbitrary additional text for this survey. Must not contain more than 2048 characters.
Arbitrary additional text for this survey. Markdown is supported. Must not contain more than 2048 characters.

dataAcquisitionProjectId
^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ description
.. java:field:: @I18nStringSize private I18nString description
:outertype: FilterDetails

A description of this filter condition. Must not contain more than 2048 characters
A description of this filter condition. Markdown is supported. Must not contain more than 2048 characters

expression
^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ description
.. java:field:: @I18nStringSize private I18nString description
:outertype: GenerationDetails

A description of this generation rule. Must not contain more than 2048 characters
A description of this generation rule. Markdown is supported. Must not contain more than 2048 characters

rule
^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ annotations
.. java:field:: @I18nStringSize private I18nString annotations
:outertype: Variable

Arbitrary additional text for this variable. Must not contain more than 2048 characters.
Arbitrary additional text for this variable. Markdown is supported. Must not contain more than 2048 characters.

dataAcquisitionProjectId
^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Loading

0 comments on commit 90eb061

Please sign in to comment.