Commit Graph

961 Commits

Author SHA1 Message Date
mayue
f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
mayue
fcb699c84d * Fix bug #18147,18149. 2022-01-06 13:38:10 +08:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
mayue
15d588491f * Revert code. 2022-01-04 17:19:45 +08:00
zhujinyong
e944c4a428 Merge branch 'sprint/180_sunhao/task46524' into sprint/180 2021-12-31 11:21:25 +08:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
王怡栋
f895777dec * adjust for z tool. 2021-12-31 09:54:58 +08:00
Hao Sun
1bdc313562 * Task #46524, refactor some pages with user-picker. 2021-12-30 17:35:41 +08:00
mayue
64d6d35a87 * Optimize code. 2021-12-30 17:01:13 +08:00
mayue
9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
hufangzhou
2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
songchenxuan
d10d8be62a *Finish task #46136. 2021-12-17 14:20:05 +08:00
songchenxuan
03399bbb8c *Finish task #46136. 2021-12-17 14:17:12 +08:00
songchenxuan
c7a49edda8 *Finish task #46136. 2021-12-16 14:36:01 +08:00
朱金勇
161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu
ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
hufangzhou
ab5b5bdf87 * Fix bug #17311. 2021-12-09 16:54:30 +08:00
hufangzhou
73b43980eb * Fix an error for lang item. 2021-12-09 10:12:08 +08:00
hufangzhou
7f94a46592 * Fix bug #16792. 2021-12-09 09:53:54 +08:00
李玉春
c62ce9a159 Merge branch 'sgm_fixbug' into 'master'
* Fix program kanban error.

See merge request easycorp/zentaopms!829
2021-12-08 07:43:41 +00:00
孙广明
7f7533c521 * Fix program kanban error. 2021-12-08 13:47:24 +08:00
李玉春
0c4f0dc504 Merge branch 'sgm_fixbug' into 'master'
* Fix kanban bug.

See merge request easycorp/zentaopms!823
2021-12-08 05:10:01 +00:00
孙广明
c1f2a2272f * Fix kanban bug. 2021-12-08 13:08:28 +08:00
孙广明
13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
孙广明
f3bd7149f9 Merge branch 'sprint/174_sunhao/improve_kanban' into 'master'
* Improve kanban UI, bug #17063.

See merge request easycorp/zentaopms!787
2021-12-06 05:11:11 +00:00
Hao Sun
8d08be2f57 * Fix cards count incorrect on some kanbans. 2021-12-06 11:18:49 +08:00
songchenxuan
bb6dba1a78 *Fix bug #17111. 2021-12-06 11:12:21 +08:00
Hao Sun
62efd53edb * update kanban lib and refactor usage of it. 2021-12-02 16:54:56 +08:00
王怡栋
f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
zhujinyong
8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun
39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
孙广明
8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
#   module/story/model.php
2021-11-29 07:26:45 +00:00
hufangzhou
0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
zhujinyong
be26a7c731 * Fix errors of api. 2021-11-29 13:09:05 +08:00
zhengrunyu
b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
zhujinyong
4b57e8627b * Fix api of program. 2021-11-28 22:17:33 +08:00
王怡栋
9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
王怡栋
11e5d04bf7 * fix bug #16439. 2021-11-23 13:47:12 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
zhouxin
b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
王怡栋
7cc9e9f875 * code for task #44308. 2021-11-17 09:59:39 +08:00
zhouxin
e57d1d1cc7 Finish task #43916. 2021-11-12 14:06:44 +08:00
李玉春
d75156dd74 Merge branch 'sprint/170_songchenxuan_43918' into 'sprint/170'
* Finish task #43918.

See merge request easycorp/zentaopms!361
2021-11-09 06:00:23 +00:00
root
397fb3e152 Finish task #43918. 2021-11-09 13:58:39 +08:00
root
782d1114bf Finish task #43918. 2021-11-09 13:47:30 +08:00
root
44c44f11d1 Finish task #43918. 2021-11-09 13:25:52 +08:00