 李玉春
|
7c4785dd42
|
Merge branch 'sprint/185_zhouxudong_49881' into 'master'
Sprint/185 zhouxudong 49881
See merge request easycorp/zentaopms!2113
|
2022-03-07 06:09:31 +00:00 |
|
|
周旭东
|
4666f2f5f6
|
Update browse.css
|
2022-03-07 05:52:11 +00:00 |
|
|
周旭东
|
2686139e04
|
Update browsebylist.html.php
|
2022-03-07 05:51:47 +00:00 |
|
|
zhouxudong
|
a7484fe721
|
* Fix task #49881.
|
2022-03-07 13:50:32 +08:00 |
|
|
zhouxudong
|
a312035c1b
|
* Fix task #49881.
|
2022-03-07 11:17:40 +08:00 |
|
|
孙广明
|
7b962c4e38
|
Merge branch 'pailei'
|
2022-03-07 10:56:26 +08:00 |
|
|
zhouxudong
|
c6eb97cc5f
|
* Finish task #49882.
|
2022-03-07 10:21:57 +08:00 |
|
|
李玉春
|
fe873b6a53
|
Merge branch 'sprint/185_zhouxudong_49881' into 'pailei'
* Finish task #49881.
See merge request easycorp/zentaopms!2097
|
2022-03-07 01:37:43 +00:00 |
|
|
zhouxudong
|
bb3be7d065
|
* Finish task #49881.
|
2022-03-07 09:31:22 +08:00 |
|
|
李玉春
|
816992657c
|
Merge branch 'sprint/185_zhouxudong_49881' into 'pailei'
* Finish task #49881.
See merge request easycorp/zentaopms!2092
|
2022-03-07 00:25:43 +00:00 |
|
|
zhouxin
|
27d109e904
|
Add kindeditor for the view and close page of productplan.
|
2022-03-03 02:22:51 +00:00 |
|
|
孙广明
|
25d240ebca
|
Merge branch 'sprint/pailei_zhouxin_20192' into 'pailei'
Fix bug.
See merge request easycorp/zentaopms!2042
|
2022-03-02 05:53:07 +00:00 |
|
|
zhouxin
|
087916a60e
|
Fix bug #20191.
|
2022-03-02 05:49:21 +00:00 |
|
|
zhouxin
|
8722ab62f1
|
Fix bug.
|
2022-03-02 03:28:09 +00:00 |
|
|
liumengyi
|
fcc37d1ab0
|
* Fix code for productplan getPairs.
|
2022-03-02 10:28:22 +08:00 |
|
|
liumengyi
|
bf6d9c2e3a
|
* Fix bug #20117.
|
2022-03-02 10:15:38 +08:00 |
|
|
孙广明
|
6873b1061f
|
Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304
See merge request easycorp/zentaopms!2007
|
2022-03-01 07:04:26 +00:00 |
|
|
xieqiyu
|
af76bc5b46
|
* Append story module when change product type.
|
2022-02-28 17:50:06 +08:00 |
|
|
zhouxin
|
5dc91f9a30
|
Finish task #49886#49883.
|
2022-02-28 09:14:19 +00:00 |
|
|
zhouxudong
|
a6e3844561
|
* Finish task #49881.
|
2022-02-25 09:33:43 +08:00 |
|
|
xieqiyu
|
d15a0ea9b2
|
* Modify module of testcase when change product type.
|
2022-02-24 17:07:54 +08:00 |
|
|
周旭东
|
f521758c05
|
Update control.php
|
2022-02-24 00:34:56 +00:00 |
|
|
zhouxudong
|
bf002dcd83
|
* Finish task #49289.
|
2022-02-23 14:11:38 +08:00 |
|
|
李玉春
|
9405f7bf71
|
Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
# db/update16.4.sql
# module/user/view/story.html.php
|
2022-02-23 01:33:37 +00:00 |
|
|
zhujinyong
|
2b7820d317
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-22 14:15:18 +08:00 |
|
|
zhujinyong
|
408f8d4d91
|
* Move die to return.
|
2022-02-22 14:15:00 +08:00 |
|
|
孙广明
|
fdd36dce95
|
Merge branch 'sprint/185_zhouxin_49302' into 'sprint/185'
Sprint/185 zhouxin 49302
See merge request easycorp/zentaopms!1874
|
2022-02-22 01:58:09 +00:00 |
|
|
zhouxin
|
63be4b0948
|
Adjust code.
|
2022-02-22 01:56:44 +00:00 |
|
|
zhujinyong
|
1f8e1b0021
|
* Fix return print() -> return.
|
2022-02-22 09:35:25 +08:00 |
|
|
zhouxin
|
ae8d371efb
|
Fix bug. .
|
2022-02-22 01:12:41 +00:00 |
|
|
zhouxin
|
751fec28e8
|
Finish task #49302.
|
2022-02-21 08:53:25 +00:00 |
|
|
zhengrunyu
|
0805d25735
|
* Finish task 49283.
|
2022-02-21 10:47:27 +08:00 |
|
|
zhengrunyu
|
1a8f317229
|
*Finish task 49303
|
2022-02-21 09:07:30 +08:00 |
|
|
zhengrunyu
|
ae58f6c7c8
|
* Finish task 49303.
|
2022-02-17 11:27:41 +08:00 |
|
|
李玉春
|
459f6a2076
|
Merge branch 'master' into 'sunhuawei_fixbug_19247'
# Conflicts:
# module/execution/css/story.css
|
2022-02-15 05:41:51 +00:00 |
|
|
孙华伟
|
aaf936b061
|
Fix bug #19247 #19435 #19239.
|
2022-02-15 13:29:03 +08:00 |
|
|
孙华伟
|
742614e0da
|
Fix bug #19247 #19435 #19239
|
2022-02-15 13:25:12 +08:00 |
|
|
孙华伟
|
99532c30e0
|
Fix bug #19239.
|
2022-02-14 17:00:16 +08:00 |
|
|
孙华伟
|
06f9338fad
|
*Fix bug #19239 #19367.
|
2022-02-11 08:54:47 +08:00 |
|
|
孙华伟
|
586af4b5de
|
*Fix bug #48663.
|
2022-02-10 13:58:16 +08:00 |
|
|
zhouxudong
|
676db0bbb2
|
*Fix bug #18321.
|
2022-01-17 14:22:31 +08:00 |
|
|
孙广明
|
b01b6a90eb
|
Merge branch 'kanban'
|
2022-01-17 10:34:08 +08:00 |
|
|
孙广明
|
758c03968f
|
* Add kanban type in query.
|
2022-01-17 08:41:59 +08:00 |
|
|
孙广明
|
aa1a28a20c
|
Merge branch 'Fixbug_zhengrunyu' into 'master'
*Fix bug 18290.
See merge request easycorp/zentaopms!1338
|
2022-01-11 03:18:33 +00:00 |
|
|
zhengrunyu
|
919ea9d8d0
|
*Fix bug 18290.
|
2022-01-11 10:28:33 +08:00 |
|
|
hufangzhou
|
d0cfa7531e
|
* Add the new version.
|
2022-01-11 09:19:47 +08:00 |
|
|
孙广明
|
ba53ac9f5b
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug for start and end time when edit it.
See merge request easycorp/zentaopms!1312
|
2022-01-07 02:15:47 +00:00 |
|
|
zhengrunyu
|
5475eeab94
|
*Fix bug for start and end time when edit it.
|
2022-01-07 10:11:36 +08:00 |
|
|
孙广明
|
236b790dca
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Code bug
See merge request easycorp/zentaopms!1311
|
2022-01-07 01:42:13 +00:00 |
|
|
zhengrunyu
|
412d143578
|
*Code bug
|
2022-01-07 09:39:54 +08:00 |
|