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

Commit ec51d28

Browse files
haiphucnguyenhaiphucnguyen
committed
* Update screenshots
* Update the document links * Fix the inline edit saving user without losing focus * A couple of bug fixes
1 parent d4f12dc commit ec51d28

File tree

27 files changed

+144
-85
lines changed

27 files changed

+144
-85
lines changed

‎README.md‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 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)
3-
[![Version](https://img.shields.io/badge/Version-7.0.0-brightgreen.svg)](https://community.mycollab.com/)
3+
[![Version](https://img.shields.io/badge/Version-7.0.0-brightgreen.svg)](https://docs.mycollab.com/)
44
[![Github](https://img.shields.io/github/downloads/MyCollab/mycollab/total.svg)](https://github.com/MyCollab/mycollab/releases)
55

66

@@ -11,48 +11,48 @@ MyCollab is the free and open source project management software. Intuitive UI,
1111
<table>
1212
<tr>
1313
<td align="center">
14-
<a href="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Dashboard.png" target="_blank" title="Project Dashboard">
15-
<img src="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Dashboard-300x151.png" alt="Project Dashboard">
14+
<a href="https://c2.staticflickr.com/8/7836/33297801958_8c403afca8_o.png" target="_blank" title="Project Dashboard">
15+
<img src="https://c2.staticflickr.com/8/7836/33297801958_c3958e94ba_n.jpg" alt="Project Dashboard">
1616
</a>
1717
<br />
1818
<em>Project Dashboard</em>
1919
</td>
2020
<td align ="center">
21-
<a href="https://community.mycollab.com/wp-content/uploads/2015/12/Bug-Dashboard.png" target="_blank" title="Bug Dashboard">
22-
<img src="https://community.mycollab.com/wp-content/uploads/2015/12/Bug-Dashboard-300x151.png" alt="Bug Dashboard">
21+
<a href="https://c2.staticflickr.com/8/7918/47173080821_12241886b9_o.png" target="_blank" title="Ticket Dashboard">
22+
<img src="https://c2.staticflickr.com/8/7918/47173080821_6a9ae24fb7_n.jpg" alt="Ticket Dashboard">
2323
</a>
2424
<br />
25-
<em>Bug Dashboard</em>
25+
<em>Ticket Dashboard</em>
2626
</td>
2727
<td align="center">
28-
<a href="https://community.mycollab.com/wp-content/uploads/2015/12/Task-Dashboard.png" target="_blank" title="Task Dashboard">
29-
<img src="https://community.mycollab.com/wp-content/uploads/2015/12/Task-Dashboard-300x151.png" alt="Task Dashboard">
28+
<a href="https://c2.staticflickr.com/8/7868/46259674665_3b32a73f07_o.png" target="_blank" title="Kanban Board">
29+
<img src="https://c2.staticflickr.com/8/7868/46259674665_d3f532f637_n.jpg" alt="Kanban Board">
3030
</a>
3131
<br />
32-
<em>Task Dashboard</em>
32+
<em>Kanban Board</em>
3333
</td>
3434
</tr>
3535
<tr>
3636
<td align="center">
37-
<a href="https://community.mycollab.com/wp-content/uploads/2015/12/Kanban-Board.png" target="_blank" title="Kanban Board">
38-
<img src="https://community.mycollab.com/wp-content/uploads/2015/12/Kanban-Board-300x151.png" alt="Kanban Board">
37+
<a href="https://c2.staticflickr.com/8/7874/46259716315_480d6ea678_o.png" target="_blank" title="Task View">
38+
<img src="https://c2.staticflickr.com/8/7874/46259716315_8a5d84acb4_n.jpg" alt="Task View">
3939
</a>
4040
<br />
41-
<em>Kanban Board</em>
41+
<em>Task View</em>
4242
</td>
4343
<td align="center">
44-
<a href="https://community.mycollab.com/wp-content/uploads/2015/12/Roadmap-2.png" target="_blank" title="Roadmap">
45-
<img src="https://community.mycollab.com/wp-content/uploads/2015/12/Roadmap-2-300x151.png" alt="Roadmap">
44+
<a href="https://c2.staticflickr.com/8/7896/47173858441_950c6757ab_o.png" target="_blank" title="Members">
45+
<img src="https://c2.staticflickr.com/8/7896/47173858441_f4676175d7_n.jpg" alt="Members">
4646
</a>
4747
<br />
48-
<em>Roadmap</em>
48+
<em>Members</em>
4949
</td>
5050
<td align="center">
51-
<a href="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Member.png" target="_blank" title="Project Members">
52-
<img src="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Member-300x151.png" alt="Project Members">
51+
<a href="https://c2.staticflickr.com/8/7862/40209055153_0a16241b1b_o.png" target="_blank" title="Settings">
52+
<img src="https://c2.staticflickr.com/8/7862/40209055153_54a427e593_n.jpg" alt="Settings">
5353
</a>
5454
<br />
55-
<em>Project Members</em>
55+
<em>Settings</em>
5656
</td>
5757
</tr>
5858
</table>
@@ -91,18 +91,18 @@ MyCollab requires a running Java Runtime Environment (8 or greater), Java comman
9191
## Installation
9292

9393
1. Download MyCollab binary - https://www.mycollab.com/self-hosted/
94-
2. Follow installation guideline at https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/installing-mycollab/
94+
2. Follow installation guideline at https://docs.mycollab.com/getting-started/installation/
9595

96-
If you need to understand the more MyCollab advanced configuration settings, please visit the link https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/advanced-configuration/. You will finish reading and understanding in a matter of minutes.
96+
If you need to understand the more MyCollab advanced configuration settings, please visit the link https://docs.mycollab.com/getting-started/configuration/. You will finish reading and understanding in a matter of minutes.
9797

9898
If you want to customize MyCollab, following links are useful to you:
99-
* Setup MyCollab projects with IntelliJ https://community.mycollab.com/docs/developing-mycollab/setup-mycollab-projects-with-intellij-ide/
100-
* How to customize MyCollab https://community.mycollab.com/docs/developing-mycollab/customize-mycollab/
99+
* Setup MyCollab projects with IntelliJ https://docs.mycollab.com/development/setup-mycollab-projects-with-intellij-ide/
100+
* How to customize MyCollab https://docs.mycollab.com/development/customize-mycollab/
101101

102102
## Support
103103
Contact the MyCollab team at:
104-
* Our growing FAQ https://community.mycollab.com/faq/
105-
* Our help page [http://support.mycollab.com/](http://support.mycollab.com/)
104+
* Our growing FAQ https://docs.mycollab.com/faq/
105+
* Our help page [http://support.mycollab.com/](https://mycollab.userecho.com/en/)
106106
* Our web form [https://www.mycollab.com/contact/](https://www.mycollab.com/contact/)
107107

108108
## License & Author

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#=====================================================
2-
# You can visit link https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/advanced-configuration/
2+
# You can visit link https://docs.mycollab.com/getting-started/configuration/
33
# to get all configuration fieldBuilder and their meanings
44
#=====================================================
55

@@ -10,6 +10,9 @@ app.siteName=${sitename}
1010
app.notifyEmail=${mailNotify}
1111

1212
server.address=${serveraddress}
13+
server.port=8080
14+
15+
# You do not change the rest server information if you are not sure what you are doing
1316
server.apiUrl=https://api.mycollab.com/
1417
server.storageSystem=file
1518
server.siteUrl=http://%s:%d/

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@ import org.springframework.stereotype.Component
2525
*/
2626
@Component
2727
@ConfigurationProperties(prefix = "app")
28-
class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String? = "", var facebookUrl: String? = "",
29-
var twitterUrl: String? = "", var googleUrl: String? = "",
30-
var linkedinUrl: String? = "", var notifyEmail: String) {
31-
32-
constructor() : this("", "", "", "", "", "", "")
28+
class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String = "",
29+
var facebookUrl: String = "", var twitterUrl: String = "",
30+
var googleUrl: String = "", var linkedinUrl: String = "",
31+
var notifyEmail: String = "noreply@mycollab.com") {
3332

3433
fun defaultUrls() =
3534
mutableMapOf("facebook_url" to (facebookUrl ?: ""),

‎mycollab-config/src/main/java/com/mycollab/configuration/ServerConfiguration.kt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ import org.springframework.stereotype.Component
2525
*/
2626
@Component
2727
@ConfigurationProperties(prefix = "server")
28-
class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int,
29-
var address: String?,
30-
var apiUrl: String, var pullMethod: String?, var siteUrl: String,
31-
var resourceDownloadUrl: String, var cdnUrl: String) {
32-
33-
constructor() : this("", 8080, "", "", "", "", "", "")
28+
class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int = 8080,
29+
var address: String = "",
30+
var apiUrl: String = "", var pullMethod: String = "", var siteUrl: String = "",
31+
var resourceDownloadUrl: String = "", var cdnUrl: String = "",
32+
var dataDir: String = "") {
3433

3534
fun getApiUrl(path: String) = "$apiUrl$path"
3635

‎mycollab-config/src/main/resources/logback-spring.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</encoder>
3434
</appender>
3535
<logger name="org.springframework" level="INFO"/>
36-
<logger name="com.mycollab" level="DEBUG"/>
36+
<logger name="com.mycollab" level="INFO"/>
3737
<logger name="java.sql" level="INFO"/>
3838
<logger name="org.apache.ibatis" level="INFO"/>
3939
<logger name="org.mybatis.spring" level="INFO"/>

‎mycollab-esb/src/main/java/com/mycollab/module/user/esb/SendUserInvitationCommand.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ class SendUserInvitationCommand(private val userService: UserService,
5353
@Subscribe
5454
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
5555
fun execute(event: SendUserInvitationEvent) {
56+
// Trick to make sure the saving user successfully to database
57+
Thread.sleep(5000)
5658
val inviteeUser = userService.findUserInAccount(event.invitee, event.sAccountId)
5759
if (inviteeUser != null) {
5860
contentGenerator.putVariable("siteUrl", deploymentMode.getSiteUrl(inviteeUser.subDomain))

‎mycollab-localization/src/main/resources/common-shell_bg-BG.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OPT_LOGIN_PAGE=Входяща страница
2020
OPT_NO_NOTIFICATION=Няма съобщения
2121
OPT_REQUEST_UPLOAD_AVATAR=Нека хората да ви разпознаят
2222
OPT_HAVING_NEW_VERSION=Това е моят нов в имидж MyCollab {0}
23-
OPT_SUPPORTED_LANGUAGES_INTRO=Езиците който използвате в MyCollab са: <ul><li>Английски(100%)</li><li>Немски (Код на държавата: de_DE) (50% - сътрудник: Марко Гантенбеин, Lotnot)</li><li>Френски (Код на държавата: fr_FR) (18% - сътрудник: BonnetYB, Cpichard, CreationsUnivers)</li><li>Китайски(Код на държавата: zh_CN) (93% -сътрудник: Ying_Yuan)</li><li>Португалски (Бразилия) Код на държавата: pt_BR) (27% -сътрудник: Eduardoflt, Denis Martins)</li><li>Русия (Код на държавата: ru_RU) (3% - Evkin)</li><li>Датски (Код на държавата: da_DA) (10% - сътрудник: KrestenB)</li><li>Индонезийски (Код на държавата: id_ID) (20% - сътрудник: Farizichwan)</li><li>Испански (Код на държавата: es) (99% - сътрудник: Massaki)</li></ul>Може да ни помогнете да преведем MyCollab на вашия език като посетите тази страница <a href="https://community.mycollab.com/docs/developing-mycollab/translating/" target="_blank">guideline</a>
23+
OPT_SUPPORTED_LANGUAGES_INTRO=Езиците който използвате в MyCollab са: <ul><li>Английски(100%)</li><li>Немски (Код на държавата: de_DE) (50% - сътрудник: Марко Гантенбеин, Lotnot)</li><li>Френски (Код на държавата: fr_FR) (18% - сътрудник: BonnetYB, Cpichard, CreationsUnivers)</li><li>Китайски(Код на държавата: zh_CN) (93% -сътрудник: Ying_Yuan)</li><li>Португалски (Бразилия) Код на държавата: pt_BR) (27% -сътрудник: Eduardoflt, Denis Martins)</li><li>Русия (Код на държавата: ru_RU) (3% - Evkin)</li><li>Датски (Код на държавата: da_DA) (10% - сътрудник: KrestenB)</li><li>Индонезийски (Код на държавата: id_ID) (20% - сътрудник: Farizichwan)</li><li>Испански (Код на държавата: es) (99% - сътрудник: Massaki)</li></ul>Може да ни помогнете да преведем MyCollab на вашия език като посетите тази страница <a href="https://docs.mycollab.com/development/translating/" target="_blank">guideline</a>
2424
OPT_PREVIEW_EDIT_IMAGE=Редактирай и прегледай изображението
2525
OPT_IMAGE_EDIT_INSTRUCTION=<p style='margin: 0px;'><strong>Отдолу е показано как щеизглежда изображението.</strong></p><p style='margin-top: 0px;'>За да я регулирате, може да я дръпнете и да оразмерите чрез квадратчетоза за избиране отдолу . КОгато снимката ви е готова натиснете <strong>Приемам</strong> Бутон.</p>
2626
OPT_NEW_UPGRADE_IS_READY=Нова актуализация е готова за инсталиране

‎mycollab-localization/src/main/resources/common-shell_en-US.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ OPT_NO_NOTIFICATION=There is no notification right now
2323
OPT_REQUEST_UPLOAD_AVATAR=Let people recognize you
2424
OPT_HAVING_NEW_VERSION=There is the new MyCollab version {0}
2525
OPT_SUPPORTED_LANGUAGES_INTRO=You can use MyCollab with the following languages: <ul><li>English (100%)\
26-
</li><li>German (Country code: de_DE) (50% - Contributor: Marco Gantenbein, Lotnot)</li><li>French (Country \
27-
code: fr_FR) (18% - Contributor: BonnetYB, Cpichard, CreationsUnivers)</li><li>Chinese (Country code: zh_CN) (99% - \
28-
Contributor: Ying_Yuan)</li><li>Portuguese (Brazil) (Country code: pt_BR) (27% - Contributor: Eduardoflt, Denis \
29-
Martins)</li><li>Russian (Country code: ru_RU) (3% - Evkin)</li>\
30-
<li>Danish (Contry code: da_DA) (10% - Contributor: KrestenB)</li><li>Indonesia (Contry code: id_ID) (20% - \
31-
Contributor: Farizichwan)</li><li>Spanish (Contry code: es) (99% - Contributor: Massaki)</li></ul>You \
32-
can help us translate MyCollab to your language by following this <a href="https://community.mycollab\
33-
.com/docs/developing-mycollab/translating/" target="_blank">guideline</a>
26+
</li><li>German (Country code: de_DE) (55% - Contributor: Marco Gantenbein, Lotnot)</li><li>French (Country \
27+
code: fr_FR) (19% - Contributor: BonnetYB, Cpichard, CreationsUnivers)</li><li>Chinese (Country code: zh_CN) (88% - \
28+
Contributor: Ying_Yuan)</li><li>Portuguese (Brazil) (Country code: pt_BR) (31% - Contributor: Eduardoflt, Denis \
29+
Martins)</li><li>Russian (Country code: ru_RU) (43% - Evkin)</li>\
30+
<li>Danish (Contry code: da_DA) (12% - Contributor: KrestenB)</li><li>Indonesia (Contry code: id_ID) (25% - \
31+
Contributor: Farizichwan)</li><li>Spanish (Contry code: es) (88% - Contributor: Massaki)</li></ul>You \
32+
can help us translate MyCollab to your language by following this <a href="https://doc.mycollab\
33+
.com/development/translating/" target="_blank">guideline</a>
3434
OPT_PREVIEW_EDIT_IMAGE=Edit and preview image
3535
OPT_IMAGE_EDIT_INSTRUCTION=<p style='margin: 0px;'><strong>To the below is what your image will look like\
3636
.</strong></p><p style='margin-top: 0px;'>To make adjustment, you can drag around and resize the selection square \

‎mycollab-localization/src/main/resources/common-shell_es-ES.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OPT_LOGIN_PAGE=Página de inicio de sesión
2020
OPT_NO_NOTIFICATION=No hay notificaciones en este momento
2121
OPT_REQUEST_UPLOAD_AVATAR=Dejar que la gente me reconozca
2222
OPT_HAVING_NEW_VERSION=Hay una versión más nueva de MyCollab: {0}
23-
OPT_SUPPORTED_LANGUAGES_INTRO=Puedes usar MyCollab con los siguientes lenguajes: <ul><li>Inglés (100%)</li><li>Alemán (Código de idioma: de_DE) (50% - Autor: Marco Gantenbein, Lotnot)</li><li>Francés (Código de idioma: fr_FR) (18% - Autor: BonnetYB, Cpichard, CreationsUnivers)</li><li>Chino (Código de idioma: zh_CN) (93% - Autor: Ying_Yuan)</li><li>Portugués (Brasil) (Código de idioma: pt_BR) (27% - Autor: Eduardoflt, Denis Martins)</li><li>Ruso (Código de idioma: ru_RU) (3% - Evkin)</li><li>Danés (Código de idioma: da_DA) (10% - Autor: KrestenB)</li><li>Indonesia (Código de idioma: id_ID) (20% - Autor: Farizichwan)</li><li>Español (Código de idioma: es) (99% - Autor: Massaki)</li></ul>Puedes ayudarnos a traducir MyCollab a tu idioma siguiendo esta <a href="https://community.mycollab.com/docs/developing-mycollab/translating/" target="_blank">guía</a>
23+
OPT_SUPPORTED_LANGUAGES_INTRO=Puedes usar MyCollab con los siguientes lenguajes: <ul><li>Inglés (100%)</li><li>Alemán (Código de idioma: de_DE) (50% - Autor: Marco Gantenbein, Lotnot)</li><li>Francés (Código de idioma: fr_FR) (18% - Autor: BonnetYB, Cpichard, CreationsUnivers)</li><li>Chino (Código de idioma: zh_CN) (93% - Autor: Ying_Yuan)</li><li>Portugués (Brasil) (Código de idioma: pt_BR) (27% - Autor: Eduardoflt, Denis Martins)</li><li>Ruso (Código de idioma: ru_RU) (3% - Evkin)</li><li>Danés (Código de idioma: da_DA) (10% - Autor: KrestenB)</li><li>Indonesia (Código de idioma: id_ID) (20% - Autor: Farizichwan)</li><li>Español (Código de idioma: es) (99% - Autor: Massaki)</li></ul>Puedes ayudarnos a traducir MyCollab a tu idioma siguiendo esta <a href="https://docs.mycollab.com/development/translating/" target="_blank">guía</a>
2424
OPT_PREVIEW_EDIT_IMAGE=Editar y previsualizar imágen
2525
OPT_IMAGE_EDIT_INSTRUCTION=<p style='margin: 0px;'><strong>A continuación es como se verá su imágen.</strong></p><p style='margin-top: 0px;'>Para realizar ajustes, puede arrastrar alrededor y cambiar el tamaño del cuadro de selección. Cuando esté conforme con su foto, haga click en el <strong>botón</strong> Aceptar.</p>
2626
OPT_NEW_UPGRADE_IS_READY=Una nueva actualización está lista para instalar

‎mycollab-localization/src/main/resources/common-shell_zh-CN.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ OPT_LOGIN_PAGE=登录页
2020
OPT_NO_NOTIFICATION=目前没有通知消息
2121
OPT_REQUEST_UPLOAD_AVATAR=让大家认识你
2222
OPT_HAVING_NEW_VERSION=有新版本 {0} 可用
23-
OPT_SUPPORTED_LANGUAGES_INTRO= MyCollab支持以下各种语言: <ul>\n <li>英语 (100%)</li>\n <li>德语 (国家代码: de_DE) (68% - 贡献者: Marco Gantenbein)</li>\n <li>法语 (Country code: fr_FR) (17% - 贡献者: BonnetYB, Cpichard)</li>\n <li>中文 (国家代码: zh_CN) (14% - 贡献者: Dawnchen, Wilkance)</li>\n <li>葡萄牙语 (Brazil) (国家代码: pt_BR) (35% - 贡献者: Eduardoflt, Denis Martins)</li>\n <li>丹麦语 (国家代码: da_DA) (13% - 贡献者: KrestenB)</li></ul>\n 你可以通过以下链接帮助 MyCollab 翻译成你自己的语言 <a href="https://community.mycollab.com/docs/developing-mycollab/translating/" target="_blank">参考</a>
23+
OPT_SUPPORTED_LANGUAGES_INTRO= MyCollab支持以下各种语言: <ul>\n <li>英语 (100%)</li>\n <li>德语 (国家代码: de_DE) (68% - 贡献者: Marco Gantenbein)</li>\n <li>法语 (Country code: fr_FR) (17% - 贡献者: BonnetYB, Cpichard)</li>\n <li>中文 (国家代码: zh_CN) (14% - 贡献者: Dawnchen, Wilkance)</li>\n <li>葡萄牙语 (Brazil) (国家代码: pt_BR) (35% - 贡献者: Eduardoflt, Denis Martins)</li>\n <li>丹麦语 (国家代码: da_DA) (13% - 贡献者: KrestenB)</li></ul>\n 你可以通过以下链接帮助 MyCollab 翻译成你自己的语言 <a href="https://docs.mycollab.com/development/translating/" target="_blank">参考</a>
2424
OPT_PREVIEW_EDIT_IMAGE=编辑和预览图像
2525
OPT_IMAGE_EDIT_INSTRUCTION=<p style='margin: 0px;'><strong>以下就是你图像展示的效果.</strong></p><p style='margin-top: 0px;'>你可以通过拖动和重置尺寸的方式来来适当调整你的图 如果你满意图片效果的话，直接点击 <strong>同意</strong> 按钮.</p>
2626
OPT_NEW_UPGRADE_IS_READY=有新的更新准备安装

0 commit comments

Comments
 (0)