 孙广明
|
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 |
|
|
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 |
|
|
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 |
|
|
songchenxuan
|
721cdba3d3
|
*Case action lang.
|
2022-01-10 14:11:28 +08:00 |
|
|
songchenxuan
|
16670c5483
|
*Fix bug #18074.
|
2022-01-06 17:36:55 +08:00 |
|
|
songchenxuan
|
3e5df731bc
|
*Fix bug #18074.
|
2022-01-06 17:32:48 +08:00 |
|
|
tianshujie
|
411d284d43
|
* Fix bug #18095.
|
2022-01-06 14:19:05 +08:00 |
|
|
tianshujie
|
127b69d4c7
|
* Fix bug #18095.
|
2022-01-06 13:47:18 +08:00 |
|
|
xieqiyu
|
f78a39f5a1
|
* Fix bug#18250.
|
2022-01-06 11:21:43 +08:00 |
|
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
|
xieqiyu
|
77ba543cc8
|
* Modify the mutual test problem.
|
2022-01-04 10:08:14 +08:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
李玉春
|
2bb6bb8825
|
Merge branch 'refactor' into 'master'
Refactor
See merge request easycorp/zentaopms!1229
|
2021-12-31 04:25:42 +00:00 |
|
|
孙广明
|
ad25920cf0
|
* Refactor code.
|
2021-12-31 11:06:46 +08:00 |
|
|
liumengyi
|
3dd747f40a
|
* Modify judgment for split chid plan.
|
2021-12-31 10:59:37 +08:00 |
|
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
|
liumengyi
|
e0d72a4c25
|
* Refactoring code for update status.
|
2021-12-31 09:40:46 +08:00 |
|
|
liumengyi
|
53aa300744
|
* Add dynamic for parent plan status flow.
|
2021-12-30 11:25:57 +08:00 |
|
|
zenggang
|
bfde525f13
|
* Finish task#46555
|
2021-12-30 03:08:42 +00:00 |
|
|
xieqiyu
|
2b7249da7a
|
* Code for task#46521.
|
2021-12-30 08:47:06 +08:00 |
|
|
liumengyi
|
36e9b91ba0
|
* Finish task #46660.
|
2021-12-28 15:11:27 +08:00 |
|
|
hufangzhou
|
4b2890c766
|
* Add the new version.
|
2021-12-24 15:01:04 +08:00 |
|
|
tianshujie
|
2cda67d63e
|
* Fix bug #17892,#17899.
|
2021-12-23 16:35:31 +08:00 |
|