王怡栋
|
b0ebeb78c4
|
Merge branch 'sprint/master_lanzongjun_fixbug_version_biz' into 'master'
* fix bug #15274
See merge request easycorp/zentaopms!2386
|
2022-03-22 00:32:33 +00:00 |
|
王怡栋
|
a1f6d6153e
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20968,20964.
See merge request easycorp/zentaopms!2406
|
2022-03-22 00:32:01 +00:00 |
|
liyuchun
|
0187fb80c7
|
Merge branch 'devops24'
|
2022-03-22 08:28:32 +08:00 |
|
tanghucheng
|
987d0d0443
|
* Fix bug #20968,20964.
|
2022-03-21 17:00:42 +08:00 |
|
孙广明
|
9995d4c68d
|
Merge branch 'fixbug' into 'master'
* Fix bug for upgrade.
See merge request easycorp/zentaopms!2400
|
2022-03-21 08:13:34 +00:00 |
|
孙广明
|
b7ccaaec25
|
Update model.php
|
2022-03-21 08:13:24 +00:00 |
|
tanghucheng
|
3bda7c38aa
|
* Fix bug for upgrade.
|
2022-03-21 16:07:03 +08:00 |
|
孙广明
|
c44da998c0
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.
See merge request easycorp/zentaopms!2393
|
2022-03-21 06:30:44 +00:00 |
|
liumengyi
|
441200128a
|
* Add auto test of bug.
|
2022-03-21 14:29:19 +08:00 |
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
孙广明
|
fe214852d4
|
Merge branch 'devops24_liyuchun' into 'devops24'
Fix bug #19698.
See merge request easycorp/zentaopms!2380
|
2022-03-21 02:57:15 +00:00 |
|
liyuchun
|
8efe478798
|
* Fix bug #19231,19230.
|
2022-03-21 10:15:36 +08:00 |
|
Zongjun Lan
|
d03533c2fc
|
* fix bug #15274
|
2022-03-21 09:33:00 +08:00 |
|
孙广明
|
73e6d617ef
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Modify code.
See merge request easycorp/zentaopms!2383
|
2022-03-21 00:29:00 +00:00 |
|
zhujinyong
|
9fcb03b0fd
|
+ Add api of tetsuite.
|
2022-03-21 08:25:20 +08:00 |
|
liumengyi
|
dfb6c1361e
|
* Modify code.
|
2022-03-21 08:12:51 +08:00 |
|
liyuchun
|
1afae98bfc
|
* Fix bug #50910.
|
2022-03-18 17:14:09 +08:00 |
|
李玉春
|
b0607bb683
|
Merge branch 'devops23_cyy' into 'devops24'
Fix bug #17048, 20588.
See merge request easycorp/zentaopms!2374
|
2022-03-18 09:08:39 +00:00 |
|
caoyanyi
|
249a5c1ecc
|
* Fix bug #17048.
|
2022-03-18 14:49:30 +08:00 |
|
唐胡成
|
26e52edd7c
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# extension/lite/kanban/ext/lang/en/lite.php
# extension/lite/kanban/ext/lang/zh-cn/lite.php
|
2022-03-18 06:36:42 +00:00 |
|
tanghucheng
|
bbec29d361
|
* Fix bug.
|
2022-03-18 14:30:34 +08:00 |
|
caoyanyi
|
5865f3ab34
|
* Fix bug #20588.
|
2022-03-18 14:26:57 +08:00 |
|
zenggang
|
d048268f4d
|
* Finish task#51106
|
2022-03-18 06:20:44 +00:00 |
|
zenggang
|
ed17f3b7bb
|
* Finish task#51105,51102
|
2022-03-18 05:17:53 +00:00 |
|
tanghucheng
|
27457ae17f
|
* Fix bug #20907.
|
2022-03-18 10:16:44 +08:00 |
|
王怡栋
|
b7ffb3134b
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug_lite'
# Conflicts:
# extension/lite/install/ext/lang/zh-cn/lite.php
|
2022-03-18 02:15:23 +00:00 |
|
Zongjun Lan
|
2af12a5c0d
|
* fix bug #20905
|
2022-03-18 10:12:06 +08:00 |
|
Zongjun Lan
|
4c8a7a3eae
|
* fix bug #20905
|
2022-03-18 10:11:22 +08:00 |
|
Zongjun Lan
|
2435d84cdc
|
* fix bug #20905
|
2022-03-18 10:06:04 +08:00 |
|
王怡栋
|
24442be3c5
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)
See merge request easycorp/zentaopms!2357
|
2022-03-18 01:58:27 +00:00 |
|
王怡栋
|
7638020fad
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-18 09:49:48 +08:00 |
|
王怡栋
|
b3cca161cc
|
* adjust for install page in lite.
|
2022-03-18 09:49:05 +08:00 |
|
Zongjun Lan
|
9a53b1d0fe
|
* fix bug #20905
|
2022-03-18 09:39:52 +08:00 |
|
孙广明
|
19d86da89f
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20712,20800.
See merge request easycorp/zentaopms!2313
|
2022-03-18 01:21:20 +00:00 |
|
tanghucheng
|
ec5f6244dd
|
* Fix bug #20906.
|
2022-03-18 09:18:34 +08:00 |
|
zenggang
|
dae974455f
|
* Adjust code
|
2022-03-18 01:02:35 +00:00 |
|
tianshujie
|
8089de48b7
|
* Delete useless files when upgrading.
|
2022-03-17 17:23:16 +08:00 |
|
孙广明
|
4b68b7c78c
|
Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.
See merge request easycorp/zentaopms!2350
|
2022-03-17 09:13:33 +00:00 |
|
liumengyi
|
bb361baa6e
|
* Add function annotation.
|
2022-03-17 17:12:08 +08:00 |
|
zenggang
|
414ec1b308
|
* Finish task#50667,50675
|
2022-03-17 09:05:02 +00:00 |
|
tianshujie
|
4d7112b9b7
|
* Fix bug of ext files.
|
2022-03-17 16:41:29 +08:00 |
|
Zongjun Lan
|
ad622ccb02
|
* fix bug #t
|
2022-03-17 15:58:35 +08:00 |
|
李玉春
|
e822d8f7e5
|
Merge branch 'devops_cyy_bug' into 'devops24'
Fix bug #12206, 12342.
See merge request easycorp/zentaopms!2337
|
2022-03-17 06:59:33 +00:00 |
|
caoyanyi
|
d8c594e873
|
* Fix bug 12342.
|
2022-03-17 13:58:15 +08:00 |
|
zenggang
|
70d00fad9e
|
* Code for task#50697,50685
|
2022-03-17 03:07:38 +00:00 |
|
caoyanyi
|
a0548058e5
|
* Fix bug #12206.
|
2022-03-17 10:52:40 +08:00 |
|
tanghucheng
|
18cd2a98aa
|
* Adjust for vision name.
|
2022-03-17 10:24:41 +08:00 |
|
songchenxuan
|
ed6e82f02f
|
*Close a story.
|
2022-03-17 10:11:35 +08:00 |
|
孙广明
|
33da6a026f
|
Merge branch 'devops24_liyuchun_50711' into 'devops24'
Fix bug #50711
See merge request easycorp/zentaopms!2311
|
2022-03-16 13:59:03 +00:00 |
|
孙广明
|
484dae9ad5
|
Merge branch 'devops24_liyuchun_gitlab' into 'devops24'
在合并请求列表增加提交人
See merge request easycorp/zentaopms!2317
|
2022-03-16 13:58:34 +00:00 |
|