Merge remote-tracking branch 'origin/development' into

118-implement-collections

Conflicts:
	pom.xml
	src/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java
	src/main/java/at/ac/uibk/gitsearch/domain/UserWatchList.java
	src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java
	src/main/java/at/ac/uibk/gitsearch/service/dto/SavedSearchesDTO.java
	src/main/java/at/ac/uibk/gitsearch/service/dto/UserWatchListCriteria.java
	src/main/java/at/ac/uibk/gitsearch/service/dto/UserWatchListDTO.java
	src/main/java/at/ac/uibk/gitsearch/web/rest/CheckResource.java
	src/main/resources/config/liquibase/changelog/20210618151109_added_fields_User.xml
	src/main/resources/config/liquibase/master.xml
	src/main/resources/i18n/messages_de.properties
	src/main/resources/i18n/messages_en.properties
	src/main/resources/templates/mail/info/infoEmail.html
	src/main/webapp/app/entities/user-watch-list/user-watch-list.component.html
	src/test/java/at/ac/uibk/gitsearch/repository/search/testESService/ElasticSearch...

.classpath

@@ -26,6 +26,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

src/main/resources/config/liquibase/changelog/20210618151109_added_fields_User.xml

@@ -9,7 +9,11 @@
         <property name="autoIncrement" value="true"/>
 
     <!--
+<<<<<<< HEAD
         extending the entity User.
+=======
+        Added the entity ExtendedUser.
+>>>>>>> refs/remotes/origin/development
     -->
     <changeSet id="20210618151109-1" author="jhipster">
         <addColumn tableName="jhi_user">

src/main/resources/i18n/messages_de.properties

@@ -27,3 +27,11 @@ email.info.textWatchlist=Einige Aufgabe auf Ihrer Lesezeichenliste wurden k�rz
 email.info.noChangesOnWatchlist=Es gab keine Änderungen auf Ihren Lesezeichenliste seit dem letzten Email-Versand.
 email.info.textRegards=Mit besten Grüßen,
 email.info.textClosing=Falls Sie diese Mail nicht mehr erhalten wollen, loggen Sie sich bitte auf der Austauschplattform ein und passen Sie Ihre Einstellungen an:
+# Info email
+email.info.title=Austausch Plattform: Aktualisierungsinformation
+email.info.greeting=Sehr geehrter Nutzer,
+email.info.textIntro=Diese E-Mail wurde versandt, da sich Inhalte in der Plattform, die Sie beobachten, geändert haben.
+email.info.textWatchlist=Einige Aufgabe auf Ihrer Lesezeichenliste wurden k�rzlich aktualisiert:
+email.info.noChangesOnWatchlist=Mit dieser E-Mail möchten wir Sie darüber informieren, dass es keine Änderung in Ihren Lesezeichenlisten gab.
+email.info.textRegards=Mit besten Grüßen,
+email.info.textClosing=Falls Sie diese Mail nicht mehr erhalten wollen, loggen Sie sich bitte auf der Austauschplattform ein und passen Sie Ihre Einstellungen an:

src/main/resources/i18n/messages_en.properties

@@ -25,7 +25,7 @@ email.info.title=Sharing Platform: Update Mail
 email.info.greeting=Dear {0} {1},
 email.info.textIntro=You get this e-mail, because some of your automatic checks was triggered.
 email.info.textWatchlist=Some exercises on your watchlist were recently updated:
-email.info.noChangesOnWatchlist=There were no changes on your watchlists
+email.info.noChangesOnWatchlist=With this e-mail we inform you that there were no changes on your watchlists.
 email.info.textRegards=Regards,
 email.info.textClosing=If you are not interested in getting this e-mail, please log in to the CodeAbility Sharing Platform, and reset your update triggers:
 

src/main/resources/templates/mail/info/infoEmail.html

@@ -9,22 +9,23 @@
         <p th:text="#{email.info.greeting(null == ${user.firstName}?'':${user.firstName}, ${user.lastName})}">
             Dear participant,
         </p>
-        <p th:text="#{email.info.textIntro}">
-            you get this e-mail, because one of your automatic checks was triggered.
-        </p>
-        <p th:text="#{email.info.textWatchlist}">
-            Some exercises on your watchlist were recently updated:
-        </p>
-        <p th:if="${#lists.isEmpty(watchListUpdates)}" th:text="#{email.info.noChangesOnWatchlist}">There were no changes on your watchlists</p>
-            
-        <table th:if="${not #lists.isEmpty(watchListUpdates)}"><caption>Updated Exercises</caption><tr><th scope="col">Exercise Name</th><th scope="col">Watchlist</th></tr>
-        <tr th:each="wlUpdate: ${watchListUpdates}">
-            <td><span th:text="${wlUpdate.key.metadata.title}"></span><br/>
-            <span style="font-size:smaller"><span th:text="${#temporals.format(wlUpdate.key.project.last_activity_at,'dd MMMM yyyy')}">Exercise date</span></span></td>
-            <td th:text="${wlUpdate.value.name}">Exercise title</td>
-        </tr>
-        
-        </table>
+        <p th:if="${#lists.isEmpty(watchListUpdates)}" th:text="#{email.info.noChangesOnWatchlist}">With this E-mail we inform you that there were no changes on your watchlists.</p>
+        <div th:if="${not #lists.isEmpty(watchListUpdates)}">
+	        <p th:text="#{email.info.textIntro}">
+	            you get this e-mail, because one of your automatic checks was triggered.
+	        </p>
+	        <p  th:text="#{email.info.textWatchlist}">
+	            Some exercises on your watchlist were recently updated:
+	        </p>
+	            
+	        <table><caption>Updated Exercises</caption><tr><th scope="col">Exercise Name</th><th scope="col">Watchlist</th></tr>
+	        <tr th:each="wlUpdate: ${watchListUpdates}">
+	            <td><span th:text="${wlUpdate.key.metadata.title}"></span><span th:text="${#temporals.format(wlUpdate.key.project.last_activity_at,'dd MMMM yyyy')}">Exercise title</span></td>
+	            <td th:text="${wlUpdate.value.name}">Exercise title</td>
+	        </tr>
+	        
+	        </table>
+        </div>
         <p>
             <span th:text="#{email.info.textRegards}">Regards, </span>
             <br/>

src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java

@@ -187,4 +187,4 @@ public class InfoMailServiceIT {
 		ElasticSearchTestServerConfiguration.getTestInstance().resetRawMetadata(original, 3);
 	}
 
-}
+}
\ No newline at end of file