* Fixing exporting issues

* Modify theme

README.md

@@ -1,6 +1,6 @@
 # Free, open source CRM, Document and Project Management software
 [![License](http://img.shields.io/badge/License-GPLv3-orange.svg)](http://www.gnu.org/copyleft/gpl.html) [![Project Stats](https://www.openhub.net/p/mycollab/widgets/project_thin_badge.gif)](https://www.openhub.net/p/mycollab) [![Build](https://travis-ci.org/MyCollab/mycollab.svg)](https://travis-ci.org/MyCollab/mycollab)
-[![Version](https://img.shields.io/badge/Version-5.4.6-brightgreen.svg)](https://community.mycollab.com/)
+[![Version](https://img.shields.io/badge/Version-5.4.8-brightgreen.svg)](https://community.mycollab.com/)
 [![Github](https://img.shields.io/github/downloads/MyCollab/mycollab/total.svg)](https://github.com/MyCollab/mycollab/releases)
 
 
@@ -96,7 +96,7 @@ MyCollab requires a running Java Runtime Environment (8 or greater), Java comman
 
 ## Installation
 
-The current MyCollab version is 5.4.6 released on 6th February, 2017. This branch focuses in monitoring, customize options for on-demand edition.
+The current MyCollab version is 5.4.8 released on 26th February, 2017. This branch focuses in monitoring, customize options for on-demand edition.
 
 1. Download MyCollab binary - https://www.mycollab.com/self-hosted/
 2. Follow installation guideline at https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/installing-mycollab/

mycollab-app-community/pom.xml

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

mycollab-app-community/src/main/installer-resources/README.md

@@ -40,6 +40,26 @@ understanding in a matter of minutes.
 Last changelog
 ==============
 
+Version 5.4.8
+-------------
+
+**Library Upgrades**
+
+* Jackrabbit 2.15.1
+* HikariCP 2.6.1, Cglib 3.2.5
+
+**Improvements & New Features**
+
+* Theme modification
+* Allow upload icons for CRM account
+* Several minor bug fixes
+
+**Bug Fixes**
+
+* [Premium] Can not edit bug in the mobile application
+* Export files may fail to export wrong file type
+
+
 Version 5.4.7
 -------------
 

mycollab-caching/pom.xml

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

mycollab-client-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>mycollab-parent-community</artifactId>
         <groupId>com.mycollab</groupId>
-        <version>5.4.7</version>
+        <version>5.4.8</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

mycollab-client-api/src/main/java/com/mycollab/module/project/domain/ProjectDto.java

@@ -0,0 +1,34 @@
+/**
+ * This file is part of mycollab-client-api.
+ *
+ * mycollab-client-api is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * mycollab-client-api is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with mycollab-client-api.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.mycollab.module.project.domain;
+
+/**
+ *
+ * @author MyCollab Ltd
+ * @since 5.4.9
+ */
+public class ProjectDto {
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

mycollab-config/pom.xml

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

mycollab-config/src/main/java/com/mycollab/configuration/logging/ExceptionFilter.java

@@ -31,15 +31,17 @@ public class ExceptionFilter extends Filter<ILoggingEvent> {
 
     static {
         try {
-            blacklistClasses = new Class[]{Class.forName("org.apache.jackrabbit.core.cluster.ClusterException"),
+            blacklistClasses = new Class[]{
+                    Class.forName("org.apache.jackrabbit.core.cluster.ClusterException"),
                     Class.forName("org.springframework.dao.UncategorizedDataAccessException"),
                     Class.forName("org.springframework.transaction.CannotCreateTransactionException"),
                     Class.forName("com.mycollab.core.SessionExpireException"),
                     Class.forName("java.net.SocketTimeoutException"),
                     Class.forName("org.apache.commons.mail.EmailException"),
                     Class.forName("java.net.SocketTimeoutException"),
                     Class.forName("java.sql.SQLTransientConnectionException"),
-                    Class.forName("com.mysql.jdbc.exceptions.jdbc4.CommunicationsException")};
+                    Class.forName("com.mysql.jdbc.exceptions.jdbc4.CommunicationsException"),
+                    Class.forName("com.mysql.jdbc.exceptions.jdbc4.MySQLNonTransientConnectionException")};
         } catch (Exception e) {
         }
     }

mycollab-core/pom.xml

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

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

@@ -30,11 +30,11 @@ public class Version {
     public static final String THEME_MOBILE_VERSION = "mycollab_20161111";
 
     public static String getVersion() {
-        return "5.4.7";
+        return "5.4.8";
     }
 
     public static DateTime getReleasedDate() {
-        return new DateTime(2017, 2, 16, 0, 0, 0);
+        return new DateTime(2017, 4, 2, 0, 0, 0);
     }
 
     static int[] getVersionNumbers(String ver) {

mycollab-dao/pom.xml

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

mycollab-deployer-community/pom.xml

@@ -5,7 +5,7 @@
     <name>mycollab-deployer-community</name>
     <groupId>com.mycollab</groupId>
     <artifactId>mycollab-deployer-community</artifactId>
-    <version>5.4.7</version>
+    <version>5.4.8</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.0.4</maven>

mycollab-esb/pom.xml

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

mycollab-jackrabbit/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.4.7</version>
+        <version>5.4.8</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
 

mycollab-localization/pom.xml

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

mycollab-localization/src/main/java/com/mycollab/common/i18n/GenericI18Enum.java

@@ -98,6 +98,7 @@ public enum GenericI18Enum {
     ACTION_SKIP,
     ACTION_PRINT,
     ACTION_EXPORT,
+    ACTION_EXPORT_MAIL,
     ACTION_PREVIEW,
     ACTION_SELECT_VALUE,
     ACTION_SELECT_COLUMNS,
@@ -206,6 +207,8 @@ public enum GenericI18Enum {
     OPT_SIMPLE_MODE,
     OPT_CHART_MODE,
     OPT_SHARED_TO_ME,
+    OPT_CHANGE_IMAGE,
+    OPT_UPLOAD_IMAGE,
 
     M_BUTTON_BACK,
     M_BUTTON_SEND

mycollab-localization/src/main/java/com/mycollab/module/project/i18n/ClientI18nEnum.java

@@ -30,6 +30,5 @@ public enum ClientI18nEnum {
     EDIT,
 
     OPT_NUM_PROJECTS,
-    OPT_REMOVE_CLIENT,
-    OPT_CHANGE_LOGO_HELP
+    OPT_REMOVE_CLIENT
 }

mycollab-localization/src/main/java/com/mycollab/module/project/i18n/ProjectI18nEnum.java

@@ -70,7 +70,6 @@ public enum ProjectI18nEnum {
     OPT_GENERAL,
     OPT_FEATURES,
     OPT_CLIENT_AND_BILLING,
-    OPT_CHANGE_LOGO_HELP,
 
     ERROR_MUST_CHOOSE_TEMPLATE_PROJECT,
     ERROR_PROJECT_KEY_INVALID

mycollab-localization/src/main/resources/common-generic_en-US.properties

@@ -73,6 +73,7 @@ ACTION_HELP=Help
 ACTION_MODIFY=Modify
 ACTION_PRINT=Print
 ACTION_EXPORT=Export
+ACTION_EXPORT_MAIL=Export & Mail
 ACTION_PREVIEW=Preview
 ACTION_SELECT_VALUE=Select {0}
 ACTION_SELECT_COLUMNS=Select columns
@@ -198,6 +199,8 @@ OPT_COMMENT=Comment
 OPT_SIMPLE_MODE=Simple mode
 OPT_CHART_MODE=Chart mode
 OPT_SHARED_TO_ME=Share to me
+OPT_CHANGE_IMAGE=Click to change image
+OPT_UPLOAD_IMAGE=Upload an image
 
 HELP_SPAM_FILTER_PREVENT_TITLE=A note about spam filters
 HELP_SPAM_FILTER_PREVENT_MESSAGE=If you do not receive the confirmation message within a few minutes of signing up, please check your Spam or Bulk E-Mail folder just in case the confirmation email got delivered there instead of your inbox. If so, select the confirmation message and mark it Not Spam, which should allow future messages to get through.

mycollab-localization/src/main/resources/project-client_en-US.properties

@@ -4,5 +4,4 @@ DETAIL=Client Details
 SINGLE=Client
 EDIT=Edit Client
 OPT_NUM_PROJECTS=Projects ({0})
-OPT_REMOVE_CLIENT=Remove client "{0}"
-OPT_CHANGE_LOGO_HELP=To change the client logo, select '{0}' and upload the new client logo
+OPT_REMOVE_CLIENT=Remove client "{0}"

mycollab-localization/src/main/resources/project_en-US.properties

@@ -49,6 +49,5 @@ OPT_SEARCH_TERM=Search for "%s" (Found: %d)
 OPT_GENERAL=General
 OPT_FEATURES=Features
 OPT_CLIENT_AND_BILLING=Client and Billing
-OPT_CHANGE_LOGO_HELP=To change the project logo, go to project menu, select {0} and upload the new project logo
 ERROR_MUST_CHOOSE_TEMPLATE_PROJECT=You must choose a template project
 ERROR_PROJECT_KEY_INVALID=Project key must be not null and less than 3 characters

mycollab-migration/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.4.7</version>
+        <version>5.4.8</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>4.0.3</version>
+            <version>4.1.2</version>
         </dependency>
     </dependencies>
 </project>

mycollab-mobile/pom.xml

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

mycollab-parent-community/pom.xml

@@ -6,7 +6,7 @@
     <name>mycollab-parent-community</name>
     <groupId>com.mycollab</groupId>
     <artifactId>mycollab-parent-community</artifactId>
-    <version>5.4.7</version>
+    <version>5.4.8</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.3.0</maven>
@@ -15,15 +15,15 @@
         <springVersion>4.3.2.RELEASE</springVersion>
         <aspectjVersion>1.8.9</aspectjVersion>
         <java.version>1.8</java.version>
-        <slf4jVersion>1.7.22</slf4jVersion>
+        <slf4jVersion>1.7.25</slf4jVersion>
         <servletVersion>3.1.0</servletVersion>
         <vaadinVersion>7.7.3</vaadinVersion>
         <jettyVersion>9.3.12.v20160915</jettyVersion>
         <mysqlVersion>5.1.40</mysqlVersion>
         <junitVersion>4.12</junitVersion>
-        <jackrabbitVersion>2.15.0</jackrabbitVersion>
+        <jackrabbitVersion>2.15.1</jackrabbitVersion>
         <jacksonVersion>2.8.6</jacksonVersion>
-        <jodaVersion>2.9.7</jodaVersion>
+        <jodaVersion>2.9.9</jodaVersion>
         <scala.binary.version>2.12</scala.binary.version>
         <scala.version>2.12.1</scala.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -55,13 +55,13 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.1.9</version>
+            <version>1.2.2</version>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.1.9</version>
+            <version>1.2.2</version>
         </dependency>
 
         <dependency>
@@ -204,7 +204,7 @@
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
-            <version>3.2.4</version>
+            <version>3.2.5</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ant</groupId>
@@ -273,7 +273,7 @@
         <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
-            <version>2.6.0</version>
+            <version>2.6.1</version>
         </dependency>
 
         <dependency>

mycollab-reporting/pom.xml

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