Commit Graph

35511 Commits

Author SHA1 Message Date
Hao Sun
83b20464e6 * Fix paste image from dingding not work @mayue. 2022-03-21 17:21:20 +08:00
孙广明
9995d4c68d Merge branch 'fixbug' into 'master'
* Fix bug for upgrade.

See merge request easycorp/zentaopms!2400
2022-03-21 08:13:34 +00:00
孙广明
b7ccaaec25 Update model.php 2022-03-21 08:13:24 +00:00
tanghucheng
3bda7c38aa * Fix bug for upgrade. 2022-03-21 16:07:03 +08:00
zhujinyong
f5d5f89ec2 - Remove exit. 2022-03-21 15:02:28 +08:00
zhujinyong
46f8103c26 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-21 14:54:48 +08:00
zhujinyong
56bb77baa9 * Batch create tasks. 2022-03-21 14:54:03 +08:00
孙广明
c44da998c0 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2393
2022-03-21 06:30:44 +00:00
liumengyi
441200128a * Add auto test of bug. 2022-03-21 14:29:19 +08:00
zhujinyong
8432f93094 Merge branch 'Zentao_app1.1' 2022-03-21 14:13:05 +08:00
朱金勇
ec7c5022c8 Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
#   module/execution/control.php
2022-03-21 06:12:21 +00:00
孙广明
913b58bc06 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2390
2022-03-21 03:46:44 +00:00
liumengyi
6be1d05479 * Add auto test of bug. 2022-03-21 11:44:41 +08:00
zhujinyong
c131cb891f * Fix data of testtask api. 2022-03-21 09:58:20 +08:00
zhujinyong
d96d58ef0d * Fix params of testresults. 2022-03-21 09:28:13 +08:00
zhujinyong
79deb1dd03 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-21 09:20:31 +08:00
zhujinyong
65412bb5b5 + Add testresult. 2022-03-21 09:20:18 +08:00
孙广明
73e6d617ef Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Modify code.

See merge request easycorp/zentaopms!2383
2022-03-21 00:29:00 +00:00
zhujinyong
9fcb03b0fd + Add api of tetsuite. 2022-03-21 08:25:20 +08:00
liumengyi
dfb6c1361e * Modify code. 2022-03-21 08:12:51 +08:00
朱金勇
7caeb0bde9 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2381
2022-03-18 09:20:17 +00:00
liumengyi
285cef0a64 * Add auto test of bug. 2022-03-18 17:18:49 +08:00
朱金勇
97f1e1f68d Merge branch 'sgm_storytest' into 'master'
* Add story auto test.

See merge request easycorp/zentaopms!2378
2022-03-18 09:13:26 +00:00
sgm0422
f3041476c3 * Add story auto test. 2022-03-18 16:51:27 +08:00
孙广明
f2d235caef Merge branch 'autotest_ly' into 'master'
add company test

See merge request easycorp/zentaopms!2377
2022-03-18 07:59:17 +00:00
liyang
5151585496 add company test 2022-03-18 15:55:27 +08:00
王怡栋
01abf2d1c6 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2373
2022-03-18 06:59:17 +00:00
王怡栋
3a2774b102 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug#20897,20907.

See merge request easycorp/zentaopms!2359
2022-03-18 06:58:41 +00:00
唐胡成
8f7328c7b2 Update lite.php 2022-03-18 06:41:49 +00:00
唐胡成
ec401cf865 Update lite.php 2022-03-18 06:40:32 +00:00
唐胡成
26e52edd7c Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
#   extension/lite/kanban/ext/lang/en/lite.php
#   extension/lite/kanban/ext/lang/zh-cn/lite.php
2022-03-18 06:36:42 +00:00
tanghucheng
ad7b6144f9 * Fix bug. 2022-03-18 14:35:02 +08:00
tanghucheng
bbec29d361 * Fix bug. 2022-03-18 14:30:34 +08:00
songchenxuan
84a7e1ad4c *PUT->POST. 2022-03-18 14:14:10 +08:00
朱金勇
65306e362a Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'master'
Sprint/master lanzongjun fixbug lite

See merge request easycorp/zentaopms!2370
2022-03-18 05:35:36 +00:00
Zongjun Lan
4f658421dc * add en lang 2022-03-18 13:32:22 +08:00
孙广明
daf8a4143a Merge branch 'autotest_denghongtao' into 'master'
add misc and productplan

See merge request easycorp/zentaopms!2366
2022-03-18 05:15:40 +00:00
zhengrunyu
96f9a08196 *Add api for child story. 2022-03-18 13:15:31 +08:00
孙广明
21d6c27a4b Update getlist.php 2022-03-18 05:15:30 +00:00
孙广明
071c930bec Update getbyidlist.php 2022-03-18 05:15:13 +00:00
王怡栋
f00fe19d41 Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'master'
* fix bug #20922

See merge request easycorp/zentaopms!2362
zentaopms_16.5.beta1
2022-03-18 04:12:25 +00:00
denghongtao
c9904a1eae change getpairs.php.die; 2022-03-18 11:31:33 +08:00
denghongtao
15799d29aa add misc and productplan 2022-03-18 11:14:36 +08:00
Zongjun Lan
109c2606df Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug_lite 2022-03-18 11:10:36 +08:00
孙广明
90159bc2b0 Merge branch 'autotest_ly' into 'master'
update product plan

See merge request easycorp/zentaopms!2364
2022-03-18 03:09:44 +00:00
liyang
a60760a52a update product plan 2022-03-18 11:07:01 +08:00
孙广明
6aa79b6007 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2361
2022-03-18 02:53:05 +00:00
Zongjun Lan
09cedab84e Merge branch 'sprint/master_lanzongjun_fixbug_lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug_lite 2022-03-18 10:51:07 +08:00
Zongjun Lan
b3bb1036b9 * fix bug #20922 2022-03-18 10:50:56 +08:00
liumengyi
50d2efa3c0 * Add auto test of bug. 2022-03-18 10:42:36 +08:00