 孙广明
|
86a2d5bbad
|
Merge branch 'sprint/fixbug_hufangzhou_21875' into 'master'
* Fix bug #21875.
See merge request easycorp/zentaopms!3028
|
2022-04-20 07:37:28 +00:00 |
|
|
孙广明
|
08d7c0bf0f
|
Merge branch 'sprint/fixbug_hufangzhou_19716' into 'master'
* Fix bug #19716.
See merge request easycorp/zentaopms!3034
|
2022-04-20 07:36:43 +00:00 |
|
|
hufangzhou
|
146643d92b
|
* Fix bug #19716.
|
2022-04-20 15:30:17 +08:00 |
|
|
孙广明
|
525365999a
|
Merge branch 'master_xieqiyu_21642' into 'master'
* Fix bug#21642.
See merge request easycorp/zentaopms!3030
|
2022-04-20 07:05:07 +00:00 |
|
|
xieqiyu
|
565ea292d3
|
* Fix bug#21642.
|
2022-04-20 14:31:47 +08:00 |
|
|
王怡栋
|
eeb43664cb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-20 14:04:22 +08:00 |
|
|
王怡栋
|
e73da94935
|
* code for bug #17574.
|
2022-04-20 14:03:53 +08:00 |
|
|
hufangzhou
|
54f2910885
|
* Fix bug #21875.
|
2022-04-20 13:44:23 +08:00 |
|
|
孙广明
|
917e317376
|
Merge branch 'Fix_bug_zry_21561' into 'master'
* Fix bug 21561.
See merge request easycorp/zentaopms!3027
|
2022-04-20 05:40:48 +00:00 |
|
|
zhengrunyu
|
406ba944eb
|
* Fix bug 21561.
|
2022-04-20 13:38:22 +08:00 |
|
|
李玉春
|
f7c8722884
|
Merge branch 'cyy_bug' into 'master'
* Fix bug #21861.
See merge request easycorp/zentaopms!3021
|
2022-04-20 05:20:04 +00:00 |
|
|
孙广明
|
2993dd202e
|
Merge branch 'sprint/unitTest_liumengyi_report' into 'master'
* Add unit test of report.
See merge request easycorp/zentaopms!3026
|
2022-04-20 05:11:59 +00:00 |
|
|
liumengyi
|
977a494efb
|
* Add unit test of report.
|
2022-04-20 13:08:04 +08:00 |
|
|
王怡栋
|
6c46a39ca1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-20 11:27:06 +08:00 |
|
|
王怡栋
|
eec155064a
|
* fix bug #20933.
|
2022-04-20 11:26:32 +08:00 |
|
|
李玉春
|
ee5948acd0
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!3023
|
2022-04-20 03:10:59 +00:00 |
|
|
tianshujie
|
0c55baddc6
|
* Fix bug #21858.
|
2022-04-20 10:57:00 +08:00 |
|
|
孙广明
|
425a272096
|
Merge branch 'liyuchun_fixbug_12931' into 'master'
* Fix bug #20178.
See merge request easycorp/zentaopms!3020
|
2022-04-20 02:36:43 +00:00 |
|
|
孙广明
|
f5ecc3be49
|
Merge branch 'autotest_ly' into 'master'
update task data and add admin of test
See merge request easycorp/zentaopms!3022
|
2022-04-20 02:36:27 +00:00 |
|
|
liyang
|
02ae87a617
|
update task data and add admin of test
|
2022-04-20 10:34:00 +08:00 |
|
|
caoyanyi
|
23cf2c1085
|
* Fix bug #21861.
|
2022-04-20 09:35:58 +08:00 |
|
|
李玉春
|
d9ca30bcf7
|
Merge branch 'bug_14478' into 'master'
Fix bug#14478,19305
See merge request easycorp/zentaopms!3018
|
2022-04-20 01:25:29 +00:00 |
|
|
朱金勇
|
54027e5ac1
|
Merge branch 'sprint/sunhao/optimize_js_locate' into 'master'
* optimize helper method "js::locate", support for using app as target.
See merge request easycorp/zentaopms!3014
|
2022-04-19 13:30:21 +00:00 |
|
|
朱金勇
|
483b56e0da
|
Merge branch 'sprint/sunhao/bug20223' into 'master'
* bug #20223, fix for showing duplicated link dialog after access context menu on link.
See merge request easycorp/zentaopms!3009
|
2022-04-19 13:30:09 +00:00 |
|
|
zenggang
|
217cc71960
|
* Fix bug#14478,19305
|
2022-04-19 09:21:02 +00:00 |
|
|
孙广明
|
0ebd84cd0d
|
Merge branch 'master_xieqiyu_21848' into 'master'
* Fix bug#21848.
See merge request easycorp/zentaopms!3017
|
2022-04-19 09:18:05 +00:00 |
|
|
孙广明
|
740e124a5c
|
Merge branch 'master_xieqiyu_21640' into 'master'
* Fix bug#21640.
See merge request easycorp/zentaopms!3013
|
2022-04-19 09:17:32 +00:00 |
|
|
孙广明
|
d3b94e315b
|
Merge branch 'sprint/unitTest_liumengyi_report' into 'master'
* Add unit test of report.
See merge request easycorp/zentaopms!3016
|
2022-04-19 09:10:49 +00:00 |
|
|
xieqiyu
|
f100564e6a
|
* Fix bug#21848.
|
2022-04-19 17:08:49 +08:00 |
|
|
tianshujie
|
524a2214ab
|
* Fix the query project name error.
|
2022-04-19 17:04:56 +08:00 |
|
|
王怡栋
|
d5b56b2119
|
Merge branch 'sgm_fixqiqibug' into 'master'
* Fix export bug.
See merge request easycorp/zentaopms!3015
|
2022-04-19 08:59:08 +00:00 |
|
|
liumengyi
|
ba15b4bfe3
|
* Add unit test of report.
|
2022-04-19 16:58:10 +08:00 |
|
|
孙广明
|
18fa7382dd
|
* Fix workflow bug.
|
2022-04-19 16:39:44 +08:00 |
|
|
王怡栋
|
913fa93ffa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-19 16:11:49 +08:00 |
|
|
王怡栋
|
6fdd522363
|
* fix for sql.
|
2022-04-19 16:11:26 +08:00 |
|
|
xieqiyu
|
8f849cc8c3
|
* Fix bug#21640.
|
2022-04-19 16:06:27 +08:00 |
|
|
Hao Sun
|
c25231c297
|
* optimize helper method "js::locate", support for using app as target.
|
2022-04-19 16:06:19 +08:00 |
|
|
王怡栋
|
ec6b8f86fd
|
Merge branch 'sprint/fixbug_hufangzhou_17933' into 'master'
* Fix bug #17933.
See merge request easycorp/zentaopms!3012
|
2022-04-19 07:50:20 +00:00 |
|
|
王怡栋
|
ed8bea2a98
|
Merge branch 'sprint/fixbug_hufangzhou_18295' into 'master'
* Fix bug #18295.
See merge request easycorp/zentaopms!3010
|
2022-04-19 07:49:48 +00:00 |
|
|
hufangzhou
|
9b6857a689
|
* Fix bug #17933.
|
2022-04-19 15:47:26 +08:00 |
|
|
李玉春
|
dc8063428a
|
Merge branch 'sunhuawei_fixbug_18898' into 'master'
Sunhuawei fixbug 18898
See merge request easycorp/zentaopms!3011
|
2022-04-19 07:40:38 +00:00 |
|
|
孙华伟
|
4464536c1f
|
Update control.php
|
2022-04-19 07:34:10 +00:00 |
|
|
孙华伟
|
bce4e3267b
|
* Fix bug #18898.
|
2022-04-19 15:27:58 +08:00 |
|
|
孙华伟
|
dcfe09867f
|
*Fix bug#18898.
|
2022-04-19 15:17:50 +08:00 |
|
|
王怡栋
|
a4c8a5334e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-19 15:13:01 +08:00 |
|
|
王怡栋
|
657a8f50ef
|
* fix bug for sql.
|
2022-04-19 15:12:31 +08:00 |
|
|
hufangzhou
|
8303f2f39d
|
* Fix bug #18295.
|
2022-04-19 15:04:06 +08:00 |
|
|
孙广明
|
49bbc9c0a2
|
* Fix export bug.
|
2022-04-19 14:41:52 +08:00 |
|
|
Hao Sun
|
804d110078
|
* bug #20223, fix for showing duplicated link dialog after access context menu on link.
|
2022-04-19 13:58:37 +08:00 |
|
|
孙广明
|
28222990e4
|
Merge branch 'master_xieqiyu_13863' into 'master'
* Fix bug#13863.
See merge request easycorp/zentaopms!3008
|
2022-04-19 05:53:00 +00:00 |
|