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

Commit bfe0e0c

Browse files
haiphucnguyenhaiphucnguyen
committed
Merge branch 'newdist'
Prepare for the MyCollab 7.0.0
2 parents 3d73e24 + 541305f commit bfe0e0c

File tree

3,098 files changed

+63990
-230018
lines changed

Some content is hidden

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

3,098 files changed

+63990
-230018
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ language: java
66
jdk:
77
- oraclejdk8
88
before_script:
9-
- mysql -e 'create database mycollab_test;'
9+
# - mysql -e 'create database mycollab_test;'
1010
- cd mycollab-deployer-community
1111
notifications:
1212
email:
13-
- hainguyen@esofthead.com
13+
- haiphucnguyen@gmail.com
1414
env:
1515
global:
1616
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created

‎README.md‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
# Free, open source CRM, Document and Project Management software
1+
# Free, open source Project Management software
22
[![License](http://img.shields.io/badge/License-AGPLv3-orange.svg)](https://www.gnu.org/licenses/agpl-3.0.en.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)
33
[![Version](https://img.shields.io/badge/Version-6.0.0-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

77
## Introduction
88

9-
MyCollab is the free and open source collaboration tools, it has three existing modules: Project Management, CRM and Document Management. Intuitive UI, rich features, high performance and stable are the advantages compare with various popular tools in the market such as Redmine, Bugzilla, Mantis etc. This open source is included into a trusted commercial product that is deployed on hundreds of companies' servers.
10-
11-
MyCollab does work well on both desktop and mobile devices.
9+
MyCollab is the free and open source project management software. Intuitive UI, rich features, high performance and stable are the advantages compare with various popular tools in the market such as Redmine, Bugzilla, Mantis etc. This open source is included into a trusted commercial product that is deployed on hundreds of companies' servers.
1210

1311
<table>
1412
<tr>
@@ -67,18 +65,15 @@ Visit our website https://www.mycollab.com/ to get a free trial of the premium s
6765

6866
## Features
6967
MyCollab provides the rich set features of Project Management, Customer Management module and online collaboration methods.
70-
* CRM
71-
* Document Management
7268
* Project Management
73-
* Online Document Editor
7469
* Activity stream and audit logging
7570
* Kanban board
7671
* Roadmap view
7772
* Issues Management
7873
* Tasks and dependencies management
7974
* Milestones
80-
* Gantt chart (for premium users only)
8175
* Time tracking (for premium users only)
76+
* Invoice management (for premium users only)
8277
* Risk Management (For premium users only)
8378
* People and Permission management
8479
* Reporting

‎mycollab-app-community/pom.xml‎

Lines changed: 38 additions & 25 deletions
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>6.0.0</version>
10+
<version>7.0.0</version>
1111
<relativePath>../mycollab-parent-community/pom.xml</relativePath>
1212
</parent>
1313
<packaging>jar</packaging>
@@ -26,11 +26,13 @@
2626
<version>${project.version}</version>
2727
</dependency>
2828

29+
<!--
2930
<dependency>
3031
<groupId>com.mycollab</groupId>
3132
<artifactId>mycollab-mobile</artifactId>
3233
<version>${project.version}</version>
3334
</dependency>
35+
-->
3436

3537
<dependency>
3638
<groupId>com.mycollab</groupId>
@@ -85,14 +87,45 @@
8587
</exclusion>
8688
</exclusions>
8789
</dependency>
88-
90+
-->
8991
<dependency>
9092
<groupId>com.vaadin</groupId>
91-
<artifactId>vaadin-client-compiler</artifactId>
93+
<artifactId>vaadin-compatibility-client</artifactId>
9294
<scope>provided</scope>
9395
</dependency>
94-
-->
96+
9597
</dependencies>
98+
99+
<profiles>
100+
<profile>
101+
<id>Vaadin</id>
102+
<build>
103+
<plugins>
104+
<plugin>
105+
<groupId>com.vaadin</groupId>
106+
<artifactId>vaadin-maven-plugin</artifactId>
107+
<version>${vaadin.version}</version>
108+
<configuration>
109+
<webappDirectory>src/main/resources/VAADIN/widgetsets/</webappDirectory>
110+
</configuration>
111+
<executions>
112+
<execution>
113+
<goals>
114+
<goal>update-theme</goal>
115+
<goal>update-widgetset</goal>
116+
<goal>compile</goal>
117+
<!-- Comment out compile-theme goal to use on-the-fly theme compilation -->
118+
<goal>compile-theme</goal>
119+
</goals>
120+
<phase>compile</phase>
121+
</execution>
122+
</executions>
123+
</plugin>
124+
</plugins>
125+
</build>
126+
</profile>
127+
</profiles>
128+
96129
<build>
97130
<plugins>
98131
<plugin>
@@ -168,26 +201,6 @@
168201
</execution>
169202
</executions>
170203
</plugin>
171-
<!--
172-
<plugin>
173-
<groupId>com.vaadin</groupId>
174-
<artifactId>vaadin-maven-plugin</artifactId>
175-
<version>${vaadin.version}</version>
176-
<configuration>
177-
<webappDirectory>src/main/resources/VAADIN/widgetsets/</webappDirectory>
178-
</configuration>
179-
<executions>
180-
<execution>
181-
<goals>
182-
<goal>update-theme</goal>
183-
<goal>update-widgetset</goal>
184-
<goal>compile</goal>
185-
<goal>compile-theme</goal>
186-
</goals>
187-
</execution>
188-
</executions>
189-
</plugin>
190-
-->
191204
<plugin>
192205
<groupId>org.apache.maven.plugins</groupId>
193206
<artifactId>maven-jar-plugin</artifactId>
@@ -338,7 +351,7 @@
338351
</execution>
339352
</executions>
340353
</plugin>
341-
<!--
354+
<!--
342355
<plugin>
343356
<groupId>com.spotify</groupId>
344357
<artifactId>dockerfile-maven-plugin</artifactId>

‎mycollab-app-community/src/main/config/application.properties.ftl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ server.cdnUrl=http://%s:%d/assets/
1919
#=====================================================
2020
# DATABASE CONFIGURATION
2121
#=====================================================
22-
spring.datasource.driverClassName=com.mysql.jdbc.Driver
22+
spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
2323
spring.datasource.url=${dbUrl}
2424
spring.datasource.username=${dbUser}
2525
spring.datasource.password=${dbPassword}

‎mycollab-app-community/src/main/docker/postgres.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: '3.1'
2+
services:
3+
db:
4+
image: postgres:11.1
5+
restart: always
6+
ports:
7+
- "5432:5432"
8+
environment:
9+
POSTGRES_PASSWORD: mycollab123
10+
POSTGRES_DB: mycollab

‎mycollab-app-community/src/main/java/com/mycollab/widgetset/MyCollabMobileWidgetSet.gwt.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎mycollab-app-community/src/main/java/com/mycollab/widgetset/MyCollabWidgetSet.gwt.xml‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,30 @@
33
"-//Google Inc.//DTD Google Web Toolkit 1.7.0//EN"
44
"http://google-web-toolkit.googlecode.com/svn/tags/1.7.0/distro-source/core/src/gwt-module.dtd">
55
<module>
6-
<!-- WS Compiler: manually edited -->
76

8-
<inherits name="fi.jasoft.dragdroplayouts.DragDropLayoutsWidgetSet" />
7+
<!-- WS Compiler: manually edited -->
98

10-
<inherits name="org.vaadin.openesignforms.ckeditor.widgetset.VaadinCKEditorWidgetset" />
9+
<inherits name="com.vaadin.contextmenu.WidgetSet" />
1110

1211
<inherits name="org.vaadin.hene.popupbutton.widgetset.PopupbuttonWidgetset" />
1312

14-
<inherits name="org.vaadin.risto.stylecalendar.StyleCalendarWidgetset" />
13+
<inherits name="org.vaadin.addons.WidgetSet" />
1514

1615
<inherits name="com.vaadin.DefaultWidgetSet" />
1716

18-
<inherits name="org.vaadin.peter.buttongroup.ButtonGroupWidgetset" />
17+
<inherits name="com.vaadin.v7.Vaadin7WidgetSet" />
1918

20-
<inherits name="com.vaadin.addon.contextmenu.WidgetSet" />
19+
<set-property name="vaadin.profiler" value="false" />
2120

22-
<inherits name="org.vaadin.tepi.listbuilder.widgetset.ListBuilderWidgetset" />
21+
<inherits name="org.tepi.listbuilder.WidgetSet" />
2322

2423
<inherits name="org.vaadin.easyuploads.Widgetset" />
2524

26-
<inherits name="com.mycollab.vaadin.addon.webcomponents.WidgetSet" />
27-
28-
<inherits name="org.vaadin.suggestfield.WidgetSet" />
29-
30-
<inherits name="org.vaadin.addons.fancybox.FancyboxWidgetSet" />
31-
32-
<inherits name="org.vaadin.jouni.restrain.RestrainWidgetset" />
25+
<inherits name="org.vaadin.alump.ckeditor.WidgetSet" />
3326

34-
<inherits name="com.ejt.vaadin.loginform.WidgetSet" />
27+
<inherits name="org.vaadin.cropper.WidgetSet" />
3528

36-
<inherits name="org.vaadin.addons.comboboxmultiselect.WidgetSet" />
29+
<inherits name="com.explicatis.ext_token_field.WidgetSet"/>
3730

38-
<inherits name="org.vaadin.addons.CssCheckBoxWidgetSet" />
39-
</module>
31+
<inherits name="org.vaadin.addons.stackpanel.WidgetSet"/>
32+
</module>

‎mycollab-app-community/src/main/resources/VAADIN/widgetsets/WEB-INF/deploy/com.mycollab.widgetset.MyCollabMobileWidgetSet/rpcPolicyManifest/manifest.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)