 朱金勇
|
ecbbc59166
|
Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest
See merge request easycorp/zentaopms!2775
|
2022-04-06 09:09:27 +00:00 |
|
|
zenggang
|
790932d79d
|
* Fix bug#20909
|
2022-04-06 08:43:29 +00:00 |
|
|
孙广明
|
bd895ca244
|
* Add project test and fix bug.
|
2022-04-06 16:01:06 +08:00 |
|
|
王怡栋
|
4f5529867b
|
* code for bug #20933.
|
2022-04-06 13:13:29 +08:00 |
|
|
王怡栋
|
3f74884813
|
* fix bug #21411.
|
2022-04-02 15:53:38 +08:00 |
|
|
王怡栋
|
adb3a7ea72
|
Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
# module/project/model.php
|
2022-04-02 07:33:24 +00:00 |
|
|
tanghucheng
|
5b2f81b688
|
* Fix bug .
|
2022-04-02 15:11:20 +08:00 |
|
|
tanghucheng
|
ab074962cc
|
* Fix bug of project session.
|
2022-04-02 15:06:17 +08:00 |
|
|
王怡栋
|
031076a570
|
Merge branch 'sprint/fixbug_hufangzhou_projectsession' into 'master'
* Fix bug of project session.
See merge request easycorp/zentaopms!2735
|
2022-04-02 07:06:08 +00:00 |
|
|
李玉春
|
8da183c51b
|
Merge branch 'fixbug_sunjun_20719' into 'master'
Fixbug sunjun 20719
See merge request easycorp/zentaopms!2726
|
2022-04-02 06:12:59 +00:00 |
|
|
tanghucheng
|
1d168b0468
|
* Fix bug #21408,21406,20199.
|
2022-04-02 14:06:41 +08:00 |
|
|
hufangzhou
|
1703c7f5bd
|
* Fix bug of project session.
|
2022-04-02 13:55:33 +08:00 |
|
|
xieqiyu
|
cdd7396261
|
* Add space line.
|
2022-04-02 09:56:31 +08:00 |
|
|
xieqiyu
|
979fb8b587
|
* Fix bug#20719.
|
2022-04-02 09:54:43 +08:00 |
|
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
|
sunjun
|
9cccd7ec3b
|
*Fixbug #20719
|
2022-04-01 15:10:54 +08:00 |
|
|
zhouxin
|
b980998c42
|
* Fix bug 20288.
|
2022-04-01 06:35:26 +00:00 |
|
|
zhouxin
|
4f195dceba
|
* Fix bug #20288.
|
2022-04-01 06:31:52 +00:00 |
|
|
zhouxin
|
52f8024543
|
* Fix bug #20288.
|
2022-04-01 06:17:30 +00:00 |
|
|
tianshujie
|
a0c4457a95
|
* Fix bug #16101.
|
2022-03-29 13:59:16 +08:00 |
|
|
李玉春
|
9b388cc312
|
Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852
See merge request easycorp/zentaopms!2576
|
2022-03-29 00:50:37 +00:00 |
|
|
sunjun
|
b411be89ec
|
*Fixbug #13852
|
2022-03-29 08:44:48 +08:00 |
|
|
sunjun
|
0ce312f107
|
*Fixbug #13852
|
2022-03-28 17:02:25 +08:00 |
|
|
sunjun
|
79016f3bf7
|
*Fixbug #13852
|
2022-03-28 10:00:29 +08:00 |
|
|
zenggang
|
ae463ddd27
|
* Finish task#51139
|
2022-03-28 01:44:26 +00:00 |
|
|
sunjun
|
e0363ea6aa
|
*Fixbug #13852
|
2022-03-28 09:32:14 +08:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
|
liyuchun
|
b664c25b21
|
* Fix bug #21171.
|
2022-03-25 15:28:14 +08:00 |
|
|
孙广明
|
e4189b329c
|
* Fix whitelist bug.
|
2022-03-25 10:21:50 +08:00 |
|
|
sunjun
|
43bfd5a4c1
|
*Fixbug 21115
|
2022-03-24 16:52:03 +08:00 |
|
|
tianshujie
|
9f3f0bd8c6
|
* Fix bug #20858.
|
2022-03-24 16:01:18 +08:00 |
|
|
sunjun
|
65442bcc7f
|
*Fix bug #13852
|
2022-03-24 08:54:24 +08:00 |
|
|
xieqiyu
|
e52f5c78b7
|
* Fix bug#21037.
|
2022-03-23 14:57:59 +08:00 |
|
|
孙广明
|
0c79df3fb6
|
Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug
See merge request easycorp/zentaopms!2461
|
2022-03-23 00:53:36 +00:00 |
|
|
zhouxin
|
cebd0a33d5
|
Fix bug #13855.
|
2022-03-22 07:38:24 +00:00 |
|
|
王怡栋
|
6ed9d8fc31
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug#20968,20997.
See merge request easycorp/zentaopms!2430
|
2022-03-22 03:11:38 +00:00 |
|
|
tanghucheng
|
9370fcb1bf
|
* Fix bug#20968,20997.
|
2022-03-22 10:55:19 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
tanghucheng
|
987d0d0443
|
* Fix bug #20968,20964.
|
2022-03-21 17:00:42 +08:00 |
|
|
zhouxin
|
2ab2af045c
|
Fix bug #13855.
|
2022-03-18 07:17:07 +00:00 |
|
|
王怡栋
|
5117bf7541
|
* fix bug #15347,15345.
|
2022-03-17 11:26:01 +08:00 |
|
|
李玉春
|
2ec1dd38b4
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
*fix bug#17639
See merge request easycorp/zentaopms!2237
|
2022-03-14 08:28:27 +00:00 |
|
|
孙华伟
|
951a3ab1af
|
*Fix bug#17639
|
2022-03-14 16:26:45 +08:00 |
|
|
孙华伟
|
60e271f10a
|
*fix bug#17639
|
2022-03-14 15:31:29 +08:00 |
|
|
tianshujie
|
e20c497d01
|
* Fix bug #20678.
|
2022-03-11 14:51:33 +08:00 |
|
|
李玉春
|
abad40f8f6
|
Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407
See merge request easycorp/zentaopms!2196
|
2022-03-11 02:42:52 +00:00 |
|
|
孙华伟
|
38ddffdd3f
|
*
|
2022-03-11 10:39:39 +08:00 |
|
|
孙华伟
|
e4f3113301
|
*Fix bug#17639
|
2022-03-11 10:36:44 +08:00 |
|
|
孙华伟
|
1dd0399e02
|
*Fix bug #17639.
|
2022-03-11 08:33:09 +08:00 |
|
|
zhouxin
|
38ebc88fd5
|
Fix bug.
|
2022-03-10 03:20:19 +00:00 |
|