* Update screenshots

* Update the document links * Fix the inline edit saving user without losing focus * A couple of bug fixes
MyCollab · Feb 22, 2019 · ec51d28 · ec51d28
1 parent d4f12dc
commit ec51d28
Show file tree

Hide file tree

Showing 27 changed files with 144 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Free, open source Project Management software
 [![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)
-[![Version](https://img.shields.io/badge/Version-7.0.0-brightgreen.svg)](https://community.mycollab.com/)
+[![Version](https://img.shields.io/badge/Version-7.0.0-brightgreen.svg)](https://docs.mycollab.com/)
 [![Github](https://img.shields.io/github/downloads/MyCollab/mycollab/total.svg)](https://github.com/MyCollab/mycollab/releases)
 
 
@@ -11,48 +11,48 @@ MyCollab is the free and open source project management software. Intuitive UI,
 <table>
   <tr>
     <td align="center">
-      <a href="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Dashboard.png" target="_blank" title="Project Dashboard">
-        <img src="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Dashboard-300x151.png" alt="Project Dashboard">
+      <a href="https://c2.staticflickr.com/8/7836/33297801958_8c403afca8_o.png" target="_blank" title="Project Dashboard">
+        <img src="https://c2.staticflickr.com/8/7836/33297801958_c3958e94ba_n.jpg" alt="Project Dashboard">
       </a>
       <br />
       <em>Project Dashboard</em>
     </td>
     <td  align ="center">
-      <a href="https://community.mycollab.com/wp-content/uploads/2015/12/Bug-Dashboard.png" target="_blank" title="Bug Dashboard">
-        <img src="https://community.mycollab.com/wp-content/uploads/2015/12/Bug-Dashboard-300x151.png" alt="Bug Dashboard">
+      <a href="https://c2.staticflickr.com/8/7918/47173080821_12241886b9_o.png" target="_blank" title="Ticket Dashboard">
+        <img src="https://c2.staticflickr.com/8/7918/47173080821_6a9ae24fb7_n.jpg" alt="Ticket Dashboard">
       </a>
       <br />
-      <em>Bug Dashboard</em>
+      <em>Ticket Dashboard</em>
     </td>
     <td align="center">
-    <a href="https://community.mycollab.com/wp-content/uploads/2015/12/Task-Dashboard.png" target="_blank" title="Task Dashboard">
-      <img src="https://community.mycollab.com/wp-content/uploads/2015/12/Task-Dashboard-300x151.png" alt="Task Dashboard">
+    <a href="https://c2.staticflickr.com/8/7868/46259674665_3b32a73f07_o.png" target="_blank" title="Kanban Board">
+      <img src="https://c2.staticflickr.com/8/7868/46259674665_d3f532f637_n.jpg" alt="Kanban Board">
     </a>
       <br />
-      <em>Task Dashboard</em>
+      <em>Kanban Board</em>
     </td>
   </tr>
   <tr>
     <td align="center">
-    <a href="https://community.mycollab.com/wp-content/uploads/2015/12/Kanban-Board.png" target="_blank" title="Kanban Board">
-        <img src="https://community.mycollab.com/wp-content/uploads/2015/12/Kanban-Board-300x151.png" alt="Kanban Board">
+    <a href="https://c2.staticflickr.com/8/7874/46259716315_480d6ea678_o.png" target="_blank" title="Task View">
+        <img src="https://c2.staticflickr.com/8/7874/46259716315_8a5d84acb4_n.jpg" alt="Task View">
       </a>
       <br />
-      <em>Kanban Board</em>
+      <em>Task View</em>
     </td>
     <td align="center">
-      <a href="https://community.mycollab.com/wp-content/uploads/2015/12/Roadmap-2.png" target="_blank" title="Roadmap">
-        <img src="https://community.mycollab.com/wp-content/uploads/2015/12/Roadmap-2-300x151.png" alt="Roadmap">
+      <a href="https://c2.staticflickr.com/8/7896/47173858441_950c6757ab_o.png" target="_blank" title="Members">
+        <img src="https://c2.staticflickr.com/8/7896/47173858441_f4676175d7_n.jpg" alt="Members">
       </a>
       <br />
-      <em>Roadmap</em>
+      <em>Members</em>
     </td>
     <td align="center">
-      <a href="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Member.png" target="_blank" title="Project Members">
-        <img src="https://community.mycollab.com/wp-content/uploads/2015/12/Project-Member-300x151.png" alt="Project Members">
+      <a href="https://c2.staticflickr.com/8/7862/40209055153_0a16241b1b_o.png" target="_blank" title="Settings">
+        <img src="https://c2.staticflickr.com/8/7862/40209055153_54a427e593_n.jpg" alt="Settings">
       </a>
       <br />
-      <em>Project Members</em>
+      <em>Settings</em>
     </td>
   </tr>
 </table>
@@ -91,18 +91,18 @@ MyCollab requires a running Java Runtime Environment (8 or greater), Java comman
 ## Installation
 
 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/
+2. Follow installation guideline at https://docs.mycollab.com/getting-started/installation/
 
-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.
+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.
 
 If you want to customize MyCollab, following links are useful to you:
-* Setup MyCollab projects with IntelliJ https://community.mycollab.com/docs/developing-mycollab/setup-mycollab-projects-with-intellij-ide/
-* How to customize MyCollab https://community.mycollab.com/docs/developing-mycollab/customize-mycollab/
+* Setup MyCollab projects with IntelliJ https://docs.mycollab.com/development/setup-mycollab-projects-with-intellij-ide/
+* How to customize MyCollab https://docs.mycollab.com/development/customize-mycollab/
 
 ## Support
 Contact the MyCollab team at:
-* Our growing FAQ https://community.mycollab.com/faq/
-* Our help page [http://support.mycollab.com/](http://support.mycollab.com/)
+* Our growing FAQ https://docs.mycollab.com/faq/
+* Our help page [http://support.mycollab.com/](https://mycollab.userecho.com/en/)
 * Our web form [https://www.mycollab.com/contact/](https://www.mycollab.com/contact/)
 
 ## License & Author

diff --git a/mycollab-app-community/src/main/config/application.properties.ftl b/mycollab-app-community/src/main/config/application.properties.ftl
@@ -1,5 +1,5 @@
 #=====================================================
-# You can visit link https://community.mycollab.com/docs/hosting-mycollab-on-your-own-server/advanced-configuration/
+# You can visit link https://docs.mycollab.com/getting-started/configuration/
 # to get all configuration fieldBuilder and their meanings
 #=====================================================
 
@@ -10,6 +10,9 @@ app.siteName=${sitename}
 app.notifyEmail=${mailNotify}
 
 server.address=${serveraddress}
+server.port=8080
+
+# You do not change the rest server information if you are not sure what you are doing
 server.apiUrl=https://api.mycollab.com/
 server.storageSystem=file
 server.siteUrl=http://%s:%d/

diff --git a/mycollab-config/src/main/java/com/mycollab/configuration/ApplicationConfiguration.kt b/mycollab-config/src/main/java/com/mycollab/configuration/ApplicationConfiguration.kt
@@ -25,11 +25,10 @@ import org.springframework.stereotype.Component
  */
 @Component
 @ConfigurationProperties(prefix = "app")
-class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String? = "", var facebookUrl: String? = "",
-                               var twitterUrl: String? = "", var googleUrl: String? = "",
-                               var linkedinUrl: String? = "", var notifyEmail: String) {
-
-    constructor() : this("", "", "", "", "", "", "")
+class ApplicationConfiguration(var siteName: String = "MyCollab", var description: String = "",
+                               var facebookUrl: String = "", var twitterUrl: String = "",
+                               var googleUrl: String = "", var linkedinUrl: String = "",
+                               var notifyEmail: String = "noreply@mycollab.com") {
 
     fun defaultUrls() =
             mutableMapOf("facebook_url" to (facebookUrl ?: ""),

diff --git a/mycollab-config/src/main/java/com/mycollab/configuration/ServerConfiguration.kt b/mycollab-config/src/main/java/com/mycollab/configuration/ServerConfiguration.kt
@@ -25,12 +25,11 @@ import org.springframework.stereotype.Component
  */
 @Component
 @ConfigurationProperties(prefix = "server")
-class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int,
-                          var address: String?,
-                          var apiUrl: String, var pullMethod: String?, var siteUrl: String,
-                          var resourceDownloadUrl: String, var cdnUrl: String) {
-
-    constructor() : this("", 8080, "", "", "", "", "", "")
+class ServerConfiguration(var storageSystem: String = STORAGE_FILE, var port: Int = 8080,
+                          var address: String = "",
+                          var apiUrl: String = "", var pullMethod: String = "", var siteUrl: String = "",
+                          var resourceDownloadUrl: String = "", var cdnUrl: String = "",
+                          var dataDir: String = "") {
 
     fun getApiUrl(path: String) = "$apiUrl$path"
 

diff --git a/mycollab-config/src/main/resources/logback-spring.xml b/mycollab-config/src/main/resources/logback-spring.xml
@@ -33,7 +33,7 @@
         </encoder>
     </appender>
     <logger name="org.springframework" level="INFO"/>
-    <logger name="com.mycollab" level="DEBUG"/>
+    <logger name="com.mycollab" level="INFO"/>
     <logger name="java.sql" level="INFO"/>
     <logger name="org.apache.ibatis" level="INFO"/>
     <logger name="org.mybatis.spring" level="INFO"/>

diff --git a/mycollab-esb/src/main/java/com/mycollab/module/user/esb/SendUserInvitationCommand.kt b/mycollab-esb/src/main/java/com/mycollab/module/user/esb/SendUserInvitationCommand.kt
@@ -53,6 +53,8 @@ class SendUserInvitationCommand(private val userService: UserService,
     @Subscribe
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
     fun execute(event: SendUserInvitationEvent) {
+        // Trick to make sure the saving user successfully to database
+        Thread.sleep(5000)
         val inviteeUser = userService.findUserInAccount(event.invitee, event.sAccountId)
         if (inviteeUser != null) {
             contentGenerator.putVariable("siteUrl", deploymentMode.getSiteUrl(inviteeUser.subDomain))

diff --git a/mycollab-localization/src/main/resources/common-shell_bg-BG.properties b/mycollab-localization/src/main/resources/common-shell_bg-BG.properties
@@ -20,7 +20,7 @@ OPT_LOGIN_PAGE=Входяща страница
 OPT_NO_NOTIFICATION=Няма съобщения
 OPT_REQUEST_UPLOAD_AVATAR=Нека хората да ви разпознаят 
 OPT_HAVING_NEW_VERSION=Това е моят нов в имидж MyCollab {0}
-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>
+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>
 OPT_PREVIEW_EDIT_IMAGE=Редактирай и прегледай изображението
 OPT_IMAGE_EDIT_INSTRUCTION=<p style='margin: 0px;'><strong>Отдолу е показано как щеизглежда изображението.</strong></p><p style='margin-top: 0px;'>За да я регулирате, може да я дръпнете и да  оразмерите чрез квадратчетоза за избиране отдолу . КОгато снимката ви е готова натиснете <strong>Приемам</strong> Бутон.</p>
 OPT_NEW_UPGRADE_IS_READY=Нова актуализация е готова за инсталиране

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

diff --git a/mycollab-localization/src/main/resources/common-shell_es-ES.properties b/mycollab-localization/src/main/resources/common-shell_es-ES.properties
@@ -20,7 +20,7 @@ OPT_LOGIN_PAGE=Página de inicio de sesión
 OPT_NO_NOTIFICATION=No hay notificaciones en este momento
 OPT_REQUEST_UPLOAD_AVATAR=Dejar que la gente me reconozca
 OPT_HAVING_NEW_VERSION=Hay una versión más nueva de MyCollab: {0}
-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>
+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>
 OPT_PREVIEW_EDIT_IMAGE=Editar y previsualizar imágen
 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>
 OPT_NEW_UPGRADE_IS_READY=Una nueva actualización está lista para instalar

diff --git a/mycollab-localization/src/main/resources/common-shell_zh-CN.properties b/mycollab-localization/src/main/resources/common-shell_zh-CN.properties
@@ -20,7 +20,7 @@ OPT_LOGIN_PAGE=登录页
 OPT_NO_NOTIFICATION=目前没有通知消息
 OPT_REQUEST_UPLOAD_AVATAR=让大家认识你
 OPT_HAVING_NEW_VERSION=有新版本 {0} 可用
-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>
+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>
 OPT_PREVIEW_EDIT_IMAGE=编辑和预览图像
 OPT_IMAGE_EDIT_INSTRUCTION=<p style='margin: 0px;'><strong>以下就是你图像展示的效果.</strong></p><p style='margin-top: 0px;'>你可以通过拖动和重置尺寸的方式来来适当调整你的图 如果你满意图片效果的话，直接点击 <strong>同意</strong> 按钮.</p>
 OPT_NEW_UPGRADE_IS_READY=有新的更新准备安装