Commit Graph
375 Commits
Author SHA1 Message Date
Hao Sun 2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
songchenxuan 8a0881aef4 *Finish task #45543. 2021-12-13 10:14:50 +08:00
tianshujie 545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
孙广明 834684ca51 Merge branch 'sprint/174_tianshujie_17173' into 'master'
* Fix bug #17173,17173.

See merge request easycorp/zentaopms!812
2021-12-07 09:24:13 +00:00
tianshujie 4fdb7107dc * Fix bug #17173,17173. 2021-12-07 17:22:14 +08:00
tanghucheng 6f6dc4741a * Fix bug #17225. 2021-12-07 17:13:23 +08:00
hufangzhou 9359d427f5 * Fix bug #17185. 2021-12-07 15:25:31 +08:00
chaideqing 9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
tanghucheng c6b731717a * Fix project execution privilege. 2021-12-06 09:24:06 +08:00
孙广明 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
chaideqing 06cf26ea9a * add project name in execution card title 2021-12-03 09:58:26 +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
Wenrui LI 24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +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
chaideqing 45e127be6e * add linkButton tips in card and card do not show cross scroll 2021-12-01 14:59:33 +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
chaideqing 17ba1ea184 * add jump-link in xuanxuan_card which can jump to zentao_extension_page 2021-12-01 11:10:22 +08:00
mayue c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
chaideqing de1a9ddd9b Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857 2021-12-01 10:35:47 +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