build

app/Http/Controllers/Api/DialogController.php

@@ -569,7 +569,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/mark          15. 消息标记操作
+     * @api {get} api/dialog/msg/mark          14. 消息标记操作
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -621,7 +621,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/forward          13. 转发消息给
+     * @api {get} api/dialog/msg/forward          15. 转发消息给
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -650,7 +650,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/msg/emoji          13. emoji回复
+     * @api {get} api/dialog/msg/emoji          16. emoji回复
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -683,7 +683,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/top          14. 会话置顶
+     * @api {get} api/dialog/top          17. 会话置顶
      *
      * @apiDescription 需要token身份
      * @apiVersion 1.0.0
@@ -713,7 +713,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/add          16. 新增群组
+     * @api {get} api/dialog/group/add          18. 新增群组
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -764,7 +764,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/edit          17. 修改群组
+     * @api {get} api/dialog/group/edit          19. 修改群组
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -803,7 +803,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/adduser          18. 添加群成员
+     * @api {get} api/dialog/group/adduser          20. 添加群成员
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -837,7 +837,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/deluser          19. 移出（退出）群成员
+     * @api {get} api/dialog/group/deluser          21. 移出（退出）群成员
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0
@@ -879,7 +879,7 @@ class DialogController extends AbstractController
     }
 
     /**
-     * @api {get} api/dialog/group/disband          20. 解散群组
+     * @api {get} api/dialog/group/disband          22. 解散群组
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0

docker/php/php.conf

@@ -2,10 +2,10 @@
 directory=/var/www
 
 # 生产环境
-#command=php bin/laravels start -i
+command=php bin/laravels start -i
 
 # 开发环境
-command=./bin/inotify ./app
+#command=./bin/inotify ./app
 
 numprocs=1
 autostart=true

package.json

@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.16.12",
+    "version": "0.16.22",
     "description": "DooTask is task management system.",
     "scripts": {
         "start": "./cmd dev",

public/js/hash

@@ -1 +1 @@
-92d5ed8ad30b6062
+800cb9cca4b09ddc

resources/assets/js/pages/manage/components/DialogWrapper.vue

@@ -159,7 +159,7 @@
                                 </li>
                             </template>
                             <li @click="onOperate('forward')">
-                                <i class="taskfont">&#xe75e;</i>
+                                <i class="taskfont">&#xe638;</i>
                                 <span>{{ $L('转发') }}</span>
                             </li>
                             <template v-if="operateItem.userid == userId">

resources/assets/js/pages/manage/file.vue

@@ -22,7 +22,7 @@
             </div>
 
             <div class="file-navigator">
-                <ul>
+                <ul class="scrollbar-hidden">
                     <li @click="browseFolder(0)">
                         <span>{{$L('全部文件')}}</span>
                     </li>

resources/assets/sass/pages/page-file.scss

@@ -100,6 +100,7 @@
                 display: flex;
                 align-items: center;
                 overflow: auto;
+                margin-right: 12px;
                 > li {
                     display: flex;
                     list-style: none;

resources/mobile

@@ -1 +1 @@
-Subproject commit a2157bed9188b0b2b99625dbd5655cc0281c6a7f
+Subproject commit e6cd01a355b1b8f7d7cbaceafd582e14e01f851a