 孙广明
|
41eee3ddd4
|
Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
# module/common/model.php
|
2022-03-22 07:43:58 +00:00 |
|
|
liyuchun
|
166cda1186
|
* Fix bug #17235.
|
2022-03-22 14:12:44 +08:00 |
|
|
xieqiyu
|
e2fbaa6828
|
* Fix bug#20396.
|
2022-03-22 11:10:44 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
xieqiyu
|
0d21516997
|
* Modify create bug.
|
2022-03-22 08:40:43 +08:00 |
|
|
孙华伟
|
0627138877
|
*Fix bug 20355
|
2022-03-21 11:18:06 +08:00 |
|
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
|
tianshujie
|
03390a6900
|
* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.* Finish task #50303.
|
2022-03-08 13:01:53 +08:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
|
xieqiyu
|
2b83d5d647
|
* Fix bug#20385.
|
2022-03-07 10:45:30 +08:00 |
|
|
tianshujie
|
85f96e6489
|
* Fix bug #20260.
|
2022-03-04 13:49:58 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
tianshujie
|
b7c3e92e95
|
* Modify version judgment logic.
|
2022-02-24 16:17:26 +08:00 |
|
|
xieqiyu
|
9fa66c3d0f
|
* Code for task#49304.
|
2022-02-24 14:40:14 +08:00 |
|
|
zhujinyong
|
5a334ccb86
|
* Fix bug: return error.
|
2022-02-22 09:26:31 +08:00 |
|
|
孙广明
|
c8db935f34
|
Merge branch '180'
|
2022-01-04 22:41:23 +08:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
|
tianshujie
|
f9f726270e
|
* Finish task #46667.
|
2021-12-29 14:35:09 +08:00 |
|
|
hufangzhou
|
1a5adfe15f
|
* Fix bug for compatible php8.0 .
|
2021-12-28 14:46:10 +08:00 |
|
|
liyuchun
|
dc46e684fe
|
* Fix bug #18023.
|
2021-12-28 14:10:59 +08:00 |
|
|
mayue
|
697b2fd318
|
* Modify code.
|
2021-12-27 13:20:57 +08:00 |
|
|
songchenxuan
|
5e8b17d6df
|
*Fix bug #17399.
|
2021-12-23 17:11:35 +08:00 |
|
|
liyuchun
|
178a45b6b5
|
Merge branch 'devops17'
|
2021-12-23 15:15:21 +08:00 |
|
|
hufangzhou
|
995e01680e
|
* Fix bug #17875.
|
2021-12-23 13:06:18 +08:00 |
|
|
王怡栋
|
49bfd2dd18
|
* adjust for vs code and php8.0.
|
2021-12-22 15:24:47 +08:00 |
|
|
hufangzhou
|
5b0923a7a3
|
* Resolve the issue of merge branch.
|
2021-12-22 10:07:18 +08:00 |
|
|
zhujinyong
|
5a1e31adf2
|
* Refactor getList of branch.
|
2021-12-21 14:53:05 +08:00 |
|
|
zhujinyong
|
dc4eb9867b
|
* Fix problems of mr.
|
2021-12-17 13:37:16 +08:00 |
|
|
mayue
|
4adf6e0a52
|
* Fix bug #17015.
|
2021-12-15 17:17:57 +08:00 |
|
|
朱金勇
|
a14138be45
|
Merge branch 'sprint/176_xieqiyu_17472' into 'master'
* Fix bug#17472.
See merge request easycorp/zentaopms!921
|
2021-12-14 01:54:13 +00:00 |
|
|
zhujinyong
|
45cdfc8f59
|
Merge branch 'xuan'
|
2021-12-14 09:08:15 +08:00 |
|
|
xieqiyu
|
559ce03369
|
* Fix bug#17472.
|
2021-12-14 08:57:10 +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 |
|
|
xieqiyu
|
821fd3644c
|
* Code for task#45536.
|
2021-12-08 18:48:33 +08:00 |
|
|
孙广明
|
13f162edd2
|
* Merge 169 untrack file to master.
|
2021-12-08 11:07:06 +08:00 |
|
|
李玉春
|
b1cd56f4b3
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079
See merge request easycorp/zentaopms!715
|
2021-12-02 02:53:09 +00:00 |
|
|
mayue
|
07f8a820b0
|
* Code format #16987.
|
2021-12-02 09:28:02 +08:00 |
|
|
mayue
|
63d4d3dad8
|
* Fix bug #16987.
|
2021-12-02 09:20:37 +08:00 |
|
|
mayue
|
c62d599292
|
* Finish task #44987,44988,44989.
|
2021-12-01 10:44:38 +08:00 |
|
|
hufangzhou
|
d7110d4ea8
|
* Code for task #45079.
|
2021-12-01 08:16:32 +08:00 |
|
|
孙广明
|
c42cca1249
|
Merge branch 'sprint/168'
|
2021-11-30 14:38:32 +08:00 |
|
|
hufangzhou
|
4736e3a01c
|
* Solve the problem of mutual testing for task #45085.
|
2021-11-30 09:59:14 +08:00 |
|
|
李玉春
|
a99419f0c5
|
Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
# module/product/control.php
# module/story/view/batchedit.html.php
|
2021-11-29 08:03:38 +00:00 |
|
|
tianshujie
|
adb2c12935
|
* Modify the code.
|
2021-11-29 15:54:48 +08:00 |
|
|
chaideqing
|
74f7a95902
|
* optimize zentao buglist/storylist/tasklist show when in xuanxuan card
|
2021-11-29 14:55:14 +08:00 |
|
|
hufangzhou
|
0965e74d0e
|
* Finish task #45085. Fix bug #16792.
|
2021-11-29 13:19:55 +08:00 |
|
|
tianshujie
|
8bf6c34acd
|
* Modify the logic of planning related stories and bugs.
|
2021-11-26 13:37:15 +08:00 |
|
|
tianshujie
|
774ee347f5
|
* Translate modified code.
|
2021-11-25 17:57:24 +08:00 |
|