Commit Graph

359 Commits

Author SHA1 Message Date
孙广明
5a8e51a9c6 Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Merge programplan into stage.

See merge request easycorp/zentaopms!760
2021-12-06 00:33:10 +00:00
tanghucheng
30d1e22dca * Merge programplan into stage. 2021-12-03 13:57:08 +08:00
tanghucheng
499605d81e * Merge programplan into stage. 2021-12-03 11:09:28 +08:00
liyuchun
c919c8105d * Adjust code style. 2021-12-03 10:56:55 +08:00
Hao Sun
42a1cdc0b4 * Bug 16878, fix layout when open execution/task in iframe modal. 2021-12-03 09:56:11 +08:00
tanghucheng
d4bfcd15cc * Merge programplan into stage. 2021-12-03 09:35:14 +08:00
tanghucheng
613d171dde * Merge programplan into stage. 2021-12-03 09:20:08 +08:00
tanghucheng
1acd92b85d * Merge programplan into stage. 2021-12-03 09:13:57 +08:00
tanghucheng
686c40396b * Merge programplan into stage. 2021-12-03 09:11:43 +08:00
tanghucheng
fa808b990b * Merge programplan into stage. 2021-12-03 08:19:14 +08:00
tanghucheng
19420bef7b * Code for stage. 2021-12-03 00:55:54 +08:00
孙广明
1faf545954 * Remove unused code. 2021-12-02 13:10:55 +08:00
王怡栋
bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
王怡栋
f25d797b54 * adjust for flow. 2021-12-02 10:06: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
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08: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
86ccece2ca * Modify the problem of function demonstration. 2021-12-01 16:32:10 +08: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
李玉春
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
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
tianshujie
da240630e5 * Fix bug #16963. 2021-12-01 10:01:39 +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
9d7449acae * refactor. 2021-12-01 08:29:07 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +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
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
mayue
d89aa24c8c * Finish task #44987,44988,44989. 2021-11-30 10:32:11 +08:00
zhengrunyu
e78c876216 *Finish task #45148. 2021-11-30 09:22:04 +08:00
tianshujie
7e225ce3f7 * Finish task #45081,45012. 2021-11-30 09:18:05 +08:00
mayue
a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
zhengrunyu
b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
tianshujie
582f0e036d * Finish task #45043. 2021-11-27 18:14:41 +08:00
tianshujie
f4d1a727a7 * Finish task #45084,44994,44993. 2021-11-27 17:41:42 +08:00
zhengrunyu
9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
zhengrunyu
07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu
119a3fab7d *Finish task #45151. 2021-11-26 08:48:26 +08:00
zhengrunyu
2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu
3340a383f1 *Finish task #45151. 2021-11-25 15:03:43 +08:00
tianshujie
33e557cd18 * Fix bug #16577. 2021-11-23 15:07:07 +08:00
liyuchun
da47c729d9 * Adjust execution button name. 2021-11-22 13:36:52 +08:00
zhengrunyu
a6db2057d9 *Finish task #16521. 2021-11-22 11:12:15 +08:00
liyuchun
9502610ece * Fix error for task #44358. 2021-11-22 08:39:34 +08:00
mayue
2b258a7665 * Modify style. 2021-11-19 15:11:07 +08:00
liyuchun
8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00