 朱金勇
|
cb7ca052b3
|
Merge branch 'autotest_ly' into 'master'
add docmodule data
See merge request easycorp/zentaopms!2943
|
2022-04-14 06:56:59 +00:00 |
|
|
liyang
|
7e340396dc
|
add docmodule data
|
2022-04-14 14:55:35 +08:00 |
|
|
朱金勇
|
8953c9f547
|
Merge branch 'devops26_52592' into 'master'
Fix bug#17082,17990
See merge request easycorp/zentaopms!2940
|
2022-04-14 06:52:23 +00:00 |
|
|
朱金勇
|
e63ab95fe5
|
Merge branch 'sprint/renying_bug17274' into 'master'
Fix bug#17274
See merge request easycorp/zentaopms!2941
|
2022-04-14 06:45:01 +00:00 |
|
|
朱金勇
|
89a17c72f0
|
Merge branch 'fixbug_wangxiaomeng' into 'master'
Aborting commit due to empty commit message
See merge request easycorp/zentaopms!2934
|
2022-04-14 06:43:53 +00:00 |
|
|
孙广明
|
508f3e2a2c
|
Merge branch 'fixbugs_zhouxin_21637' into 'master'
* Fix bug #21637.
See merge request easycorp/zentaopms!2938
|
2022-04-14 06:41:04 +00:00 |
|
|
renying
|
d219dac730
|
Fix bug#17274
|
2022-04-14 14:37:10 +08:00 |
|
|
zenggang
|
6908956c24
|
* Fix bug#17082,17990
|
2022-04-14 06:28:31 +00:00 |
|
|
孙广明
|
b2907d1cef
|
Merge branch 'fixbug_sunjun_21582' into 'master'
*Fixbug_sunjun_21582
See merge request easycorp/zentaopms!2937
|
2022-04-14 06:04:34 +00:00 |
|
|
zhouxin
|
f1c7bd99e7
|
* Fix bug #21637.
|
2022-04-14 06:02:13 +00:00 |
|
|
sunjun
|
5c53d4a159
|
*Fixbug_sunjun_21582
|
2022-04-14 13:59:53 +08:00 |
|
|
wangxiaomeng
|
b085ec1029
|
Aborting commit due to empty commit message
|
2022-04-14 13:56:03 +08:00 |
|
|
wangxiaomeng
|
dee641a3b6
|
Aborting commit due to empty commit message
|
2022-04-14 13:21:41 +08:00 |
|
|
zhujinyong
|
d2fd124cb9
|
* Fix url of file.
|
2022-04-14 12:58:20 +08:00 |
|
|
孙广明
|
123bad60f1
|
Merge branch 'fixbugs_zhouxin_18086' into 'master'
* Fix bug #18086.
See merge request easycorp/zentaopms!2932
|
2022-04-14 02:37:31 +00:00 |
|
|
孙广明
|
78d48831bb
|
Merge branch 'sunhuawei_bug_18295'
|
2022-04-14 10:37:02 +08:00 |
|
|
孙广明
|
38e842991c
|
Merge branch 'master' into 'sunhuawei_bug_18295'
# Conflicts:
# module/tree/lang/en.php
|
2022-04-14 02:36:40 +00:00 |
|
|
zhouxin
|
8961240c28
|
* Fix bug #18086.
|
2022-04-14 02:33:25 +00:00 |
|
|
孙华伟
|
d5f6c531d9
|
*An error has been reported on other pages.
|
2022-04-14 10:32:28 +08:00 |
|
|
王怡栋
|
a56b295aa7
|
Merge branch 'sprint/fixbug_hufangzhou_21708' into 'master'
* Fix bug #21708.
See merge request easycorp/zentaopms!2928
|
2022-04-14 02:24:13 +00:00 |
|
|
王怡栋
|
21d5d53603
|
Merge branch 'sprint/fixbug_hufangzhou_20174' into 'master'
* Fix bug #20174.
See merge request easycorp/zentaopms!2927
|
2022-04-14 02:23:49 +00:00 |
|
|
王怡栋
|
e70d494cbe
|
Merge branch 'sprint/master_zhouxudong_12358' into 'master'
* Fix bug #12358.
See merge request easycorp/zentaopms!2929
|
2022-04-14 02:22:53 +00:00 |
|
|
朱金勇
|
fcb09f3afe
|
Merge branch 'sprint/scx_file' into 'master'
* Fix json_decode twice image data(url) not found.
See merge request easycorp/zentaopms!2926
|
2022-04-14 02:17:25 +00:00 |
|
|
hufangzhou
|
6b4822862d
|
* Fix bug #21708.
|
2022-04-14 10:14:49 +08:00 |
|
|
zhouxudong
|
95f8bfa4ee
|
* Fix bug #12358.
|
2022-04-14 10:13:56 +08:00 |
|
|
朱金勇
|
bdf2552afd
|
Merge branch 'zry_app' into 'master'
* Add api for record estimate for bug.
See merge request easycorp/zentaopms!2906
|
2022-04-14 02:05:08 +00:00 |
|
|
hufangzhou
|
b79247398e
|
* Fix bug #20174.
|
2022-04-14 10:04:48 +08:00 |
|
|
王怡栋
|
90f8ad4b90
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-04-14 10:02:14 +08:00 |
|
|
王怡栋
|
c662476270
|
* add index for zt_stakeholder table.
|
2022-04-14 10:01:46 +08:00 |
|
|
songchenxuan
|
7de520a748
|
* Fix json_decode twice image data(url) not found.
|
2022-04-14 09:18:12 +08:00 |
|
|
王怡栋
|
fb5f45f7a3
|
Merge branch 'sunhuawei_bug_18295' into 'master'
Sunhuawei bug 18295
See merge request easycorp/zentaopms!2925
|
2022-04-14 00:42:31 +00:00 |
|
|
孙华伟
|
37c8352c47
|
Update control.php
|
2022-04-14 00:39:40 +00:00 |
|
|
孙华伟
|
a3ac51ed0d
|
Update en.php
|
2022-04-14 00:38:55 +00:00 |
|
|
孙华伟
|
93beba2f03
|
*Fix bug#18295.
|
2022-04-14 08:32:47 +08:00 |
|
|
朱金勇
|
113bfe07a9
|
Merge branch 'sprint/sunhao/bug15650' into 'master'
* bug #15650, fix modal close button not show after reload modal with inner modal.
See merge request easycorp/zentaopms!2921
|
2022-04-13 16:14:57 +00:00 |
|
|
李玉春
|
50e153d0df
|
Merge branch 'devops26_52602' into 'master'
Fix bug#15760，12963
See merge request easycorp/zentaopms!2910
|
2022-04-13 09:36:30 +00:00 |
|
|
孙广明
|
486f7a35ce
|
Merge branch 'sprint/unitTest_liumengyi_tree' into 'master'
* Add unit test of tree.
See merge request easycorp/zentaopms!2924
|
2022-04-13 09:08:09 +00:00 |
|
|
liumengyi
|
4157e3dea4
|
* Add unit test of tree.
|
2022-04-13 17:06:05 +08:00 |
|
|
王怡栋
|
4cd6cfc35b
|
Merge branch 'sprint/fixbug_hufangzhou_action' into 'master'
* Modify the product field type of zt_action and zt_effort because the current...
See merge request easycorp/zentaopms!2923
|
2022-04-13 09:04:23 +00:00 |
|
|
hufangzhou
|
80df716a0a
|
* Modify the product field type of zt_action and zt_effort because the current length is not enough.
|
2022-04-13 16:46:55 +08:00 |
|
|
zhengrunyu
|
7643aa1122
|
* Fix api.
|
2022-04-13 16:28:47 +08:00 |
|
|
孙广明
|
ec238a9b4e
|
Merge branch 'master_xieqiyu_20006' into 'master'
* Fix bug#20006.
See merge request easycorp/zentaopms!2917
|
2022-04-13 08:22:44 +00:00 |
|
|
孙广明
|
96aac66684
|
Merge branch 'master_xieqiyu_13127' into 'master'
* Fix bug#13127.
See merge request easycorp/zentaopms!2914
|
2022-04-13 08:22:07 +00:00 |
|
|
孙广明
|
ec3d957536
|
Merge branch 'master_xieqiyu_21382' into 'master'
* Fix bug#21382.
See merge request easycorp/zentaopms!2911
|
2022-04-13 08:21:38 +00:00 |
|
|
王怡栋
|
97f9ee3297
|
Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.
See merge request easycorp/zentaopms!2922
|
2022-04-13 08:05:44 +00:00 |
|
|
zhouxin
|
6e6deaa462
|
* Fix bug #21374.
|
2022-04-13 07:59:57 +00:00 |
|
|
Hao Sun
|
731ea83892
|
* bug #15650, fix modal close button not show after reload modal with inner modal.
|
2022-04-13 15:56:19 +08:00 |
|
|
王怡栋
|
fb96e23a7f
|
Merge branch 'sprint/master_zhouxudong_14189' into 'master'
* Fix bug #14189.
See merge request easycorp/zentaopms!2919
|
2022-04-13 07:53:28 +00:00 |
|
|
王怡栋
|
a08989d11a
|
Merge branch 'sprint/master_zhouxudong_17994'
|
2022-04-13 15:52:50 +08:00 |
|
|
王怡栋
|
a8983445c8
|
Merge branch 'master' into 'sprint/master_zhouxudong_17994'
# Conflicts:
# module/bug/model.php
# module/task/model.php
|
2022-04-13 07:52:03 +00:00 |
|