Merge branch 'next' before release v1.9.0

Reviewed-by: Suwon Chae Reviewed-by: Mijeong Park
yona-projects · Mar 6, 2018 · 033bbd4 · 033bbd4
2 parents 2c5883e + 7f5f31b
commit 033bbd4
Show file tree

Hide file tree

Showing 73 changed files with 2,812 additions and 804 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -48,3 +48,4 @@ Bean <[email protected]>
 rimi <[email protected]>
 kenu <[email protected]>
 DongHo Byun <[email protected]>
+Mijeong Park <[email protected]>
diff --git a/app/Global.java b/app/Global.java
@@ -158,17 +158,27 @@ public void onStart(Application app) {
         isSecretInvalid = equalsDefaultSecret();
         insertInitialData();
 
+        Timestamp timestamp = new Timestamp("=== Yona server starting initialization ===");
         Config.onStart();
+        timestamp.logElapsedTime("--- Config reading: ok!");
         Property.onStart();
+        timestamp.logElapsedTime("--- Property reading: ok!");
         PullRequest.onStart();
+        timestamp.logElapsedTime("--- Pull request checking: ok!");
         NotificationMail.onStart();
+        timestamp.logElapsedTime("--- Notification mail scheduler: ok!");
         NotificationEvent.onStart();
+        timestamp.logElapsedTime("--- Notification event cleanup scheduler: ok!");
         Attachment.onStart();
+        timestamp.logElapsedTime("--- Temporary files cleanup scheduler: ok!");
         AccessControl.onStart();
+        timestamp.logElapsedTime("--- Basic access controller config reading: ok!");
 
         if (!isSecretInvalid) {
             YobiUpdate.onStart();
+            timestamp.logElapsedTime("--- Update checker run: ok! ");
             mailboxService.start();
+            timestamp.logElapsedTime("--- MailboxService checker run: ok!");
         }
 
         PlayAuthenticate.setResolver(new PlayAuthenticate.Resolver() {

diff --git a/app/actors/CommitsNotificationActor.java b/app/actors/CommitsNotificationActor.java
@@ -1,23 +1,10 @@
 /**
- * Yobi, Project Hosting SW
- *
- * Copyright 2013 NAVER Corp.
- * http://yobi.io
- *
- * @author Keesun Baik
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Yona, 21st Century Project Hosting SW
+ * <p>
+ * Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
+ * https://yona.io
+ **/
+
 package actors;
 
 import models.*;
@@ -29,8 +16,6 @@
 
 /**
  * Creates new commit notifications.
- *
- * @author Keesun Baik
  */
 public class CommitsNotificationActor extends PostReceiveActor {
 
@@ -50,10 +35,7 @@ void doReceive(PostReceiveMessage message) {
             title = Messages.get("notification.pushed.commits", project.name, commits.size());
         }
 
-        Set<User> watchers = Watch.findWatchers(project.asResource());
-        watchers.remove(sender);
-
-        NotificationEvent.afterNewCommits(commits, refNames, project, sender, title, watchers);
+        NotificationEvent.afterNewCommits(commits, refNames, project, sender, title);
     }
 
 }
diff --git a/app/assets/stylesheets/less/_common.less b/app/assets/stylesheets/less/_common.less
@@ -219,6 +219,7 @@ input[type=number]::-webkit-outer-spin-button {
 .mt4 { margin-top:4px; }
 .mr3 { margin-right:3px; }
 .pb4 { padding-bottom: 4px}
+.pl0 { padding-left: 0}
 
 .margin-top-20   { margin-top:20px;   }
 .margin-left-20  { margin-left: 20px; }
@@ -277,3 +278,31 @@ input.white::-webkit-input-placeholder   { color:#fff; opacity:0.8; }
 input.white:-moz-placeholder             { color:#fff; opacity:0.8; } /* Firefox 18- */
 input.white::-moz-placeholder            { color:#fff; opacity:0.8; } /* Firefox 19+ */
 input.white:-ms-input-placeholder        { color:#fff; opacity:0.8; }
+
+.va-text-top {
+    vertical-align: text-top !important;
+}
+
+.width100p {
+    width: 100%
+}
+
+.text-ellipsis {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.z-index-1 {
+    z-index: 1 !important;
+}
+
+.hideFromDisplayOnly {
+    display: none;
+}
+
+.fixed-height-my-issues-list {
+    line-height: 36px;
+}
+
+.dimgray { color:dimgray; }
diff --git a/app/assets/stylesheets/less/_override.less b/app/assets/stylesheets/less/_override.less
@@ -182,6 +182,23 @@
     .box-shadow(none);
 }
 
+.sharer-list {
+    .select2-container{
+        border: none;
+        box-shadow: none;
+        border-radius: 0 !important;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.15);
+    }
+    .select2-container-multi {
+        .select2-choices {
+            .select2-search-choice {
+                background-color: #ececec;
+                border: 1px solid #dfdfdf;
+            }
+        }
+    }
+}
+
 .select2-dropdown-open {
     .select2-choice {
         border-bottom-color: transparent;

diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less
@@ -419,6 +419,19 @@
                         font-size: 14px;
                         margin-left:5px;
                     }
+
+                    .user-project-list {
+                        .star {
+                            color: rgba(255, 255, 255, 0.22);
+                            &:hover {
+                                color: #e91e63;
+                                cursor: pointer;
+                            }
+                        }
+                        .starred {
+                            color: #e91e63 !important;
+                        }
+                    }
                 }
 
                 .project-origin {
@@ -1159,12 +1172,7 @@
 
                             &.nowrap {
                                 min-height:20px;
-                                height:20px;
-                                .message {
-                                    text-overflow: ellipsis;
-                                    white-space: nowrap;
-                                    overflow: hidden;
-                                }
+                                max-height:200px;
                             }
                         }
                     }
@@ -3029,7 +3037,7 @@ label.inline-list {
         }
 
         .event {
-            padding: 10px 0 10px 55px;
+            padding: 2px 0 2px 55px;
             font-size: 1em;
             line-height: 30px;
 
@@ -3053,6 +3061,25 @@ label.inline-list {
                 &.rejected {background: #F39C12;}
                 &.conflict {background: #C0392B;}
                 &.resolved {background: #468847;}
+                &.sharer-added {
+                    background-color: #B2EBF2;
+                    color: #0097A7;
+                }
+                &.sharer-deleted {
+                    background-color: #FFCCBC;
+                    color: #F4511E;
+                }
+                &.label-added {
+                    background-color: #B2EBF2;
+                    color: #0097A7;
+                }
+                &.label-deleted {
+                    background-color: #FFCCBC;
+                    color: #F4511E;
+                }
+                &.milestone-changed {
+                    background-color: #0088cc;
+                }
              }
 
              em { font-size:12px; color:#7F8C8D; margin-right:5px;}
@@ -3652,6 +3679,7 @@ label.issue-item-row {
         line-height: 20px;
         font-size:12px;
         color:#999;
+        overflow: hidden;
 
         .infos-item {
             margin-right:6px;
@@ -3732,11 +3760,18 @@ label.issue-item-row {
     .comments-count-color {
         color: @darkmagenta;
     }
+    .sharer-color {
+        color: @green;
+    }
 
     a:nth-child(2) {
         margin-left: -5px;
     }
 
+    a:nth-child(3) {
+        margin-left: -5px;
+    }
+
     .count-groups {
         margin:0 auto;
         display:inline-block;
@@ -3783,7 +3818,6 @@ label.issue-item-row {
 .mileston-tag {
     max-width: 135px;
     text-overflow: ellipsis;
-    white-space: nowrap;
     overflow: hidden;
     color: #2196f3;
     font-size:11px;
@@ -6984,7 +7018,7 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     -moz-shadow: inset 0 0 5px 5px #222;
     //box-shadow: inset 0 0 5px 5px #222;
     box-shadow: 2px 2px 8px #000;
-    background: #FFF url('/assets/images/loading-gif-2.gif') no-repeat center;
+    background: #FFF url('@{base-image-path}/loading-gif-2.gif') no-repeat center;
 }
 
 .myissues-search-input {
@@ -6997,6 +7031,7 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
     font-size: 15px;
     color: rgba(0, 0, 0, 0.7);
     padding: 0 2px;
+    vertical-align: top;
 }
 
 .no-margin {
@@ -7005,11 +7040,56 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
 
 .my-issues {
     .post-item {
-        padding: 6px 10px;
+        padding: 2px 10px;
+        color: #999999;
 
         .title-wrap {
             margin-top: 2px;
+            white-space: normal;
+            overflow: auto;
+            display:table;
+
+            .title-cell {
+                display:table-cell;
+                vertical-align:middle;
+            }
+
+            .item-count-groups {
+                font-size: 10px;
+            }
+            .title {
+                font-size: 14px;
+                font-weight: 400;
+            }
+        }
+
+        .author {
+            display:table;
+
+            .author-cell {
+                display:table-cell;
+                vertical-align:middle;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+            }
+        }
+        .meta {
+            display:table;
+
+            .meta-cell {
+                display:table-cell;
+                vertical-align:middle;
+            }
         }
+
+        .post-id {
+            color:#999;
+            margin-right:5px;
+            font-size: 12px;
+            font-weight: normal;
+        }
+
         .infos {
             margin-top: 4px;
         }
@@ -7056,3 +7136,34 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
         border-radius: 4px;
     }
 }
+
+.sharer-list {
+    margin-top: 40px;
+    padding: 10px;
+
+    .issue-share-title {
+        font-size: 16px;
+    }
+    .sharer-item{
+        display: inline-block;
+        background-color: #ececec;
+        border: 1px solid #dfdfdf;
+        border-radius: 3px;
+        padding: 1px 8px;
+    }
+}
+
+.project-name-in-my-issues {
+    display: flex !important;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    flex-grow: 1;
+    justify-content: space-between;
+    align-items: center;
+
+    .project-name {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+}
diff --git a/app/assets/stylesheets/less/_yobiUI.less b/app/assets/stylesheets/less/_yobiUI.less
@@ -581,8 +581,8 @@ span.issue-label {
 .yobiToasts {
     position: fixed;
     overflow: hidden;
-    left: 20px !important;
-    top: 25px !important;
+    right: 20px !important;
+    bottom: 25px !important;
     margin: 10px;
     z-index:9999;
 

diff --git a/app/controllers/Application.java b/app/controllers/Application.java
@@ -38,6 +38,8 @@ public class Application extends Controller {
     public static String LOGIN_PAGE_LOGINID_PLACEHOLDER  = play.Configuration.root().getString("application.login.page.loginId.placeholder", "");
     public static String LOGIN_PAGE_PASSWORD_PLACEHOLDER  = play.Configuration.root().getString("application.login.page.password.placeholder", "");
     public static boolean SHOW_USER_EMAIL = play.Configuration.root().getBoolean("application.show.user.email", true);
+    public static String NAVBAR_CUSTOM_LINK_NAME  = play.Configuration.root().getString("application.navbar.custom.link.name", "");
+    public static String NAVBAR_CUSTOM_LINK_URL  = play.Configuration.root().getString("application.navbar.custom.link.url", "");
 
     @AnonymousCheck
     public static Result index() {