 朱金勇
|
24ad4bc48c
|
Merge branch 'sprint/180_xieqiyu_46520' into 'sprint/180'
Sprint/180 xieqiyu 46520
See merge request easycorp/zentaopms!1228
|
2021-12-31 07:53:33 +00:00 |
|
|
xieqiyu
|
5c4609d302
|
* Modify review problem.
|
2021-12-31 15:43:27 +08:00 |
|
|
songchenxuan
|
47c271d9f6
|
*Fix Closed name bug.
|
2021-12-30 16:40:53 +08:00 |
|
|
songchenxuan
|
b32009a0ce
|
*Fix execution kanban bug.
|
2021-12-30 15:34:44 +08:00 |
|
|
songchenxuan
|
769f7cd58e
|
*Finish task #46529.
|
2021-12-30 09:01:33 +08:00 |
|
|
孙广明
|
84fae4bc7d
|
Merge branch 'kanban'
|
2021-12-20 10:59:07 +08:00 |
|
|
mayue
|
4adf6e0a52
|
* Fix bug #17015.
|
2021-12-15 17:17:57 +08:00 |
|
|
zhujinyong
|
45cdfc8f59
|
Merge branch 'xuan'
|
2021-12-14 09:08:15 +08:00 |
|
|
李玉春
|
47c4b4e526
|
Merge branch 'sprint/devops16_wangyidong_test' into 'master'
* code for bug #17438.
See merge request easycorp/zentaopms!915
|
2021-12-13 08:10:11 +00:00 |
|
|
王怡栋
|
eadbb0e1de
|
* adjust code.
|
2021-12-13 16:09:40 +08:00 |
|
|
王怡栋
|
69023a52bc
|
* code for bug #17438.
|
2021-12-13 15:24:04 +08:00 |
|
|
朱金勇
|
161233a64f
|
Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536
See merge request easycorp/zentaopms!884
|
2021-12-10 06:15:15 +00:00 |
|
|
xieqiyu
|
ad8ed52f22
|
* Code for task#45536.
|
2021-12-10 10:57:56 +08:00 |
|
|
孙广明
|
12ce541d9e
|
* Code for task #45818.
|
2021-12-09 10:50:05 +08:00 |
|
|
tianshujie
|
7c3a8dc753
|
* Fix bug #17259.
|
2021-12-09 10:34:47 +08:00 |
|
|
hufangzhou
|
32601cd5ff
|
* Fix bug #17185.
|
2021-12-09 10:34:47 +08:00 |
|
|
tianshujie
|
545652e0e4
|
* Fix bug #17259.
|
2021-12-08 16:50:48 +08:00 |
|
|
hufangzhou
|
9359d427f5
|
* Fix bug #17185.
|
2021-12-07 15:25:31 +08:00 |
|
|
tanghucheng
|
30d1e22dca
|
* Merge programplan into stage.
|
2021-12-03 13:57:08 +08:00 |
|
|
tanghucheng
|
19420bef7b
|
* Code for stage.
|
2021-12-03 00:55:54 +08:00 |
|
|
孙广明
|
1faf545954
|
* Remove unused code.
|
2021-12-02 13:10:55 +08:00 |
|
|
李玉春
|
38f5ab4145
|
Merge branch 'master' into 'sprint/175_sgm_fixbug'
# Conflicts:
# module/execution/control.php
# module/message/config.php
|
2021-12-02 05:04:29 +00:00 |
|
|
李玉春
|
4afdccfc5e
|
Merge branch 'sprint/174_tianshujie_16897' into 'master'
* Fix bug #16897.
See merge request easycorp/zentaopms!725
|
2021-12-02 03:16:18 +00:00 |
|
|
李玉春
|
b1cd56f4b3
|
Merge branch 'sprint/174_hufangzhou_45079' into 'master'
Sprint/174 hufangzhou 45079
See merge request easycorp/zentaopms!715
|
2021-12-02 02:53:09 +00:00 |
|
|
xieqiyu
|
fa6b49493f
|
* Fix bug: The problem of execution requirement list module.
|
2021-12-02 10:06:24 +08:00 |
|
|
tianshujie
|
a5598ddf64
|
* Fix bug #16897.
|
2021-12-02 10:04:02 +08:00 |
|
|
mayue
|
07f8a820b0
|
* Code format #16987.
|
2021-12-02 09:28:02 +08:00 |
|
|
孙广明
|
4b94092737
|
* Finish task #45162.
|
2021-12-02 09:24:01 +08:00 |
|
|
mayue
|
63d4d3dad8
|
* Fix bug #16987.
|
2021-12-02 09:20:37 +08:00 |
|
|
tianshujie
|
59dc2b1cce
|
* Fix bug #16980.
|
2021-12-01 14:39:18 +08:00 |
|
|
songchenxuan
|
839ee66e77
|
* Finish task #45039.
|
2021-12-01 13:41:01 +08:00 |
|
|
李玉春
|
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
|
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 |
|
|
chaideqing
|
de1a9ddd9b
|
Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857
|
2021-12-01 10:35:47 +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 |
|
|
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 |
|
|
李玉春
|
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 |
|
|
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 |
|
|
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 |
|