Commit Graph
907 Commits
Author SHA1 Message Date
李玉春 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
zhengrunyu 46a9f157b1 *Finish task #45148. 2021-11-30 10:56:09 +08:00
mayue f2d867870a * Finish task #44987,44988,44989. 2021-11-30 10:55:41 +08:00
mayue d89aa24c8c * Finish task #44987,44988,44989. 2021-11-30 10:32:11 +08:00
mayue 19d489a645 * Fix bug #44987,44988,44989. 2021-11-30 09:27:50 +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
tianshujie 0c33d76709 * Finish task #45081. 2021-11-29 17:14:01 +08:00
mayue 7a5c062947 * Finish task #44987,44988,44989. 2021-11-29 16:15:50 +08:00
李玉春 a99419f0c5 Merge branch 'master' into 'sprint/174_tianshujie_45081'
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
2021-11-29 08:03:38 +00:00
tianshujie adb2c12935 * Modify the code. 2021-11-29 15:54:48 +08:00
mayue a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
孙广明 5ad303eca9 Merge branch 'sprint/174_xieqiyu_45080' into 'master'
Sprint/174 xieqiyu 45080

See merge request easycorp/zentaopms!644
2021-11-29 06:58:17 +00:00
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
zhengrunyu b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
xieqiyu 763ae6ea87 * Code for task#45082. 2021-11-28 19:54:47 +08:00
tianshujie 582f0e036d * Finish task #45043. 2021-11-27 18:14:41 +08:00
tianshujie 3bddd21087 * Finish task #45083. 2021-11-27 17:58:52 +08:00
tianshujie f4d1a727a7 * Finish task #45084,44994,44993. 2021-11-27 17:41:42 +08:00
tianshujie 066db150a4 * Solve the problem of plan creation and execution error. 2021-11-27 09:52:47 +08:00
zhengrunyu 9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
王怡栋 c15bf759b9 * code for task #44937. 2021-11-26 10:40:54 +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