Commit Graph
3634 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
songchenxuan 631a62e2dd * Finish task #45040. 2021-12-01 13:16:42 +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
李玉春 20ae1dba85 Merge branch 'sprint/175_liumengyi_16882' into 'master'
* Fix bug #16882.

See merge request easycorp/zentaopms!690
2021-12-01 05:01:11 +00:00
zhujinyong 8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
liumengyi bba0c40dfe * Fix bug #16882, #16924. 2021-12-01 11:25:02 +08:00
songchenxuan 85cf0ab20c * Finish task #45040. 2021-12-01 11:15:19 +08:00
孙广明 1a9a2cb624 Merge branch 'spirnt/175_liyuchun_bug' into 'master'
* Finish task #45152.

See merge request easycorp/zentaopms!686
2021-12-01 02:56:55 +00:00
zhengrunyu e42d3ebed7 *Finish task #45150. 2021-12-01 10:30:41 +08:00
liumengyi 86674338d9 * Fix bug #16882. 2021-12-01 10:24:45 +08:00
zhengrunyu 3e4fa30030 *Finish task #45150. 2021-12-01 10:14:15 +08:00
liyuchun e6ece3beab * Finish task #45152. 2021-12-01 10:01:20 +08:00
songchenxuan cb00625795 * Finish task #45040. 2021-12-01 08:45:25 +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
Hao Sun 39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
孙广明 f89071b9e7 Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148'
# Conflicts:
#   module/execution/view/view.html.php
2021-11-30 03:13:21 +00:00
zhengrunyu 46a9f157b1 *Finish task #45148. 2021-11-30 10:56:09 +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 fb15cb3bd1 * Fix bug #16603. 2021-11-29 17:05:23 +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
孙广明 8d9fb81d9d Merge branch 'master' into 'sprint/174_hufangzhou_45085'
# Conflicts:
#   module/story/model.php
2021-11-29 07:26:45 +00:00
hufangzhou 883f87a19c * Remove the unused code. 2021-11-29 15:24:46 +08:00
hufangzhou bf1ca5893e * Modify the url when refresh the tree browse in project module. 2021-11-29 15:20:48 +08:00
tianshujie 96a46aa2ca * Modify the code. 2021-11-29 14:16:10 +08:00
hufangzhou 0965e74d0e * Finish task #45085. Fix bug #16792. 2021-11-29 13:19:55 +08:00
liyuchun 578d53f5ae * Finish task #45152. 2021-11-29 13:08:18 +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
liyuchun 1b63752f83 * Finish task #45152. 2021-11-26 14:00:54 +08:00
mayue b2611b3fb7 * Fix bug #16603. 2021-11-26 10:43:45 +08:00
zhengrunyu 07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu 2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu 0edae7664d *Finish task #45148. 2021-11-25 15:42:18 +08:00
tanghucheng 17f6a6203c * Code for project. 2021-11-25 13:32:06 +08:00
tanghucheng 72863779bb * Code for project function getTeamMemberPairs. 2021-11-25 10:31:49 +08:00
王怡栋 9a80f35962 Merge branch 'sprint/app10' 2021-11-25 10:25:05 +08:00
tanghucheng 8742bd0314 * Code for project model function getTeamMemberPairs. 2021-11-24 17:15:05 +08:00
孙广明 59172b420e * Fix project and product relation bug. 2021-11-24 14:01:50 +08:00
孙广明 b956e21448 * Fix bug. 2021-11-24 13:10:40 +08:00
songchenxuan 6922251f39 * Fix bug 16596. 2021-11-23 15:48:27 +08:00
王怡栋 b0b410cb91 Merge branch 'sprint/173_xieqiyu_16548' into 'sprint/170'
* Fix bug#16548.

See merge request easycorp/zentaopms!596
2021-11-22 08:54:19 +00:00
xieqiyu 578d51ce01 * Fix bug#16548. 2021-11-22 16:49:06 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
tianshujie 7802bc6a47 * Fix bug #16541. 2021-11-22 16:01:31 +08:00
李玉春 87a25ad686 Merge branch 'sprint/170_mayue_16405' into 'sprint/170'
* Fix bug #16405.

See merge request easycorp/zentaopms!574
2021-11-22 03:50:25 +00:00