 李玉春
|
156b77aead
|
Merge branch 'sprint/scx_storyrecall' into 'master'
* Add lang.
See merge request easycorp/zentaopms!2786
|
2022-04-08 00:22:31 +00:00 |
|
|
李玉春
|
8fd308411b
|
Merge branch 'devops25_52046' into 'master'
Fix bug #21103,21176
See merge request easycorp/zentaopms!2796
|
2022-04-08 00:22:17 +00:00 |
|
|
zenggang
|
c67d09a090
|
* Fix bug#20900
|
2022-04-07 09:30:51 +00:00 |
|
|
王怡栋
|
6c07213aa2
|
Merge branch 'sprint/tianshujie_bug18781' into 'master'
Modify the popup style of the popup window.
See merge request easycorp/zentaopms!2809
|
2022-04-07 09:25:16 +00:00 |
|
|
孙广明
|
d9345f6a62
|
Merge branch 'master_xieqiyu_21550' into 'master'
* Fix bug#21550.
See merge request easycorp/zentaopms!2807
|
2022-04-07 09:23:31 +00:00 |
|
|
tianshujie
|
534783603f
|
Modify the popup style of the popup window.
|
2022-04-07 17:22:26 +08:00 |
|
|
xieqiyu
|
8aaaeafcb3
|
* Modify review code.
|
2022-04-07 17:22:15 +08:00 |
|
|
xieqiyu
|
1a59190992
|
* Fix bug#21550.
|
2022-04-07 17:09:41 +08:00 |
|
|
李玉春
|
69a8379657
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!2806
|
2022-04-07 09:09:04 +00:00 |
|
|
tianshujie
|
209f8c9655
|
* Add comment.
|
2022-04-07 17:06:42 +08:00 |
|
|
tianshujie
|
14fd19d50b
|
* Fix bug #18781.
|
2022-04-07 16:58:07 +08:00 |
|
|
zenggang
|
49ce3282a9
|
* Fix bug#6971
|
2022-04-07 08:50:39 +00:00 |
|
|
mayue
|
21a7e2bac1
|
* Fix bug #21579.
|
2022-04-07 16:50:03 +08:00 |
|
|
hufangzhou
|
19e8bf99ea
|
* Fix bug for lite.
|
2022-04-07 16:46:38 +08:00 |
|
|
hufangzhou
|
85eb91ce9c
|
* Fix bug of split story.
|
2022-04-07 16:40:30 +08:00 |
|
|
李玉春
|
730989ce6c
|
Merge branch 'sunhuawei_fixbug_18309' into 'master'
*Fix bug#18309.
See merge request easycorp/zentaopms!2794
|
2022-04-07 08:39:06 +00:00 |
|
|
王怡栋
|
f7ded5c5cf
|
Merge branch 'sprint/xuanxuan_96' into 'master'
Sprint/xuanxuan 96
See merge request easycorp/zentaopms!2769
|
2022-04-07 08:38:10 +00:00 |
|
|
孙华伟
|
3e484e917d
|
Update managecontacts.html.php
|
2022-04-07 08:23:51 +00:00 |
|
|
孙华伟
|
d351d9bc83
|
Optimize the code.
|
2022-04-07 16:22:52 +08:00 |
|
|
文睿 李
|
896e8c06cc
|
* fix indent.
|
2022-04-07 08:21:43 +00:00 |
|
|
王怡栋
|
4b8ed58692
|
Merge branch 'sprint/fixbug_hufangzhou_doclibaction' into 'master'
* Fix the bug of doc lib related actions don't show.
See merge request easycorp/zentaopms!2755
|
2022-04-07 08:21:03 +00:00 |
|
|
Zongjun Lan
|
bf35f0e20a
|
* remove line
|
2022-04-07 16:18:08 +08:00 |
|
|
Zongjun Lan
|
931c3ccc38
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-04-07 16:17:21 +08:00 |
|
|
王怡栋
|
b79106bc87
|
Merge branch 'sprint/fixbug_hufangzhou_16198' into 'master'
* Fix bug #16198.
See merge request easycorp/zentaopms!2772
|
2022-04-07 08:14:44 +00:00 |
|
|
王怡栋
|
262cdf3eef
|
Merge branch 'sprint/fixbug_hufangzhou_15647' into 'master'
* Fix bug #15647.
See merge request easycorp/zentaopms!2779
|
2022-04-07 08:14:15 +00:00 |
|
|
王怡栋
|
ada2189c25
|
Merge branch 'sprint/fixbug_hufangzhou_15608' into 'master'
* Fix bug #15608.
See merge request easycorp/zentaopms!2798
|
2022-04-07 08:01:28 +00:00 |
|
|
王怡栋
|
d2f81a38b7
|
Merge branch 'sprint/fixbug_hufangzhou_16204' into 'master'
* Fix bug #16204.
See merge request easycorp/zentaopms!2797
|
2022-04-07 08:00:58 +00:00 |
|
|
孙广明
|
af9545b817
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.
See merge request easycorp/zentaopms!2756
|
2022-04-07 07:57:51 +00:00 |
|
|
hufangzhou
|
32da4b3b25
|
* Fix bug #16204.
|
2022-04-07 15:54:06 +08:00 |
|
|
zenggang
|
6deba0c240
|
* Fix bug #21103,21176
|
2022-04-07 07:44:39 +00:00 |
|
|
tanghucheng
|
3d3ffe9348
|
* Fix bug #21403,21474,21410,21414,21417,21456.
|
2022-04-07 15:27:54 +08:00 |
|
|
孙华伟
|
cb159d5aee
|
*Fix bug#18309.
|
2022-04-07 15:22:54 +08:00 |
|
|
王怡栋
|
14e892f6ab
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-07 15:06:23 +08:00 |
|
|
王怡栋
|
a5e6f2ca15
|
* fix bug #20885.
|
2022-04-07 15:05:39 +08:00 |
|
|
孙广明
|
65132d2517
|
Merge branch 'master_xieqiyu_21552' into 'master'
* Fix bug#21552.
See merge request easycorp/zentaopms!2789
|
2022-04-07 06:42:19 +00:00 |
|
|
孙广明
|
55832ef09f
|
Merge branch 'master_xieqiyu_21468' into 'master'
* Fix bug#21468.
See merge request easycorp/zentaopms!2787
|
2022-04-07 06:41:25 +00:00 |
|
|
孙广明
|
6c7711949e
|
Merge branch 'sprint/fixbug_hufangzhou_21525' into 'master'
* Fix bug #21525.
See merge request easycorp/zentaopms!2792
|
2022-04-07 06:40:20 +00:00 |
|
|
tianshujie
|
2af6c7df8b
|
* Fix bug #20977.
|
2022-04-07 14:38:41 +08:00 |
|
|
hufangzhou
|
fe7158cf3a
|
* Fix bug #21525.
|
2022-04-07 14:32:44 +08:00 |
|
|
李玉春
|
5a9dd5095b
|
Merge branch 'fixbug_sunjun_16397' into 'master'
*Fixbug_sunjun_16397
See merge request easycorp/zentaopms!2791
|
2022-04-07 06:31:07 +00:00 |
|
|
sunjun
|
6b40ab7df0
|
*Fixbug_sunjun_16397
|
2022-04-07 14:09:51 +08:00 |
|
|
xieqiyu
|
d6ab24caff
|
* Fix bug#21552.
|
2022-04-07 13:53:41 +08:00 |
|
|
李玉春
|
9a23e30c7a
|
Merge branch 'devops25_51075' into 'master'
Fix bug#19960
See merge request easycorp/zentaopms!2788
|
2022-04-07 05:14:55 +00:00 |
|
|
Zongjun Lan
|
e9b834db10
|
* fix bug #21423
|
2022-04-07 13:08:21 +08:00 |
|
|
李玉春
|
f53dbe81d9
|
Merge branch 'fixbugs_zhouxin_20718' into 'master'
* Fix bug #20718.
See merge request easycorp/zentaopms!2784
|
2022-04-07 05:05:55 +00:00 |
|
|
zenggang
|
691cde081b
|
* Fix bug#19960
|
2022-04-07 03:32:14 +00:00 |
|
|
xieqiyu
|
7892d031e4
|
* Fix bug#21468.
|
2022-04-07 11:18:58 +08:00 |
|
|
孙广明
|
c286e44d55
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16610.
See merge request easycorp/zentaopms!2773
|
2022-04-07 02:44:02 +00:00 |
|
|
zhouxin
|
9400811bae
|
* Adjust code.
|
2022-04-07 02:40:23 +00:00 |
|
|
李玉春
|
6d9a40f24d
|
Merge branch 'devops25_zenggang' into 'master'
Fix bug#20886,16610
See merge request easycorp/zentaopms!2783
|
2022-04-07 02:39:56 +00:00 |
|