 李玉春
|
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 |
|
|
孙广明
|
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 |
|
|
zhujinyong
|
25eb24fe7d
|
- Remove submodule.
|
2022-04-19 08:23:15 +08:00 |
|
|
Hao Sun
|
b411c07de8
|
* bug #19078, hide scrollbar on dragging card in ".kanban".
|
2022-04-18 17:34:44 +08:00 |
|
|
孙华伟
|
9b66c7a458
|
*Optimize the code.
|
2022-04-18 17:20:45 +08:00 |
|
|
zhujinyong
|
b8aea6f999
|
Merge branch 'sprint/sunhao/bug13445'
|
2022-04-18 17:18:22 +08:00 |
|
|
zhujinyong
|
864694faab
|
Merge branch 'sprint/sunhao/bug6910'
|
2022-04-18 17:16:17 +08:00 |
|
|
孙华伟
|
caacc3811c
|
* Fix bug #21824.
|
2022-04-18 17:15:27 +08:00 |
|
|
孙广明
|
e62097ee85
|
Merge branch 'autotest_ly' into 'master'
update projectproduct data
See merge request easycorp/zentaopms!3000
|
2022-04-18 09:12:06 +00:00 |
|
|
朱金勇
|
e61d35ba1d
|
Merge branch 'sprint/sunhao/bug21225' into 'master'
* bug #21225, bug #16589, support for adjusting submenu position in dropdown.
See merge request easycorp/zentaopms!2977
|
2022-04-18 09:11:55 +00:00 |
|
|
孙广明
|
478682aa42
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Modify unit test of branch.
See merge request easycorp/zentaopms!2999
|
2022-04-18 09:11:13 +00:00 |
|
|
liumengyi
|
6466b9dd0f
|
* Modify unit test of branch.
|
2022-04-18 17:05:49 +08:00 |
|
|
孙广明
|
95faa5d390
|
Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add unit test of branch.
See merge request easycorp/zentaopms!2998
|
2022-04-18 09:01:51 +00:00 |
|
|
liumengyi
|
bdbf43362d
|
* Add unit test of branch.
|
2022-04-18 17:00:06 +08:00 |
|
|
孙广明
|
b89d214665
|
Merge branch 'liyuchun_fixbug_21518' into 'master'
* Fix bug #20852.
See merge request easycorp/zentaopms!2994
|
2022-04-18 08:58:59 +00:00 |
|
|
孙广明
|
88a121686f
|
Merge branch 'fixbugs_zhouxin' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2996
|
2022-04-18 08:58:38 +00:00 |
|
|
hufangzhou
|
bc381ede7d
|
* Fix bug #21833.
|
2022-04-18 16:45:12 +08:00 |
|
|
Zongjun Lan
|
b3c2d454b3
|
* fix bug *12982
|
2022-04-18 16:42:57 +08:00 |
|
|
zhouxin
|
6097b53514
|
* Fix bug.
|
2022-04-18 08:35:55 +00:00 |
|
|
hufangzhou
|
bdc7323b19
|
* Fix bug #21829.
|
2022-04-18 16:32:30 +08:00 |
|
|
liyuchun
|
6ce3a616db
|
* Fix bug #20852.
|
2022-04-18 15:56:26 +08:00 |
|
|
孙广明
|
878f310f3d
|
Merge branch 'liyuchun_fixbug_21518' into 'master'
* Fix bug #21518.
See merge request easycorp/zentaopms!2979
|
2022-04-18 07:55:45 +00:00 |
|
|
李玉春
|
0cbc15a93c
|
Merge branch 'cyy_16738' into 'master'
* Fix bug #16738.
See merge request easycorp/zentaopms!2993
|
2022-04-18 07:55:20 +00:00 |
|
|
李玉春
|
5e008aab35
|
Merge branch 'zenggang_18642' into 'master'
Fix bug#18642,21572
See merge request easycorp/zentaopms!2991
|
2022-04-18 07:53:52 +00:00 |
|