 李玉春
|
243dca8934
|
Merge branch 'bug_21823' into 'master'
Fix bug #21823,7042
See merge request easycorp/zentaopms!3032
|
2022-04-20 07:55:40 +00:00 |
|
|
李玉春
|
8d5631a4b1
|
Merge branch 'cyy_bug' into 'master'
* Add sudo param.
See merge request easycorp/zentaopms!3031
|
2022-04-20 07:53:09 +00:00 |
|
|
朱金勇
|
7c398a3840
|
Merge branch 'fixbug_wangxiaomeng#21834' into 'master'
fixbug_#21834.
See merge request easycorp/zentaopms!3036
|
2022-04-20 07:50:49 +00:00 |
|
|
李玉春
|
6aed6d4317
|
Merge branch 'sunhuawei_fixbug_15207' into 'master'
* Fix bug #15207.
See merge request easycorp/zentaopms!3035
|
2022-04-20 07:49:29 +00:00 |
|
|
朱金勇
|
abc12cd9ad
|
Merge branch 'sprint/sunhao/bug21867' into 'master'
* bug #21867, fix sub menu position in dropdown.
See merge request easycorp/zentaopms!3033
|
2022-04-20 07:47:31 +00:00 |
|
|
朱金勇
|
7df8158405
|
Merge branch 'sprint/sunhao/fix_avatar_display' into 'master'
* fix issue on show avatar.
See merge request easycorp/zentaopms!3025
|
2022-04-20 07:47:16 +00:00 |
|
|
孙华伟
|
d613f4ef2e
|
*Optimize the code.
|
2022-04-20 15:41:22 +08:00 |
|
|
wangxiaomeng
|
c49b50b422
|
fixbug_#21834.
|
2022-04-20 15:37:56 +08:00 |
|
|
孙广明
|
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 |
|
|
孙华伟
|
924b03bab4
|
* Fix bug #15207.
|
2022-04-20 15:29:49 +08:00 |
|
|
Hao Sun
|
80eb71850a
|
* bug #21867, fix sub menu position in dropdown.
|
2022-04-20 15:13:15 +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 |
|
|
zenggang
|
7c159eeb96
|
* Fix bug #21823,7042
|
2022-04-20 06:58:50 +00:00 |
|
|
caoyanyi
|
243ef3e8fc
|
* Add sudo param.
|
2022-04-20 06:33:24 +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 |
|
|
Hao Sun
|
6dc60ceead
|
* fix issue on show avatar.
|
2022-04-20 11:31:36 +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 |
|