Commit Graph
24819 Commits
Author SHA1 Message Date
李玉春 fe15f97b82 Merge branch 'sprint/170_mayue_16221' into 'sprint/170'
* Fix bug #16221.

See merge request easycorp/zentaopms!436
2021-11-12 06:00:30 +00:00
mayue 67687a738a * Fix bug #16221. 2021-11-12 13:58:02 +08:00
李玉春 89396523ad Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170'
* Fix bug #16190.

See merge request easycorp/zentaopms!434
2021-11-12 05:25:50 +00:00
tianshujie 54d69e1969 * Fix bug #16190. 2021-11-12 13:19:18 +08:00
孙广明 e237e5267c Merge branch 'sprint/170_wangyidong' into 'sprint/170'
* fix bug for get tree menu in project view.

See merge request easycorp/zentaopms!428
2021-11-12 05:17:02 +00:00
tianshujie 44bfbb7cdc * Fix bug #16190. 2021-11-12 13:10:52 +08:00
王怡栋 1dd4bbc079 * fix bug for get tree menu in project view. 2021-11-12 10:35:13 +08:00
songchenxuan 2dbfab7e5a * Fix bug #16043. 2021-11-12 10:29:30 +08:00
孙广明 98caaec0ea Merge branch 'sprint/170_hufangzhou_bug' into 'sprint/170'
* Modify the cookie of storyModule.

See merge request easycorp/zentaopms!424
2021-11-12 02:11:00 +00:00
hufangzhou d160b6b0f5 * Fix bug #16219. 2021-11-12 10:07:28 +08:00
hufangzhou bf08427c9a * Modify the cookie of storyModule. 2021-11-12 09:45:43 +08:00
孙广明 e75aee2b1e Merge branch 'sprint/170_leiyong' into 'sprint/170'
* Do not query deleted webhook configurations.

See merge request easycorp/zentaopms!418
2021-11-12 01:04:17 +00:00
tianshujie e349618c4c * Fix bug #16205. 2021-11-12 08:48:52 +08:00
tianshujie 382e3103d0 * Fix bug #16205. 2021-11-12 08:46:19 +08:00
李玉春 27a4b1e560 Merge branch 'sprint_xieqiyu_fixbug' into 'sprint/170'
* Fix bug#16197.

See merge request easycorp/zentaopms!420
2021-11-12 00:12:48 +00:00
李玉春 f4317f05ec Merge branch 'sprint/170_tianshujie_16195' into 'sprint/170'
* Fix bug #16195.

See merge request easycorp/zentaopms!419
2021-11-12 00:11:40 +00:00
tianshujie 34ad92ab78 * Modify the judgment logic. 2021-11-11 17:50:47 +08:00
xieqiyu 17bee6e900 * Fix bug#16197. 2021-11-11 17:46:10 +08:00
tianshujie b218a43b63 * Fix bug #16195. 2021-11-11 17:38:27 +08:00
leiyong ca5e8e6090 * Do not query deleted webhook configurations. 2021-11-11 09:27:36 +00:00
zhujinyong 1515e07c04 * Fix bugs: Compatibility for old version. 2021-11-11 17:19:55 +08:00
朱金勇 4082d78ff0 Merge branch 'sprint/170_sunhao/task44164' into 'sprint/170'
* Task #44164, update task list after close modal.

See merge request easycorp/zentaopms!404
2021-11-11 08:50:53 +00:00
孙广明 39902ea40e Merge branch 'sprint/170_wangyidong' into 'sprint/170'
* revert ajaxSetUnfoldID.

See merge request easycorp/zentaopms!416
2021-11-11 08:41:57 +00:00
李玉春 00abaf7745 Merge branch 'sprint/170_tianshujie_16192' into 'sprint/170'
* Fix bug #16192.

See merge request easycorp/zentaopms!415
2021-11-11 08:33:28 +00:00
tianshujie 93c8bb6ba8 * Modify the judgment logic. 2021-11-11 16:32:29 +08:00
李玉春 2ff4571f77 Merge branch 'sprint/170_hufangzhou_16169' into 'sprint/170'
* Fix bug #16169, bug#16179.

See merge request easycorp/zentaopms!412
2021-11-11 08:32:14 +00:00
hufangzhou a8f6836d46 * Remove the unused code. 2021-11-11 16:30:41 +08:00
王怡栋 1f8bb88e8c * revert ajaxSetUnfoldID. 2021-11-11 16:19:56 +08:00
李玉春 c8b1eaef62 Merge branch 'sprint/170_mayue_16191' into 'sprint/170'
* Fix bug #16191.

See merge request easycorp/zentaopms!414
2021-11-11 08:19:38 +00:00
tianshujie 78aee66c47 * Fix bug #16192. 2021-11-11 16:18:54 +08:00
李玉春 2c296a129b Merge branch 'sprint/170_tianshujie_16190' into 'sprint/170'
* Fix bug #16190.

See merge request easycorp/zentaopms!411
2021-11-11 08:09:59 +00:00
mayue f8eebdf678 * Fix bug #16191. 2021-11-11 16:08:03 +08:00
tianshujie 7fb8685e04 * Fix the problem of reporting errors in batch editing stories. 2021-11-11 16:01:51 +08:00
李玉春 81f49bd434 Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Fix bug #16191.

See merge request easycorp/zentaopms!413
2021-11-11 08:01:22 +00:00
mayue c9996a26ec * Fix bug #16191. 2021-11-11 15:54:22 +08:00
tianshujie fd9423c737 * Remove useless code. 2021-11-11 15:42:42 +08:00
hufangzhou 4163d17335 * Fix bug #16169, bug#16179. 2021-11-11 15:31:37 +08:00
tianshujie 2eb1a00881 * Fix bug #16190. 2021-11-11 15:25:29 +08:00
tianshujie 4f4b683dbd * Fix bug #16190. 2021-11-11 15:20:01 +08:00
李玉春 15196aca58 Merge branch 'sprint/170_tianshujie_43893' into 'sprint/170'
* Fix the problem of reporting errors on the batch editing story page.

See merge request easycorp/zentaopms!407
2021-11-11 06:50:43 +00:00
李玉春 a02ebf672e Merge branch 'sprint/170_mayue_43892' into 'sprint/170'
* Finish task #43892.

See merge request easycorp/zentaopms!410
2021-11-11 06:49:40 +00:00
tianshujie f6f75dace2 * Modify the issue of batch and zero editing stories. 2021-11-11 14:49:34 +08:00
mayue dfa82c09db * Finish task #43892. 2021-11-11 14:48:02 +08:00
mayue 67ace49bea * Finish task #43892. 2021-11-11 14:39:21 +08:00
李玉春 f90072b45a Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix the trunk display problem when execution manage products.

See merge request easycorp/zentaopms!409
2021-11-11 06:38:25 +00:00
tianshujie 5f6bc547a3 * Fix the problem of obtaining plan. 2021-11-11 14:15:06 +08:00
tianshujie 4940500fe1 * Fix the trunk display problem when execution manage products. 2021-11-11 13:59:52 +08:00
mayue af83e8a639 * Resolve display of list Settings #43892. 2021-11-11 13:56:02 +08:00
xieqiyu b1098e7040 * Finish task#43890. 2021-11-11 13:53:24 +08:00
tianshujie edd64950ab * Fix the problem of reporting errors on the batch editing story page. 2021-11-11 13:44:27 +08:00