 孙广明
|
df55b0af1b
|
Merge branch '185'
|
2022-02-28 08:58:20 +08:00 |
|
|
hufangzhou
|
9640120b43
|
* Can not use vision field of zt_action table when upgrade.
|
2022-02-25 15:28:15 +08:00 |
|
|
tianshujie
|
34752d2c04
|
* Modify version judgment logic.
|
2022-02-24 16:49:56 +08:00 |
|
|
tianshujie
|
b7c3e92e95
|
* Modify version judgment logic.
|
2022-02-24 16:17:26 +08:00 |
|
|
zenggang
|
438641dee0
|
* Adjust code
|
2022-02-22 08:03:31 +00:00 |
|
|
zenggang
|
894689a7e3
|
* Fix bug#19819
|
2022-02-22 07:31:02 +00:00 |
|
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|
|
mayue
|
3037621f77
|
* Fix bug #19569.
|
2022-02-15 15:07:54 +08:00 |
|
|
liyuchun
|
95f25cc508
|
* Fix bug.
|
2022-02-14 10:06:34 +08:00 |
|
|
liyuchun
|
f02be68a50
|
* Fix bug #19438.
|
2022-02-11 14:52:02 +08:00 |
|
|
liyuchun
|
fc724cd56e
|
* Adjust language.
|
2022-02-11 08:53:47 +08:00 |
|
|
liyuchun
|
e556307ba4
|
* Finish task #48612.
|
2022-02-11 08:13:20 +08:00 |
|
|
tanghucheng
|
1506fe5e4c
|
* fix bug #19025.
|
2022-01-28 13:15:02 +08:00 |
|
|
zhujinyong
|
0790236032
|
Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite
|
2022-01-27 16:57:19 +08:00 |
|
|
zhujinyong
|
c251540cbe
|
* Fix menu order.
|
2022-01-27 16:57:03 +08:00 |
|
|
tanghucheng
|
14d12d41fd
|
*fix bug #19071.
|
2022-01-27 13:04:12 +08:00 |
|
|
zhujinyong
|
a69e209afa
|
* Fix link for lite.
|
2022-01-27 10:55:50 +08:00 |
|
|
Wenrui LI
|
ca32fb848f
|
* filter trash by vision, task #47935.
|
2022-01-25 14:18:56 +08:00 |
|
|
孙广明
|
72de0a1b9c
|
Merge branch 'master' into 'sprint/183_xieqiyu_47995new'
# Conflicts:
# db/update16.2.sql
# module/group/lang/resource.php
# module/kanban/js/view.js
# module/kanban/model.php
|
2022-01-24 07:28:48 +00:00 |
|
|
xieqiyu
|
8959feba2a
|
* Optimize the code.
|
2022-01-24 12:07:16 +08:00 |
|
|
xieqiyu
|
895d345775
|
* Code for task#47991.
|
2022-01-24 09:59:49 +08:00 |
|
|
tanghucheng
|
0b41fc7fc6
|
* Fix bug #18851.
|
2022-01-24 09:59:01 +08:00 |
|
|
xieqiyu
|
c582ffed5b
|
* Code for task#47989.
|
2022-01-24 09:20:26 +08:00 |
|
|
xieqiyu
|
6e5e5f96f6
|
* Code for task#47993.
|
2022-01-23 20:34:31 +08:00 |
|
|
xieqiyu
|
71b287e1fa
|
* Code for task#47987.
|
2022-01-23 19:37:44 +08:00 |
|
|
xieqiyu
|
1f79e9e7dd
|
* Code for task#47995.
|
2022-01-22 22:24:49 +08:00 |
|
|
xieqiyu
|
0ffb6f3f8d
|
* Code for task#47995.
|
2022-01-21 14:24:54 +08:00 |
|
|
liumengyi
|
d0739e40e3
|
* Fix bug for task #47976.
|
2022-01-21 12:16:16 +08:00 |
|
|
tanghucheng
|
565ade2d53
|
* adjust for dynamic.
|
2022-01-21 11:06:22 +08:00 |
|
|
liyuchun
|
7e96eb9f68
|
Merge branch 'devops19'
|
2022-01-19 16:55:57 +08:00 |
|
|
朱金勇
|
5e285ba992
|
Merge branch 'sprint/zhouxudong_fixbug_13636' into 'master'
*Fix bug #13636.
See merge request easycorp/zentaopms!1384
|
2022-01-18 05:06:01 +00:00 |
|
|
liumengyi
|
a0921f1c7d
|
* Fix bug #18638, #18644.
|
2022-01-18 10:49:53 +08:00 |
|
|
liyuchun
|
5724bd4fc5
|
* Fix bug #18435,#18437.
|
2022-01-17 13:37:11 +08:00 |
|
|
zhouxudong
|
ac318de175
|
*Fix bug #13636.
|
2022-01-17 13:12:02 +08:00 |
|
|
孙广明
|
b01b6a90eb
|
Merge branch 'kanban'
|
2022-01-17 10:34:08 +08:00 |
|
|
liyuchun
|
19905f7eda
|
* Fix bug #18450,18447.
|
2022-01-14 11:26:28 +08:00 |
|
|
王怡栋
|
dda972beee
|
* adjust for get trashes.
|
2022-01-14 09:50:09 +08:00 |
|
|
李玉春
|
afd1662c19
|
Merge branch 'devops_caoyanyi_bug' into 'devops19'
cyy:Fix bug.
See merge request easycorp/zentaopms!1396
|
2022-01-14 01:23:34 +00:00 |
|
|
caoyanyi
|
770bba7719
|
* Modify trash locate.
|
2022-01-14 01:19:40 +00:00 |
|
|
王怡栋
|
f991a29236
|
Merge branch 'devops19' into 'devops19_liyuchun_47232'
# Conflicts:
# module/sonarqube/lang/en.php
# module/sonarqube/lang/zh-cn.php
# module/sonarqube/view/browseproject.html.php
|
2022-01-14 00:48:58 +00:00 |
|
|
zhouxudong
|
a73e08d4cb
|
*Fix bug #13636.
|
2022-01-14 08:46:14 +08:00 |
|
|
liumengyi
|
92c3693650
|
* Fix bug #18419, #18414, #18411.
|
2022-01-13 17:20:21 +08:00 |
|
|
liyuchun
|
4bf49c5da7
|
* Finish task #47232.
|
2022-01-13 16:25:56 +08:00 |
|
|
zhouxudong
|
6eed68f446
|
*Fix bug #13636.
|
2022-01-13 15:17:54 +08:00 |
|
|
caoyanyi
|
e2d8d506b3
|
* Fix bug #18370,18371,18372,18379.
|
2022-01-13 05:08:08 +00:00 |
|
|
liumengyi
|
0aba204fbf
|
* Fix bug for kanban execution.
|
2022-01-13 11:58:28 +08:00 |
|
|
tianshujie
|
8b22fdcabc
|
* Finish task #47336,47344,47345.
|
2022-01-12 16:28:16 +08:00 |
|
|
caoyanyi
|
8d303e4db1
|
* Finish task #47227.
|
2022-01-12 07:44:16 +00:00 |
|
|
liyuchun
|
c5aaae3eb8
|
* Finish task #47233.
|
2022-01-12 14:16:34 +08:00 |
|
|
songchenxuan
|
bb13431274
|
*Fix bug 18074.
|
2022-01-11 08:34:55 +08:00 |
|