 王怡栋
|
d5b56b2119
|
Merge branch 'sgm_fixqiqibug' into 'master'
* Fix export bug.
See merge request easycorp/zentaopms!3015
|
2022-04-19 08:59:08 +00:00 |
|
|
孙华伟
|
bce4e3267b
|
* Fix bug #18898.
|
2022-04-19 15:27:58 +08:00 |
|
|
孙广明
|
49bbc9c0a2
|
* Fix export bug.
|
2022-04-19 14:41:52 +08:00 |
|
|
王怡栋
|
a8983445c8
|
Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
# module/bug/model.php
# module/task/model.php
|
2022-04-13 07:52:03 +00:00 |
|
|
zhouxudong
|
1dd4af6ff3
|
* Fix bug #17994.
|
2022-04-13 09:26:20 +08:00 |
|
|
zhouxudong
|
233a035b12
|
* Fix bug #17994.
|
2022-04-12 17:23:24 +08:00 |
|
|
王怡栋
|
9a10781201
|
Merge branch 'sprint/tianshujie_bug21641' into 'master'
Sprint/tianshujie bug21641
See merge request easycorp/zentaopms!2887
|
2022-04-12 08:55:41 +00:00 |
|
|
zhouxudong
|
8baef621d2
|
* Fix bug #17994.
|
2022-04-12 16:50:56 +08:00 |
|
|
zhouxin
|
6cdeacd9ac
|
* Fix bug #21374.
|
2022-04-12 07:51:55 +00:00 |
|
|
zhouxin
|
125fa381fc
|
* Fix bug #21374.
|
2022-04-12 07:40:28 +00:00 |
|
|
tianshujie
|
7f117b9a44
|
* Fix bug #18781.
|
2022-04-12 14:12:32 +08:00 |
|
|
tianshujie
|
1a861ef225
|
* Fix bug #18710.
|
2022-04-11 13:15:41 +08:00 |
|
|
tianshujie
|
c1232cef69
|
* Fix bug #21633.
|
2022-04-11 10:49:00 +08:00 |
|
|
王怡栋
|
c336a9fa38
|
Merge branch 'sprint/tianshujie_bug21210' into 'master'
* Fix bug #21210.
See merge request easycorp/zentaopms!2821
|
2022-04-08 07:40:00 +00:00 |
|
|
王怡栋
|
22adeeba0e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21598#21419#21424#21577
See merge request easycorp/zentaopms!2827
|
2022-04-08 07:34:19 +00:00 |
|
|
Zongjun Lan
|
b9ba152440
|
* fix bug #21577
|
2022-04-08 15:24:17 +08:00 |
|
|
tianshujie
|
63946bb238
|
* Fix bug #18781.
|
2022-04-08 14:06:42 +08:00 |
|
|
朱金勇
|
1518796b03
|
Merge branch 'app_zry' into 'master'
* Fix bug 21591.
See merge request easycorp/zentaopms!2828
|
2022-04-08 06:05:36 +00:00 |
|
|
zhengrunyu
|
a7d7cca753
|
* Fix bug 21591.
|
2022-04-08 14:03:21 +08:00 |
|
|
caoyanyi
|
bbb19ac183
|
* Fix bug #20793.
|
2022-04-02 15:31:07 +08:00 |
|
|
李玉春
|
46a965b02b
|
Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.
See merge request easycorp/zentaopms!2662
|
2022-04-02 06:05:51 +00:00 |
|
|
caoyanyi
|
59efd44767
|
* Adjust codes.
|
2022-04-02 14:03:23 +08:00 |
|
|
王怡栋
|
4fa721b0bb
|
Merge branch '165_package'
|
2022-04-01 15:30:36 +08:00 |
|
|
xieqiyu
|
6551f617c6
|
* Modify review code.
|
2022-03-31 15:22:48 +08:00 |
|
|
xieqiyu
|
2ed1eedfcf
|
* Fix bug#19273.
|
2022-03-31 13:42:28 +08:00 |
|
|
caoyanyi
|
760b816acd
|
* Fix bug #14928.
|
2022-03-31 11:02:27 +08:00 |
|
|
zhengrunyu
|
b118024249
|
* Fix bug for change story.
|
2022-03-30 10:01:42 +08:00 |
|
|
zhengrunyu
|
a6612ff750
|
* Change api for story.
|
2022-03-30 09:35:52 +08:00 |
|
|
孙广明
|
0fe342e621
|
Merge branch 'master_xieqiyu_16137' into 'master'
* Fix bug#16137,#16136.
See merge request easycorp/zentaopms!2604
|
2022-03-29 05:26:06 +00:00 |
|
|
zhengrunyu
|
3ef215e240
|
* Fix bug for change story.
|
2022-03-29 11:06:14 +08:00 |
|
|
xieqiyu
|
731f96d1a5
|
* Fix bug#16137,#16136.
|
2022-03-29 10:57:12 +08:00 |
|
|
tianshujie
|
a2676be2ff
|
* Fix bug #19980.
|
2022-03-28 16:07:39 +08:00 |
|
|
朱金勇
|
0901a14d5d
|
Merge branch 'app_zhengrunyu' into 'master'
* Change api for story.
See merge request easycorp/zentaopms!2535
|
2022-03-28 02:32:18 +00:00 |
|
|
王怡栋
|
15a3516aca
|
Merge branch 'master' into 165_package
|
2022-03-28 08:50:18 +08:00 |
|
|
mayue
|
f184873bca
|
* Fix bug #17402.
|
2022-03-25 13:45:28 +08:00 |
|
|
zhengrunyu
|
c7f13939b8
|
* Change api for story.
|
2022-03-25 10:38:38 +08:00 |
|
|
王怡栋
|
5831ae3b29
|
* fix bug.
|
2022-03-24 16:40:28 +08:00 |
|
|
zhengrunyu
|
5108aab254
|
*Fix api .
|
2022-03-22 16:19:32 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
|
李玉春
|
59850d5e8f
|
Merge branch 'pailei2_sunhuawei_50728' into 'pailei2'
*Fix bug#19716
See merge request easycorp/zentaopms!2252
|
2022-03-17 05:36:01 +00:00 |
|
|
songchenxuan
|
ed6e82f02f
|
*Close a story.
|
2022-03-17 10:11:35 +08:00 |
|
|
孙华伟
|
8ac07ad424
|
更新module/story/control.php
|
2022-03-17 01:10:43 +00:00 |
|
|
孙广明
|
52193bd9ee
|
Merge branch 'pailei_sunjun_50784' into 'pailei2'
fixbug #18669
See merge request easycorp/zentaopms!2304
|
2022-03-16 06:32:04 +00:00 |
|
|
sunjun
|
ef285a4869
|
fixbug #18669
|
2022-03-16 14:27:49 +08:00 |
|
|
zhouxin
|
f6a7577749
|
Fix bug #18306.
|
2022-03-16 01:39:05 +00:00 |
|
|
孙华伟
|
d73ce9b57a
|
Optimize the code.
|
2022-03-15 08:56:43 +00:00 |
|
|
孙华伟
|
8c58e0ef16
|
*Fix bug#19716
|
2022-03-14 17:24:49 +08:00 |
|
|
hufangzhou
|
c402f35eda
|
* Fix bug #20704.
|
2022-03-14 10:08:25 +08:00 |
|
|
hufangzhou
|
57bbeeddd7
|
* Remove the unused code.
|
2022-03-10 11:01:21 +08:00 |
|