Commit Graph
38493 Commits
Author SHA1 Message Date
王怡栋 a5ca2e65eb Merge branch 'tanghucheng_autotest' into 'master'
* Finish mail test.

See merge request easycorp/zentaopms!3291
2022-05-10 05:00:57 +00:00
孙广明 25462a5568 Merge branch 'sprint/unittest_liumengyi' into 'master'
* Add getprojectteamparams.

See merge request easycorp/zentaopms!3301
2022-05-10 02:41:33 +00:00
王怡栋 418a4580bb Merge branch 'branch/workflow' into 'master'
Branch/workflow

See merge request easycorp/zentaopms!3302
2022-05-10 02:27:35 +00:00
daitingting a71cf1d280 Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow 2022-05-10 01:44:47 +00:00
liumengyi f6f174df49 * Add getprojectteamparams. 2022-05-10 09:42:00 +08:00
孙广明 5ddd054b28 Merge branch 'sunjun_test_block' into 'master'
sunjun_test_block

See merge request easycorp/zentaopms!3290
2022-05-10 01:03:40 +00:00
孙广明 105049a77f Merge branch 'dht_Webhook' into 'master'
add webhook unittest

See merge request easycorp/zentaopms!3293
2022-05-10 00:53:21 +00:00
孙广明 e77bf04a1c Merge branch 'autotest_ly' into 'master'
update zt_config sql

See merge request easycorp/zentaopms!3299
2022-05-10 00:52:26 +00:00
liyang cc16632e02 update zt_config sql 2022-05-10 08:49:22 +08:00
孙广明 a9ec693815 Merge branch 'mayue_autotest' into 'master'
* Add atuo test cases.

See merge request easycorp/zentaopms!3298
2022-05-10 00:46:39 +00:00
mayue 0fab0242cf * Add atuo test cases. 2022-05-10 00:43:25 +00:00
孙广明 a75d008158 Merge branch 'dev_unit' into 'master'
Dev unit

See merge request easycorp/zentaopms!3288
2022-05-10 00:39:54 +00:00
孙广明 d609a2568d Merge branch 'sprint/189_zhouxudong_53650' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3297
2022-05-10 00:39:25 +00:00
zhouxudong a5fe4b5387 * Fix bug. 2022-05-10 00:37:24 +00:00
王怡栋 5090da4280 Merge branch 'branch/workflow' into 'master'
#Do task # 53548 and task #53550.

See merge request easycorp/zentaopms!3296
2022-05-09 09:20:05 +00:00
wangyuting2 dceb7ba183 * Optimize code. 2022-05-09 17:09:24 +08:00
唐胡成 5abbb45b15 Update mail.class.php 2022-05-09 09:08:30 +00:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2 a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00
王怡栋 59e1a3e57e Merge branch 'sprint/master_lanzongjun_unit_test2' into 'master'
finish unit test job

See merge request easycorp/zentaopms!3294
2022-05-09 08:37:05 +00:00
wangyuting2 103f3a21c6 * Adjust return value. 2022-05-09 16:18:12 +08:00
wangyuting2 19631c8b97 * Adjust return. 2022-05-09 16:14:53 +08:00
lanzongjun 87164335b8 * delete unit test job 2022-05-09 16:12:46 +08:00
wangyuting2 e86f32df24 * Adjust feedback menu. 2022-05-09 15:58:02 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
wangyuting2 73dce33bc3 * Adjust bug action menu. 2022-05-09 13:49:02 +08:00
wangyuting2 91366891f4 * Adjust bug action menu. 2022-05-09 13:46:59 +08:00
lanzongjun 0405e1de21 * unit test job 2022-05-09 13:39:08 +08:00
wangyuting2 219eb1060e * Fix bug. 2022-05-09 13:38:21 +08:00
李玉春 1ad3357c4f Merge branch 'sprint/tianshujie_case_block' into 'master'
* Add case of block model.

See merge request easycorp/zentaopms!3289
2022-05-09 05:03:31 +00:00
李玉春 bc3973b2fa Merge branch 'cyy_22212' into 'master'
* Fix bug #22212.

See merge request easycorp/zentaopms!3286
2022-05-09 05:03:11 +00:00
lanzongjun 920236775e * unit test job 2022-05-09 11:34:02 +08:00
lanzongjun 7c00db4f84 * unit test job 2022-05-09 11:32:38 +08:00
wangyuting2 cc57fc819a * Add buildOperateMenu for bug module. 2022-05-09 11:16:14 +08:00
李玉春 da8d15ce52 Merge branch 'sprint/scx_feedbackView' into 'master'
* Fix feedback adminView bug .

See merge request easycorp/zentaopms!3292
2022-05-09 02:47:59 +00:00
宋辰轩 9248c49b0e * Fix feedback adminView bug . 2022-05-09 10:41:54 +08:00
denghongtao 9931ec474a add webhook unittest 2022-05-09 10:39:04 +08:00
tanghucheng 49d4cbfa0e * Fix code format. 2022-05-09 10:01:51 +08:00
tanghucheng fee3c6e0df * Finish mail test. 2022-05-09 09:55:39 +08:00
wangyuting2 45ae4de775 * Do task 53548. 2022-05-09 09:20:01 +08:00
sunjun 540f6aba4e sunjun_test_block 2022-05-09 00:56:40 +00:00
tianshujie 2e18f078aa * Add case of block model. 2022-05-09 08:44:29 +08:00
tanghucheng 60877100ee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_autotest 2022-05-09 08:40:54 +08:00
李玉春 4596c69ae1 Merge branch 'autotest_doc_wangxiaomeng' into 'master'
edit doc

See merge request easycorp/zentaopms!3281
2022-05-09 00:31:19 +00:00
wangxiaomeng 5ba4a8bc7d edit doc 2022-05-09 08:30:45 +08:00
zenggang 3447fa6237 * Dev unit 2022-05-07 09:43:25 +00:00
tanghucheng 809ce93037 * Code for mail test. 2022-05-07 17:27:37 +08:00
孙广明 81e71b0cb0 Merge branch 'mayue_autotest' into 'master'
* Add block module.

See merge request easycorp/zentaopms!3287
2022-05-07 08:05:34 +00:00
mayue cfe5f33ff3 * Add block module. 2022-05-07 08:00:37 +00:00