Commit Graph
35429 Commits
Author SHA1 Message Date
孙广明 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
liumengyi 50d2efa3c0 * Add auto test of bug. 2022-03-18 10:42:36 +08:00
孙广明 8b3c1af81d Merge branch 'autotest_ly' into 'master'
add storyspec data

See merge request easycorp/zentaopms!2360
2022-03-18 02:41:54 +00:00
liyang 18d174d62d add storyspec data 2022-03-18 10:38:59 +08:00
王怡栋 f9b078f056 Merge branch 'sprint/master_lanzongjun_fixbug_lite' 2022-03-18 10:16:02 +08:00
王怡栋 b7ffb3134b Merge branch 'master' into 'sprint/master_lanzongjun_fixbug_lite'
# Conflicts:
#   extension/lite/install/ext/lang/zh-cn/lite.php
2022-03-18 02:15:23 +00:00
Zongjun Lan 2af12a5c0d * fix bug #20905 2022-03-18 10:12:06 +08:00
Zongjun Lan 4c8a7a3eae * fix bug #20905 2022-03-18 10:11:22 +08:00
Zongjun Lan 2435d84cdc * fix bug #20905 2022-03-18 10:06:04 +08:00
王怡栋 24442be3c5 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19287(biz)

See merge request easycorp/zentaopms!2357
2022-03-18 01:58:27 +00:00
王怡栋 897ae6e1b2 Merge branch 'sprint/master_lanzongjun_fixbug_nopermission' into 'master'
* fix bug no permisssion

See merge request easycorp/zentaopms!2347
2022-03-18 01:51:46 +00:00
王怡栋 7216dbd7c9 Merge branch 'sprint/master_tanghucheng_install' into 'master'
* Adjust for lite install.

See merge request easycorp/zentaopms!2354
2022-03-18 01:51:05 +00:00
王怡栋 7638020fad Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-18 09:49:48 +08:00
王怡栋 b3cca161cc * adjust for install page in lite. 2022-03-18 09:49:05 +08:00
Zongjun Lan 9a53b1d0fe * fix bug #20905 2022-03-18 09:39:52 +08:00
朱金勇 4f2780027d Merge branch 'sgm_usercase' into 'master'
Sgm usercase

See merge request easycorp/zentaopms!2355
2022-03-18 01:24:42 +00:00
孙广明 19d86da89f Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #20712,20800.

See merge request easycorp/zentaopms!2313
2022-03-18 01:21:20 +00:00
tanghucheng ec5f6244dd * Fix bug #20906. 2022-03-18 09:18:34 +08:00
sgm0422 cebc26863a * Remove unused code. 2022-03-18 09:16:55 +08:00
sgm0422 9e53d5bbf8 * Finish user auto test. 2022-03-18 09:14:11 +08:00
tanghucheng 99a61f79ee * Adjust for lite install. 2022-03-18 09:00:32 +08:00
Zongjun Lan 3fefbe3699 * fix bug no permisssion 2022-03-17 17:32:55 +08:00
sgm0422 ab5db10f05 * Add user auto test. 2022-03-17 17:30:47 +08:00
李玉春 f6e47fb1ce Merge branch 'tianshujie_upgrade' into 'master'
* Delete useless files when upgrading.

See merge request easycorp/zentaopms!2353
2022-03-17 09:25:12 +00:00
孙广明 2d13ee0616 Merge branch 'autotest_ly' into 'master'
add doclib data

See merge request easycorp/zentaopms!2352
2022-03-17 09:23:59 +00:00
tianshujie 8089de48b7 * Delete useless files when upgrading. 2022-03-17 17:23:16 +08:00
liyang dff861e2d1 add doclib data 2022-03-17 17:20:09 +08:00
Zongjun Lan 15cb78764d * fix bug no permisssion 2022-03-17 17:18:00 +08:00
Zongjun Lan 59840351e3 * fix bug no permisssion 2022-03-17 17:17:22 +08:00
孙广明 4b68b7c78c Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2350
2022-03-17 09:13:33 +00:00
liumengyi bb361baa6e * Add function annotation. 2022-03-17 17:12:08 +08:00
liumengyi 7e85558c74 * Add auto test of bug. 2022-03-17 17:10:55 +08:00
Zongjun Lan ff2d0cc99f * fix bug no permisssion 2022-03-17 16:44:22 +08:00
朱金勇 04b88a9e49 Merge branch 'tianshujie_upgrade' into 'master'
* Fix bug of ext files.

See merge request easycorp/zentaopms!2346
2022-03-17 08:43:08 +00:00
tianshujie 4d7112b9b7 * Fix bug of ext files. 2022-03-17 16:41:29 +08:00
Zongjun Lan ad622ccb02 * fix bug #t 2022-03-17 15:58:35 +08:00
孙广明 60fa02e648 Merge branch 'autotest_ly' into 'master'
rm surplus data

See merge request easycorp/zentaopms!2338
2022-03-17 06:06:46 +00:00
liyang 33f827522e rm surplus data 2022-03-17 14:03:05 +08:00
朱金勇 daeedd520b Merge branch 'sgm_usercase' into 'master'
* Add user test unit.

See merge request easycorp/zentaopms!2332
2022-03-17 06:01:12 +00:00
孙广明 ee15271a2f Merge branch 'autotest_ly' into 'master'
rm move.sh and runtime.zip

See merge request easycorp/zentaopms!2335
2022-03-17 05:58:27 +00:00
liyang 53e1f051bb rm move.sh and runtime.zip 2022-03-17 13:55:51 +08:00
sgm0422 44395a2ef5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sgm_usercase 2022-03-17 13:52:05 +08:00
孙广明 a253bc2246 Merge branch 'autotest_ly' into 'master'
update bug story data

See merge request easycorp/zentaopms!2333
2022-03-17 05:47:09 +00:00
liyang 6f7a1d32d4 update bug story data 2022-03-17 13:44:39 +08:00
sgm0422 bcc2100a0a * Add user test unit. 2022-03-17 13:40:02 +08:00
孙广明 d4105656d1 Merge branch 'autotest_ly' into 'master'
Autotest ly

See merge request easycorp/zentaopms!2329
2022-03-17 05:27:55 +00:00
孙广明 808ca1ee66 Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Add auto test of bug.

See merge request easycorp/zentaopms!2330
2022-03-17 05:27:17 +00:00
liyang 88af905a7a update executon class 2022-03-17 13:25:09 +08:00