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 |
|
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 |
|
孙广明
|
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 |
|
xieqiyu
|
763ae6ea87
|
* Code for task#45082.
|
2021-11-28 19:54:47 +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 |
|
王怡栋
|
c15bf759b9
|
* code for task #44937.
|
2021-11-26 10:40:54 +08:00 |
|
tianshujie
|
179e766478
|
* Modify function name.
|
2021-11-24 16:45:08 +08:00 |
|
tianshujie
|
ec5ca42e49
|
* Fix bug #16577.
|
2021-11-23 15:01:51 +08:00 |
|
hufangzhou
|
63bc9f80c4
|
* Fix bug #16509.
|
2021-11-22 14:11:13 +08:00 |
|
李玉春
|
15967171de
|
Merge branch 'sprint/173_lizhiqiang_16371' into 'sprint/170'
Fix bug#16371.
See merge request easycorp/zentaopms!513
|
2021-11-18 06:33:49 +00:00 |
|
李玉春
|
3870f6f9e4
|
Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Finis task #44486,44487,44488.
See merge request easycorp/zentaopms!495
|
2021-11-18 06:30:03 +00:00 |
|
lizhiqiang
|
e5653c5dd7
|
*Finish Bug #16371.
|
2021-11-18 14:21:34 +08:00 |
|
zhouxin
|
b658a98de3
|
Fix some problem.
|
2021-11-18 14:13:32 +08:00 |
|
孙广明
|
8f2c87cae1
|
Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'
# Conflicts:
# module/execution/view/create.html.php
|
2021-11-18 06:03:46 +00: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 |
|
hufangzhou
|
21faa0dc2a
|
* Finish task #44361.
|
2021-11-18 11:30:28 +08:00 |
|