孙广明
|
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 |
|
孙广明
|
b956e21448
|
* Fix bug.
|
2021-11-24 13:10:40 +08:00 |
|
王怡栋
|
fde5cb61da
|
Merge branch 'sprint/app10' into sprint/170
|
2021-11-19 08:41:00 +08: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 |
|
xieqiyu
|
47cdcd78c0
|
* Code for task#44497.
|
2021-11-17 19:30:13 +08:00 |
|
mayue
|
9979876a0d
|
* Fix bug #16257.
|
2021-11-17 16:54:16 +08:00 |
|
王怡栋
|
c14392a3ac
|
* round for project progress.
|
2021-11-17 13:31:56 +08:00 |
|
王怡栋
|
bc81d745d8
|
* fix for statistical data.
|
2021-11-17 09:22:05 +08:00 |
|
王怡栋
|
d68ce78a66
|
* code for task #44325.
|
2021-11-16 14:40:42 +08:00 |
|
孙广明
|
102d718ecf
|
Merge branch 'sprint/170' into 'sprint/170_zhengrunyu_44498'
# Conflicts:
# module/project/model.php
|
2021-11-16 05:47:29 +00:00 |
|
zhengrunyu
|
d5783e71b3
|
*Finish task #44498.
|
2021-11-16 13:43:05 +08:00 |
|
李玉春
|
b74f5ab258
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Fix bug #43916.
See merge request easycorp/zentaopms!465
|
2021-11-16 03:20:54 +00:00 |
|
zhouxin
|
dd5cf8c7bd
|
Fix bug #43916.
|
2021-11-15 19:15:20 +08:00 |
|
李玉春
|
a8523d317a
|
Merge branch 'sprint/170_zhouxin_43916' into 'sprint/170'
Finish task #43916.
See merge request easycorp/zentaopms!437
|
2021-11-15 05:05:00 +00:00 |
|
tianshujie
|
50b4590655
|
* Fix bug #16194.
|
2021-11-12 14:53:51 +08:00 |
|
zhouxin
|
e57d1d1cc7
|
Finish task #43916.
|
2021-11-12 14:06:44 +08:00 |
|
孙广明
|
6d625bb597
|
* Finish task #43998.
|
2021-11-10 09:43:04 +08:00 |
|
李玉春
|
98f519fe31
|
Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901'
# Conflicts:
# module/branch/model.php
# module/story/model.php
|
2021-11-09 07:53:17 +00:00 |
|
tianshujie
|
8e9dd74c0d
|
* Modify code logic.
|
2021-11-09 15:47:31 +08:00 |
|
tianshujie
|
5ab6fe77c2
|
* Modify code logic.
|
2021-11-09 14:21:17 +08:00 |
|
zhengrunyu
|
0f975ee3c4
|
*Finish task #44157.
|
2021-11-09 13:48:06 +08:00 |
|
zhengrunyu
|
57bc70b75b
|
*Finish task #44157.
|
2021-11-09 13:31:05 +08:00 |
|
tianshujie
|
3986d8c297
|
* Add the logic of project-related multi-branch products.
|
2021-11-09 10:04:05 +08:00 |
|
孙广明
|
9f85b1a557
|
* Fix kanban error.
|
2021-11-08 18:22:02 +08:00 |
|
孙广明
|
d49b7eac72
|
* Fix kanban error.
|
2021-11-08 17:35:09 +08:00 |
|