# Conflicts:
#	src/main/webapp/i18n/de/exercise.json
#	src/main/webapp/i18n/en/exercise.json

Fix duplicate "help" entry

See merge request sharing/codeability-sharing-platform!65

Resolve "Collections wieder Leben einhauchen"

See merge request sharing/codeability-sharing-platform!64

# Conflicts:
#	src/main/java/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java
#	src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
#	src/main/webapp/app/exercise/import/exercise-import.component.html
#	src/main/webapp/app/exercise/import/exercise-import.component.ts
#	src/main/webapp/app/shared/model/artemis-exercise-info.model.ts
#	src/main/webapp/app/shared/model/exercise.model.ts

This is no longer an enum, so we cannot reliably
translate it.

Improve test coverage

See merge request sharing/codeability-sharing-platform!63

This accepts data from the updated backend
(from the previous commit) but does not display
any of the new metadata yet.

This is not tested with search results, because I could
not obtain search results locally. Suggestions on the
home page work, but no results are shown in /search

This needs a lot more work, but at least runs.

Remove search by type. This had to be done because
type was changed to learningResourceType, which is
a free string and no longer an enum.
String search for type could be added in the future.

Disable suggestions for format. This was done because
in the current version format is no longer a list
but a single string. There are problems with that, so
this might change again.

Lots of tests fail.

# Conflicts:
#	src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java