 liyuchun
|
284af0ded1
|
* Fix bug #21632.
|
2022-04-20 11:02:29 +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 |
|
|
王怡栋
|
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 |
|
|
xieqiyu
|
0eb4023b74
|
* Fix bug#13863.
|
2022-04-19 11:25:05 +08:00 |
|
|
李玉春
|
338cffae53
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!3006
|
2022-04-19 03:07:53 +00:00 |
|
|
tianshujie
|
5b1c7675de
|
* Delete extra Spaces.
|
2022-04-19 11:03:08 +08:00 |
|
|
孙广明
|
2ba4f1f6b6
|
Merge branch 'liyuchun_fixbug_12931' into 'master'
* Fix bug #12931.
See merge request easycorp/zentaopms!3004
|
2022-04-19 02:53:28 +00:00 |
|
|
孙广明
|
c374106acb
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add annotation of unit test.
See merge request easycorp/zentaopms!3007
|
2022-04-19 02:52:56 +00:00 |
|
|
liumengyi
|
a6ee04c3a1
|
* Add annotation of unit test.
|
2022-04-19 10:51:15 +08:00 |
|
|
tianshujie
|
c595eaa0d5
|
* Fix bug #21830.
|
2022-04-19 10:49:03 +08:00 |
|
|
孙广明
|
fadd4625ea
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add annotation of unit test.
See merge request easycorp/zentaopms!3005
|
2022-04-19 01:49:40 +00:00 |
|
|
liumengyi
|
66627be55e
|
* Add annotation of unit test.
|
2022-04-19 09:46:55 +08:00 |
|
|
liyuchun
|
ade40aaa75
|
* Fix bug #12931.
|
2022-04-19 09:26:41 +08:00 |
|
|
liumengyi
|
b8782ba1ec
|
* Add unit test of branch.
|
2022-04-19 09:11:47 +08:00 |
|
|
孙广明
|
02c3d19c3f
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add unit test of branch.
See merge request easycorp/zentaopms!3003
|
2022-04-19 01:11:28 +00:00 |
|
|
liumengyi
|
b0c7bfba86
|
* Add unit test of branch.
|
2022-04-19 09:08:52 +08:00 |
|
|
tianshujie
|
bc6866d47f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_fixbug
|
2022-04-19 09:02:28 +08:00 |
|
|
朱金勇
|
681c7cf470
|
Merge branch 'sprint/sunhao/bug19078' into 'master'
* bug #19078, hide scrollbar on dragging card in ".kanban".
See merge request easycorp/zentaopms!3002
|
2022-04-19 00:58:15 +00:00 |
|
|
王怡栋
|
667439ab4c
|
Merge branch 'sprint/fixbug_hufangzhou_21829' into 'master'
* Fix bug #21829.
See merge request easycorp/zentaopms!2995
|
2022-04-19 00:43:36 +00:00 |
|
|
王怡栋
|
c068a88b3c
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *12982
See merge request easycorp/zentaopms!2983
|
2022-04-19 00:42:57 +00:00 |
|
|
zhujinyong
|
60d56ba59e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-19 08:36:35 +08:00 |
|
|
zhujinyong
|
2f3f356790
|
* Fix product param.
|
2022-04-19 08:36:02 +08:00 |
|
|
王怡栋
|
1ca6c94525
|
Merge branch 'sprint/fixbug_hufangzhou_21833' into 'master'
* Fix bug #21833.
See merge request easycorp/zentaopms!2997
|
2022-04-19 00:29:51 +00:00 |
|
|
王怡栋
|
da2f83f1c2
|
Merge branch 'sunhuawei_fixbug_21824' into 'master'
* Fix bug #21824.
See merge request easycorp/zentaopms!3001
|
2022-04-19 00:29:18 +00:00 |
|