Commit Graph

930 Commits

Author SHA1 Message Date
liyuchun
da73e10709 * Fix bug #16856. 2021-12-02 15:32:27 +08:00
李玉春
38f5ab4145 Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
#   module/execution/control.php
#   module/message/config.php
2021-12-02 05:04:29 +00:00
李玉春
4afdccfc5e Merge branch 'sprint/174_tianshujie_16897' into 'master'
* Fix bug #16897.

See merge request easycorp/zentaopms!725
2021-12-02 03:16:18 +00:00
王怡栋
b043ff0772 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-02 10:55:40 +08:00
王怡栋
bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
李玉春
b1cd56f4b3 Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079

See merge request easycorp/zentaopms!715
2021-12-02 02:53:09 +00:00
xieqiyu
fa6b49493f * Fix bug: The problem of execution requirement list module. 2021-12-02 10:06:24 +08:00
王怡栋
f25d797b54 * adjust for flow. 2021-12-02 10:06:02 +08:00
tianshujie
a5598ddf64 * Fix bug #16897. 2021-12-02 10:04:02 +08:00
李玉春
4c29226156 Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Fix bug #16987.

See merge request easycorp/zentaopms!723
2021-12-02 01:48:29 +00:00
mayue
07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
孙广明
4b94092737 * Finish task #45162. 2021-12-02 09:24:01 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
孙广明
128af31eda Merge branch 'sprint/175_zhengrunyu_fixbug' into 'master'
*Finish task #fixbug.

See merge request easycorp/zentaopms!718
2021-12-02 00:21:59 +00:00
zhengrunyu
f274c52e33 *Finish task #fixbug. 2021-12-02 08:14:09 +08:00
李玉春
0b0aa04db1 Merge branch 'sprint/174_tianshujie_issue' into 'master'
* Modify the problem of function demonstration.

See merge request easycorp/zentaopms!714
2021-12-01 09:29:36 +00:00
tianshujie
92ad301e29 * Fix bug #16988. 2021-12-01 17:16:52 +08:00
mayue
eec94fd383 * Fix bug #16936. 2021-12-01 17:14:43 +08:00
tianshujie
41da1fdb7e * Fix the problem of graying out the maintenance product. 2021-12-01 17:05:45 +08:00
tianshujie
64cac6374b * The plan is blank when switching branches. 2021-12-01 16:39:10 +08:00
tianshujie
86ccece2ca * Modify the problem of function demonstration. 2021-12-01 16:32:10 +08:00
tianshujie
59dc2b1cce * Fix bug #16980. 2021-12-01 14:39:18 +08:00
songchenxuan
839ee66e77 * Finish task #45039. 2021-12-01 13:41:01 +08:00
李玉春
4b37f6b83b Merge branch 'sprint/174_songchenxuan_45040' into 'master'
* Finish task #45040.

See merge request easycorp/zentaopms!684
2021-12-01 05:24:23 +00:00
李玉春
686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
2021-12-01 05:23:47 +00:00
mayue
c22503af7b * Finish task #44987,44988,44989. 2021-12-01 13:18:47 +08:00
孙广明
3803a94c4c Merge branch 'sprint/175_zhengrunyu_45150' into 'master'
*Finish task #45150.

See merge request easycorp/zentaopms!698
2021-12-01 05:16:22 +00:00
zhengrunyu
ae3c0eb522 *Finish task #45150. 2021-12-01 13:04:31 +08:00
李玉春
55166d5409 Merge branch 'sprint/174_tianshujie_45029' into 'master'
* Fix bug #45029.

See merge request easycorp/zentaopms!685
2021-12-01 03:35:46 +00:00
zhujinyong
8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
songchenxuan
85cf0ab20c * Finish task #45040. 2021-12-01 11:15:19 +08:00
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
孙广明
d91e3346df Merge branch 'sprint/175_zhengrunyu_45150' into 'master'
*Finish task #45150.

See merge request easycorp/zentaopms!688
2021-12-01 02:43:19 +00:00
zhengrunyu
6884b949b0 *Finish task #45150. 2021-12-01 10:36:12 +08:00
zhengrunyu
e42d3ebed7 *Finish task #45150. 2021-12-01 10:30:41 +08:00
zhengrunyu
3e4fa30030 *Finish task #45150. 2021-12-01 10:14:15 +08:00
tianshujie
da240630e5 * Fix bug #16963. 2021-12-01 10:01:39 +08:00
songchenxuan
73726f8a67 * Finish task #45040. 2021-12-01 09:12:33 +08:00
songchenxuan
cb00625795 * Finish task #45040. 2021-12-01 08:45:25 +08:00
Hao Sun
5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00
Hao Sun
229f49fc69 * only update kanban when remote data is difference. 2021-12-01 08:29:33 +08:00
Hao Sun
9d7449acae * refactor. 2021-12-01 08:29:07 +08:00
tianshujie
be15ba6045 * Fix the module tree under execution. 2021-11-30 17:24:11 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun
88e67add78 * refactor usage of kanban. 2021-11-30 14:21:24 +08:00
Hao Sun
39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
李玉春
2d1e0bb3dc Merge branch 'sprint/168_sgm_45160' into 'sprint/168'
* Finish task #45160.

See merge request easycorp/zentaopms!664
2021-11-30 05:15:34 +00:00
李玉春
4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
mayue
71387b1d37 * Finish task #44987,44988,44989. 2021-11-30 11:26:48 +08:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00