Commit Graph
810 Commits
Author SHA1 Message Date
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
孙广明 a4db4d1916 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of batch create story in kanban with upload images.

See merge request easycorp/zentaopms!3231
2022-05-05 07:41:08 +00:00
tianshujie 93e05ff8c7 * Fix bug #22146. 2022-05-05 14:24:33 +08:00
xieqiyu 971579ab22 * Fix bug of batch create story in kanban with upload images. 2022-05-05 13:31:59 +08:00
zhujinyong 342667de6c Merge branch 'api_zry' 2022-04-29 16:36:25 +08:00
zhengrunyu 15d243767d * Fix api. 2022-04-29 15:56:01 +08:00
xieqiyu 084834471b * Fix bug#22117. Add file link. 2022-04-29 14:51:36 +08:00
xieqiyu b6650b012f * Fix bug#22117. 2022-04-29 14:05:22 +08:00
xieqiyu 88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
hufangzhou c5037322ff * Fix bug #22102. 2022-04-28 16:33:14 +08:00
zhengrunyu 2633b5c23c * Fix bug when create task and story error. 2022-04-26 15:14:22 +08:00
mayue b625c5e1f2 * Fix bug #21706. 2022-04-22 16:05:13 +08:00
朱金勇 4898f63820 Merge branch 'sprint/renying_Fixbug#21457' into 'master'
Sprint/renying fixbug#21457

See merge request easycorp/zentaopms!3051
2022-04-22 01:36:54 +00:00
李玉春 6aed6d4317 Merge branch 'sunhuawei_fixbug_15207' into 'master'
* Fix bug #15207.

See merge request easycorp/zentaopms!3035
2022-04-20 07:49:29 +00:00
孙华伟 d613f4ef2e *Optimize the code. 2022-04-20 15:41:22 +08:00
hufangzhou 146643d92b * Fix bug #19716. 2022-04-20 15:30:17 +08:00
孙华伟 924b03bab4 * Fix bug #15207. 2022-04-20 15:29:49 +08:00
renying 6f8dfc3af3 Fixbug#21457 2022-04-20 14:03:50 +08:00
renying d08719a839 Fixbug#21457 2022-04-20 10:28:41 +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
孙华伟 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