Commit Graph
1041 Commits
Author SHA1 Message Date
daitingting 244f061700 * Build flow menu. 2022-05-17 09:14:29 +00:00
tianshujie bc694cb2f4 * Delete extra blank lines. 2022-05-16 09:24:58 +08:00
tianshujie aaea60f6ad * Fix bug #22489. 2022-05-16 09:13:18 +08:00
王怡栋 307716798b Merge branch 'sprint/daitingting_buildoperatemenu_story' into 'master'
* Build operate menu for story module.

See merge request easycorp/zentaopms!3335
2022-05-11 07:25:26 +00:00
daitingting 90f6f0f63f * Build operate menu for story module. 2022-05-11 07:22:16 +00:00
daitingting 3315ef0f49 * Remove comment field of story. 2022-05-11 05:25:54 +00:00
孙广明 e6ba9acf68 Merge branch 'sprint/tianshujie_task53668' into 'master'
Sprint/tianshujie task53668

See merge request easycorp/zentaopms!3310
2022-05-10 09:09:34 +00:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
hufangzhou bb3587b65b * Fix bug #22153. 2022-05-05 17:33:46 +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 1c1b5c64a3 * Fix bug#22092. 2022-04-28 16:25:58 +08:00
mayue 36bd7d298d * Fix bug #21706. 2022-04-27 13:34:55 +08:00
wangyidong 7b1fc7ee04 * code for bug #22026. 2022-04-27 11:53:27 +08:00
李玉春 e1d6bf1ef2 Merge branch 'sprint/renying_Fixbug#19044' into 'master'
Fixbug#19044

See merge request easycorp/zentaopms!3137
2022-04-26 08:10:42 +00:00
renying df378ff26f Fixbug#19044 2022-04-26 07:44:38 +00:00
tianshujie ec28d24b8d * Fix bug #13146. 2022-04-26 14:38:09 +08:00
孙广明 d3aaac869c Merge branch 'sprint/scx_fixstorybug' into 'master'
* Fix bug #21992.

See merge request easycorp/zentaopms!3113
2022-04-25 09:27:24 +00:00
= 38137c5960 * Fix bug #21992. 2022-04-25 17:23:12 +08:00
lanzongjun c480a5203c * fix bug #16663 2022-04-25 13:52:37 +08:00
songchenxuan 124465c1b4 * Fix create substory bug. 2022-04-22 10:57:02 +08:00
孙广明 59f717ddb9 * Fix bug #21804. 2022-04-21 16:34:31 +08:00
孙华伟 d613f4ef2e *Optimize the code. 2022-04-20 15:41:22 +08:00
孙华伟 924b03bab4 * Fix bug #15207. 2022-04-20 15:29:49 +08:00
王怡栋 2478e067f4 * code for bug #15386. 2022-04-15 13:43:45 +08:00
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +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 dcdbf60bdf * Fix bug #17994. 2022-04-13 11:07:22 +08:00
王怡栋 a9809c35aa * code for bug #20823. 2022-04-13 10:01:36 +08: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
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08:00
hufangzhou 5745d42b1f * Fix bug #21646. 2022-04-11 16:10:32 +08:00
zhouxin 30af3cd8ee * Fix bug #20812. 2022-04-08 07:33:19 +00:00
zhouxudong d60ce0159c * Fix bug #17994. 2022-04-08 11:15:16 +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
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
hufangzhou fe7158cf3a * Fix bug #21525. 2022-04-07 14:32:44 +08:00
孙华伟 a10b23a5c0 *Fix bug#21514. 2022-04-06 15:24:00 +08:00
李玉春 8a687ef1d5 Merge branch 'sunhuawei_fixbug_20335' into 'master'
Sunhuawei fixbug 20335

See merge request easycorp/zentaopms!2702
2022-04-02 09:10:04 +00:00
孙华伟 1612f6aabd Optimize the code. 2022-04-02 17:08:34 +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
李玉春 d993fe3734 Merge branch 'sunhuawei_fixbug_21235' into 'master'
Sunhuawei fixbug 21235

See merge request easycorp/zentaopms!2665
2022-04-01 09:22:07 +00:00