* Prepare for the next release

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.9-brightgreen.svg)](https://community.mycollab.com/)
+[![Version](https://img.shields.io/badge/Version-5.4.10-brightgreen.svg)](https://community.mycollab.com/)
 [![Github](https://img.shields.io/github/downloads/MyCollab/mycollab/total.svg)](https://github.com/MyCollab/mycollab/releases)
 
 
@@ -80,7 +80,6 @@ MyCollab provides the rich set features of Project Management, Customer Manageme
   * Gantt chart (for premium users only)
   * Time tracking (for premium users only)
   * Risk Management (For premium users only)
-  * Calendar (For premium users only)
   * People and Permission management
   * Reporting
 
@@ -96,7 +95,7 @@ MyCollab requires a running Java Runtime Environment (8 or greater), Java comman
 
 ## Installation
 
-The current MyCollab version is 5.4.9 released on 27th May, 2017. This branch focuses in monitoring, customize options for on-demand edition.
+The current MyCollab version is 5.4.10 released on 18th June, 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.9</version>
+        <version>5.4.10</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -261,6 +261,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <!--
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <repository>mycollab/mycollab</repository>
+                    <tag>${project.version}</tag>
+                </configuration>
+            </plugin>
+            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>

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

@@ -40,6 +40,22 @@ understanding in a matter of minutes.
 Last changelog
 ==============
 
+Version 5.4.10
+--------------
+
+**Library Upgrades**
+
+* Vaadin 7.7.10, Jackrabbit 2.15.3
+* Other libraries
+
+**Improvements & New Features**
+
+* Update CRM links mobile
+
+**Bug Fixes**
+
+* Customize table columns may cause duplicated items
+
 Version 5.4.9
 -------------
 

mycollab-caching/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.4.9</version>
+        <version>5.4.10</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.9</version>
+        <version>5.4.10</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

mycollab-config/pom.xml

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

mycollab-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.4.9</version>
+        <version>5.4.10</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.apache.tika</groupId>
             <artifactId>tika-core</artifactId>
-            <version>1.14</version>
+            <version>1.15</version>
         </dependency>
 
         <dependency>
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>uk.com.robust-it</groupId>
             <artifactId>cloning</artifactId>
-            <version>1.9.3</version>
+            <version>1.9.4</version>
         </dependency>
     </dependencies>
 </project>

mycollab-dao/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.mycollab</groupId>
         <artifactId>mycollab-parent-community</artifactId>
-        <version>5.4.9</version>
+        <version>5.4.10</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.9</version>
+    <version>5.4.10</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.9</version>
+        <version>5.4.10</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.9</version>
+        <version>5.4.10</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.9</version>
+        <version>5.4.10</version>
         <relativePath>../mycollab-parent-community/pom.xml</relativePath>
     </parent>
     <packaging>jar</packaging>

mycollab-migration/pom.xml

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

mycollab-mobile/pom.xml

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

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/ui/AbstractListPageView.java

@@ -48,7 +48,7 @@ private void doSearch() {
     }
 
     @Override
-    public void onBecomingVisible() {
+    protected void onBecomingVisible() {
         super.onBecomingVisible();
         doSearch();
 

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/AllActivitiesViewImpl.java

@@ -40,6 +40,12 @@ protected AbstractPagedBeanList<ActivityStreamSearchCriteria, SimpleActivityStre
         return new ActivitiesStreamListDisplay();
     }
 
+    @Override
+    protected void onBecomingVisible() {
+        super.onBecomingVisible();
+
+    }
+
     @Override
     protected SearchInputField<ActivityStreamSearchCriteria> createSearchField() {
         return null;

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/cases/CaseReadFormFieldFactory.java

@@ -16,16 +16,23 @@
  */
 package com.mycollab.mobile.module.crm.view.cases;
 
+import com.hp.gagawa.java.elements.A;
+import com.hp.gagawa.java.elements.Div;
+import com.mycollab.html.DivLessFormatter;
+import com.mycollab.module.crm.CrmLinkBuilder;
+import com.mycollab.module.crm.CrmTypeConstants;
 import com.mycollab.module.crm.domain.CaseWithBLOBs;
 import com.mycollab.module.crm.domain.SimpleCase;
 import com.mycollab.module.crm.i18n.OptionI18nEnum.*;
+import com.mycollab.module.crm.ui.CrmAssetsManager;
 import com.mycollab.vaadin.ui.AbstractBeanFieldGroupViewFieldFactory;
 import com.mycollab.vaadin.ui.GenericBeanForm;
 import com.mycollab.vaadin.ui.UIConstants;
 import com.mycollab.vaadin.ui.field.DefaultViewField;
 import com.mycollab.vaadin.ui.field.EmailViewField;
 import com.mycollab.vaadin.ui.field.I18nFormViewField;
 import com.mycollab.vaadin.ui.field.RichTextViewField;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Field;
 
 /**
@@ -44,7 +51,13 @@ protected Field<?> onCreateField(Object propertyId) {
         final SimpleCase cases = attachForm.getBean();
 
         if (propertyId.equals("accountid")) {
-            return new DefaultViewField(cases.getAccountName());
+            if (cases.getAccountid() != null) {
+                A accountLink = new A(CrmLinkBuilder.generateAccountPreviewLinkFull(cases.getAccountid()))
+                        .appendText(cases.getAccountName());
+                Div accountDiv = new Div().appendText(CrmAssetsManager.getAsset(CrmTypeConstants
+                        .ACCOUNT).getHtml()).appendChild(DivLessFormatter.EMPTY_SPACE(), accountLink);
+                return new DefaultViewField(accountDiv.write(), ContentMode.HTML);
+            }
         } else if (propertyId.equals("email")) {
             return new EmailViewField(cases.getEmail());
         } else if (propertyId.equals("assignuser")) {

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/cases/CaseReadViewImpl.java

@@ -14,22 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
  */
-/**
- * This file is part of mycollab-mobile.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
- */
 package com.mycollab.mobile.module.crm.view.cases;
 
 import com.mycollab.common.i18n.GenericI18Enum;

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/contact/ContactReadFormFieldFactory.java

@@ -16,10 +16,16 @@
  */
 package com.mycollab.mobile.module.crm.view.contact;
 
+import com.hp.gagawa.java.elements.A;
+import com.hp.gagawa.java.elements.Div;
 import com.mycollab.common.i18n.GenericI18Enum;
+import com.mycollab.html.DivLessFormatter;
+import com.mycollab.module.crm.CrmLinkBuilder;
+import com.mycollab.module.crm.CrmTypeConstants;
 import com.mycollab.module.crm.domain.Contact;
 import com.mycollab.module.crm.domain.SimpleContact;
 import com.mycollab.module.crm.i18n.OptionI18nEnum.OpportunityLeadSource;
+import com.mycollab.module.crm.ui.CrmAssetsManager;
 import com.mycollab.vaadin.UserUIContext;
 import com.mycollab.vaadin.ui.AbstractBeanFieldGroupViewFieldFactory;
 import com.mycollab.vaadin.ui.GenericBeanForm;
@@ -28,6 +34,7 @@
 import com.mycollab.vaadin.ui.field.DefaultViewField;
 import com.mycollab.vaadin.ui.field.EmailViewField;
 import com.mycollab.vaadin.ui.field.I18nFormViewField;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Field;
 
 /**
@@ -44,21 +51,27 @@ class ContactReadFormFieldFactory extends AbstractBeanFieldGroupViewFieldFactory
     @Override
     protected Field<?> onCreateField(Object propertyId) {
         SimpleContact contact = attachForm.getBean();
-        if (propertyId.equals("accountid")) {
-            return new DefaultViewField(contact.getAccountName());
-        } else if (propertyId.equals("email")) {
+        if (Contact.Field.accountid.equalTo(propertyId)) {
+            if (contact.getAccountid() != null) {
+                A accountLink = new A(CrmLinkBuilder.generateAccountPreviewLinkFull(contact.getAccountid()))
+                        .appendText(contact.getAccountName());
+                Div accountDiv = new Div().appendText(CrmAssetsManager.getAsset(CrmTypeConstants
+                        .ACCOUNT).getHtml()).appendChild(DivLessFormatter.EMPTY_SPACE(), accountLink);
+                return new DefaultViewField(accountDiv.write(), ContentMode.HTML);
+            }
+        } else if (Contact.Field.email.equalTo(propertyId)) {
             return new EmailViewField(contact.getEmail());
-        } else if (propertyId.equals("assignuser")) {
+        } else if (Contact.Field.assignuser.equalTo(propertyId)) {
             return new DefaultViewField(contact.getAssignUserFullName());
-        } else if (propertyId.equals("iscallable")) {
+        } else if (Contact.Field.iscallable.equalTo(propertyId)) {
             if (Boolean.FALSE.equals(contact.getIscallable())) {
                 return new DefaultViewField(UserUIContext.getMessage(GenericI18Enum.BUTTON_NO));
             } else {
                 return new DefaultViewField(UserUIContext.getMessage(GenericI18Enum.BUTTON_YES));
             }
-        } else if (propertyId.equals("birthday")) {
+        } else if (Contact.Field.birthday.equalTo(propertyId)) {
             return new DefaultViewField(UserUIContext.formatDate(contact.getBirthday()));
-        } else if (propertyId.equals("firstname")) {
+        } else if (Contact.Field.firstname.equalTo(propertyId)) {
             return new DefaultViewField(contact.getFirstname());
         } else if (Contact.Field.leadsource.equalTo(propertyId)) {
             return new I18nFormViewField(contact.getLeadsource(), OpportunityLeadSource.class).withStyleName(UIConstants.FIELD_NOTE);

mycollab-mobile/src/main/java/com/mycollab/mobile/module/crm/view/contact/ContactReadViewImpl.java

@@ -14,53 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
  */
-/**
- * This file is part of mycollab-mobile.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
- * <p>
- * This file is part of mycollab-mobile.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
- */
-/**
- * This file is part of mycollab-mobile.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * mycollab-mobile 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with mycollab-mobile.  If not, see <http://www.gnu.org/licenses/>.
- */
 package com.mycollab.mobile.module.crm.view.contact;
 
 import com.mycollab.common.i18n.GenericI18Enum;