Skip to content
This repository was archived by the owner on Apr 22, 2025. It is now read-only.

Commit e1ca230

Browse files
author
Hai Nguyen
committed
* Fixing exporting issues
* Modify theme
1 parent fd1dae7 commit e1ca230

File tree

156 files changed

+1593
-1108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+1593
-1108
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Free, open source CRM, Document and Project Management software
22
[![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)
3-
[![Version](https://img.shields.io/badge/Version-5.4.6-brightgreen.svg)](https://community.mycollab.com/)
3+
[![Version](https://img.shields.io/badge/Version-5.4.8-brightgreen.svg)](https://community.mycollab.com/)
44
[![Github](https://img.shields.io/github/downloads/MyCollab/mycollab/total.svg)](https://github.com/MyCollab/mycollab/releases)
55

66

@@ -96,7 +96,7 @@ MyCollab requires a running Java Runtime Environment (8 or greater), Java comman
9696

9797
## Installation
9898

99-
The current MyCollab version is 5.4.6 released on 6th February, 2017. This branch focuses in monitoring, customize options for on-demand edition.
99+
The current MyCollab version is 5.4.8 released on 26th February, 2017. This branch focuses in monitoring, customize options for on-demand edition.
100100

101101
1. Download MyCollab binary - https://www.mycollab.com/self-hosted/
102102
2. Follow installation guideline at https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/installing-mycollab/

mycollab-app-community/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.mycollab</groupId>
99
<artifactId>mycollab-parent-community</artifactId>
10-
<version>5.4.7</version>
10+
<version>5.4.8</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,26 @@ understanding in a matter of minutes.
4040
Last changelog
4141
==============
4242

43+
Version 5.4.8
44+
-------------
45+
46+
**Library Upgrades**
47+
48+
* Jackrabbit 2.15.1
49+
* HikariCP 2.6.1, Cglib 3.2.5
50+
51+
**Improvements & New Features**
52+
53+
* Theme modification
54+
* Allow upload icons for CRM account
55+
* Several minor bug fixes
56+
57+
**Bug Fixes**
58+
59+
* [Premium] Can not edit bug in the mobile application
60+
* Export files may fail to export wrong file type
61+
62+
4363
Version 5.4.7
4464
-------------
4565

mycollab-caching/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.mycollab</groupId>
99
<artifactId>mycollab-parent-community</artifactId>
10-
<version>5.4.7</version>
10+
<version>5.4.8</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>

mycollab-client-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>mycollab-parent-community</artifactId>
77
<groupId>com.mycollab</groupId>
8-
<version>5.4.7</version>
8+
<version>5.4.8</version>
99
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* This file is part of mycollab-client-api.
3+
*
4+
* mycollab-client-api is free software: you can redistribute it and/or modify
5+
* it under the terms of the GNU General Public License as published by
6+
* the Free Software Foundation, either version 3 of the License, or
7+
* (at your option) any later version.
8+
*
9+
* mycollab-client-api is distributed in the hope that it will be useful,
10+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
* GNU General Public License for more details.
13+
*
14+
* You should have received a copy of the GNU General Public License
15+
* along with mycollab-client-api. If not, see <http://www.gnu.org/licenses/>.
16+
*/
17+
package com.mycollab.module.project.domain;
18+
19+
/**
20+
*
21+
* @author MyCollab Ltd
22+
* @since 5.4.9
23+
*/
24+
public class ProjectDto {
25+
private String name;
26+
27+
public String getName() {
28+
return name;
29+
}
30+
31+
public void setName(String name) {
32+
this.name = name;
33+
}
34+
}

mycollab-config/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.mycollab</groupId>
99
<artifactId>mycollab-parent-community</artifactId>
10-
<version>5.4.7</version>
10+
<version>5.4.8</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,17 @@ public class ExceptionFilter extends Filter<ILoggingEvent> {
3131

3232
static {
3333
try {
34-
blacklistClasses = new Class[]{Class.forName("org.apache.jackrabbit.core.cluster.ClusterException"),
34+
blacklistClasses = new Class[]{
35+
Class.forName("org.apache.jackrabbit.core.cluster.ClusterException"),
3536
Class.forName("org.springframework.dao.UncategorizedDataAccessException"),
3637
Class.forName("org.springframework.transaction.CannotCreateTransactionException"),
3738
Class.forName("com.mycollab.core.SessionExpireException"),
3839
Class.forName("java.net.SocketTimeoutException"),
3940
Class.forName("org.apache.commons.mail.EmailException"),
4041
Class.forName("java.net.SocketTimeoutException"),
4142
Class.forName("java.sql.SQLTransientConnectionException"),
42-
Class.forName("com.mysql.jdbc.exceptions.jdbc4.CommunicationsException")};
43+
Class.forName("com.mysql.jdbc.exceptions.jdbc4.CommunicationsException"),
44+
Class.forName("com.mysql.jdbc.exceptions.jdbc4.MySQLNonTransientConnectionException")};
4345
} catch (Exception e) {
4446
}
4547
}

mycollab-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.mycollab</groupId>
99
<artifactId>mycollab-parent-community</artifactId>
10-
<version>5.4.7</version>
10+
<version>5.4.8</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public class Version {
3030
public static final String THEME_MOBILE_VERSION = "mycollab_20161111";
3131

3232
public static String getVersion() {
33-
return "5.4.7";
33+
return "5.4.8";
3434
}
3535

3636
public static DateTime getReleasedDate() {
37-
return new DateTime(2017, 2, 16, 0, 0, 0);
37+
return new DateTime(2017, 4, 2, 0, 0, 0);
3838
}
3939

4040
static int[] getVersionNumbers(String ver) {

0 commit comments

Comments
 (0)