Commit Graph
339 Commits
Author SHA1 Message Date
李玉春 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
孙广明 8f2c87cae1 Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'
# Conflicts:
#   module/execution/view/create.html.php
2021-11-18 06:03:46 +00:00
李玉春 e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
tianshujie 7044ccbf2c * Modify logic. 2021-11-18 11:17:22 +08:00
tianshujie e8f77ac632 * Modify logic. 2021-11-18 11:10:02 +08:00
tianshujie 4e02c5ba53 * Fix product issues during replication sprint. 2021-11-18 10:48:31 +08:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
李玉春 9c4b07e8b7 Merge branch 'sprint/170' into 'sprint/173_lizhiqiang__16336'
# Conflicts:
#   module/execution/view/bug.html.php
2021-11-18 01:04:00 +00:00
xieqiyu 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
lizhiqiang 791ea627de * Finish bug #16336. 2021-11-17 17:57:04 +08:00
Hao Sun 6ad007f06e * task #44357, refactor executions kanban with kanban component and support dnd. 2021-11-17 17:51:20 +08:00
mayue 2f4ed8f1c0 * Fix bug #16000. 2021-11-17 15:00:40 +08:00
李玉春 68653946e5 Merge branch 'sprint/171_sgm_sortwiki' into 'sprint/168'
Sprint/171 sgm sortwiki

See merge request easycorp/zentaopms!435
2021-11-12 05:24:19 +00:00
孙广明 70c1981893 * Fix bug #16059. 2021-11-12 11:23:35 +08:00
songchenxuan 2dbfab7e5a * Fix bug #16043. 2021-11-12 10:29:30 +08: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
liyuchun 4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
tianshujie c29ea5077a * Finish task #43901. 2021-11-10 13:10:11 +08:00
李玉春 fe315477ea Update manageproducts.html.php 2021-11-10 02:53:53 +00:00