* The new file module (improved from the MyCollab 6.0.0)

* Verify email status before sending email
* Show error message when user edit ticket which has unset duration value
* Can not display the right date value in project notification
* Some long text don't display in the box
* Prepare for the new MyCollab 7.0.1

Author: haiphucnguyen

mycollab-app-community/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

mycollab-app-community/src/main/resources/banner.txt

@@ -5,5 +5,5 @@
  || \/ ||  )/  ((    ((   )) ||    ||    ||=|| ||=)     ((    ((   )) || \/ || || \/ || || || ||\\|| ||   ||    )/
  ||    || //    \\__  \\_//  ||__| ||__| || || ||_))     \\__  \\_//  ||    || ||    || \\_// || \|| ||   ||   //
 
- Version 7.0.0
+ Version 7.0.1
  ===================================================================================================================

mycollab-caching/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

mycollab-config/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

mycollab-config/src/main/java/com/mycollab/configuration/ApplicationConfiguration.kt

@@ -31,8 +31,8 @@ class ApplicationConfiguration(var siteName: String = "MyCollab", var descriptio
                                var notifyEmail: String = "noreply@mycollab.com") {
 
     fun defaultUrls() =
-            mutableMapOf("facebook_url" to (facebookUrl ?: ""),
-                    "google_url" to (googleUrl ?: ""),
-                    "linkedin_url" to (linkedinUrl ?: ""),
-                    "twitter_url" to (twitterUrl ?: ""))
+            mutableMapOf("facebook_url" to facebookUrl,
+                    "google_url" to googleUrl,
+                    "linkedin_url" to linkedinUrl,
+                    "twitter_url" to twitterUrl)
 }

mycollab-config/src/main/java/com/mycollab/logging/LogFilter.kt

@@ -27,7 +27,8 @@ import ch.qos.logback.core.spi.FilterReply
 class LogFilter : Filter<ILoggingEvent>() {
 
     override fun decide(event: ILoggingEvent): FilterReply =
-            if (event.message.contains("Failed to execute SQL (stacktrace on DEBUG log level)")) {
+            if (event.message.contains("Failed to execute SQL (stacktrace on DEBUG log level)")
+                    || event.message.contains("ERROR o.j.p.CENTRAL_LOCK")) {
                 FilterReply.DENY
             } else {
                 FilterReply.NEUTRAL

mycollab-config/src/main/java/com/mycollab/logging/MailAppender.kt

@@ -47,7 +47,7 @@ class MailAppender : SMTPAppender() {
     }
 
     override fun sendBuffer(cb: CyclicBuffer<ILoggingEvent>?, lastEventObject: ILoggingEvent?) {
-//        if (!isSessionCreated) {
+        if (!isSessionCreated) {
             try {
                 val emailConfiguration = AppContextUtil.getSpringBean(EmailConfiguration::class.java)
                 val props = Properties(OptionHelper.getSystemProperties())
@@ -90,8 +90,7 @@ class MailAppender : SMTPAppender() {
             } catch (e: Exception) {
                 addError("Error to get email configuration")
             }
-
-//        }
+        }
         super.sendBuffer(cb, lastEventObject)
     }
 }

mycollab-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>uk.com.robust-it</groupId>
             <artifactId>cloning</artifactId>
-            <version>1.9.11</version>
+            <version>1.9.12</version>
         </dependency>
     </dependencies>
 </project>

mycollab-core/src/main/java/com/mycollab/core/Version.java

@@ -25,15 +25,14 @@
  * @since 4.4.0
  */
 public class Version {
-    public static final String THEME_VERSION = "mycollab_20181214";
-    public static final String THEME_MOBILE_VERSION = "mycollab_20161111";
+    public static final String THEME_VERSION = "mycollab_20190223";
 
     public static String getVersion() {
-        return "7.0.0";
+        return "7.0.1";
     }
 
     public static LocalDate getReleasedDate() {
-        return LocalDate.of(2017, 5, 25);
+        return LocalDate.of(2019, 2, 22);
     }
 
     static int[] getVersionNumbers(String ver) {

mycollab-core/src/main/java/com/mycollab/core/utils/DateTimeUtils.java

@@ -53,9 +53,16 @@ public static LocalDate convertDateByString(String strDate, String format) {
         }
     }
 
-    public static String convertToStringWithUserTimeZone(String dateVal, String dateFormat, Locale locale, ZoneId userTimeZone) {
+    public static String convertDateToStringWithUserTimeZone(String dateVal, String dateFormat, Locale locale, ZoneId userTimeZone) {
+        LocalDate date = parseDate(dateVal);
+        if (date != null) {
+            return formatDate(date, dateFormat, locale, userTimeZone);
+        } else return "";
+    }
+
+    public static String convertDateTimeToStringWithUserTimeZone(String dateVal, String datetimeFormat, Locale locale, ZoneId userTimeZone) {
         LocalDateTime date = parseDateTimeWithMilisByW3C(dateVal);
-        return convertToStringWithUserTimeZone(date, dateFormat, locale, userTimeZone);
+        return convertDateTimeToStringWithUserTimeZone(date, datetimeFormat, locale, userTimeZone);
     }
 
     /**
@@ -95,7 +102,7 @@ public static String formatDateToW3C(LocalDate date) {
         return "";
     }
 
-    public static String convertToStringWithUserTimeZone(LocalDateTime date, String dateFormat, Locale locale, ZoneId userTimeZone) {
+    public static String convertDateTimeToStringWithUserTimeZone(LocalDateTime date, String dateFormat, Locale locale, ZoneId userTimeZone) {
         if (date == null)
             return "";
         return formatDate(date, dateFormat, locale, userTimeZone);