Commit Graph

1048 Commits

Author SHA1 Message Date
tianshujie
bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
tianshujie
a0d61f9d2f * Working with Kanban Data. 2022-01-12 11:07:02 +08:00
孙广明
62b7f5eac1 Merge branch 'sprint/182_liumengyi_47340' into 'kanban'
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.

See merge request easycorp/zentaopms!1344
2022-01-11 07:53:14 +00:00
liumengyi
ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
孙广明
54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
孙广明
b57562e99e Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
2022-01-11 00:35:04 +00:00
hufangzhou
0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +08:00
mayue
91ff44d32e * Optimize code. 2022-01-07 09:14:27 +08:00
zhouxin
7c1d29f971 Fix bug. 2022-01-06 05:12:36 +00:00
李玉春
a19708adeb Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
#   module/project/config.php
2022-01-06 04:01:16 +00:00
zhouxin
0b08489176 Fix bug. 2022-01-06 03:57:50 +00:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
李玉春
d7a9f2fd67 Merge branch 'sprint/180_mayue_46526' into 'sprint/180'
* Finish task #46526.

See merge request easycorp/zentaopms!1249
2022-01-04 07:32:59 +00:00
mayue
1d28df0e30 * Optimize code. 2022-01-04 15:27:07 +08:00
mayue
0cd9411371 * Finish task #46526. 2022-01-04 10:28:53 +08:00
孙广明
355665690b Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674

See merge request easycorp/zentaopms!1195
2021-12-30 08:15:39 +00:00
zhouxin
50dabf7bd7 Refactor method checkCanChangeModel. 2021-12-30 08:09:50 +00:00
zhouxin
e9231b595a Change configuration file. 2021-12-30 07:16:28 +00:00
zhouxin
05a75e7039 Finish task #46674. 2021-12-30 05:50:50 +00:00
mayue
9d89d77c57 * Finish task #46527. 2021-12-30 13:10:17 +08:00
孙广明
3d3d4130dd * Code for php8.0. 2021-12-29 16:59:54 +08:00
hufangzhou
2f58499fee * Fix bugs for compatible 8.0. 2021-12-28 16:26:08 +08:00
mayue
3aeb86e36d * Finish task #46526. 2021-12-28 15:22:08 +08:00
xieqiyu
5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
朱金勇
67ecc5f8c8 Merge branch 'sprint/178_songchenxuan_46099' into 'master'
*Finish task #46099.

See merge request easycorp/zentaopms!974
2021-12-17 07:40:10 +00:00
songchenxuan
63479860a5 *Finish task #46099. 2021-12-17 13:56:24 +08:00
孙广明
6ee1345b07 * Reset project priv. 2021-12-17 10:13:49 +08:00
songchenxuan
fb8793f1d3 *Finish task #46099. 2021-12-15 17:29:31 +08:00
孙广明
04eb385659 * Fix bug. 2021-12-15 14:34:52 +08:00
Hao Sun
2f862118d8 * Refactor progress-pie instead of rings to improve perf. 2021-12-14 14:31:41 +08:00
zhouxin
4f5367dae7 made small changes. 2021-12-13 08:56:39 +00:00
zhouxin
40f27795e1 change if...else to switch...case,change now to today. 2021-12-13 08:45:37 +00:00
zhouxin
9567620ff4 Finish task #45800. 2021-12-13 07:53:23 +00:00
xieqiyu
ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
tanghucheng
19420bef7b * Code for stage. 2021-12-03 00:55:54 +08:00
王怡栋
bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
zhengrunyu
f274c52e33 *Finish task #fixbug. 2021-12-02 08:14:09 +08:00
zhengrunyu
ae3c0eb522 *Finish task #45150. 2021-12-01 13:04:31 +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
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +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
zhengrunyu
9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +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
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