Commit Graph
38570 Commits
Author SHA1 Message Date
孙广明 69d9ffe9ae Merge branch 'task_sunjun_53672' into 'master'
*task_sunjun_53672

See merge request easycorp/zentaopms!3300
2022-05-10 08:28:14 +00:00
sunjun 6abe1812a0 task_sunjun_53672 2022-05-10 08:23:33 +00:00
孙广明 9d8f4b4f21 Merge branch 'task_sunjun_53665' into 'master'
sprint_sunjun_53665

See merge request easycorp/zentaopms!3306
2022-05-10 08:23:21 +00:00
sunjun 0a23be8a5b task_sunjun_53672 2022-05-10 08:22:25 +00:00
sunjun bf1f9172ff tasj_sunjun_53665 2022-05-10 08:15:50 +00:00
sunjun 57b5a8a1c5 task_sunjun_53672 2022-05-10 08:13:05 +00:00
唐胡成 82652aca0c Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 07:49:43 +00:00
朱金勇 e431b802f4 Merge branch 'zentaocloud/dingguodong' into 'master'
* Add codes for saas extension.

See merge request easycorp/zentaopms!3303
2022-05-10 07:44:31 +00:00
李玉春 25a2285ccc Merge branch 'sprint_sunjun_53654' into 'master'
Sprint sunjun 53654

See merge request easycorp/zentaopms!3308
2022-05-10 07:43:55 +00:00
sunjun 14b9350a1c sprint_sunjun_53654 2022-05-10 07:40:57 +00:00
sunjun d88c1310b6 sprint_sunjun_53654 2022-05-10 07:37:12 +00:00
liumengyi c5ee9d9873 * Finish task #53663. 2022-05-10 15:35:32 +08:00
lanzongjun 1b5b443174 * fix task #53591 2022-05-10 15:28:18 +08:00
unknown bd25917679 Add gitlab-ci and sonar properties files for ci 2022-05-10 15:17:21 +08:00
sunjun 631601a39b sprint_sunjun_53665 2022-05-10 06:42:34 +00:00
tanghucheng fe927b1e5e * Finish task #53593. 2022-05-10 06:27:22 +00:00
tianshujie 4e2de99018 * Stages of updating trunk stories. 2022-05-10 14:25:01 +08:00
王怡栋 e7ae63a1a0 Merge branch 'sprint/daitingting_buildoperatemenu_product' into 'master'
* Build operate menu for product.

See merge request easycorp/zentaopms!3304
2022-05-10 05:58:27 +00:00
wangyidong c9bc2ba86f * code for task #53592. 2022-05-10 13:48:37 +08:00
daitingting deb8d170a7 * Build operate menu for product. 2022-05-10 05:44:25 +00:00
dingguodong 39b77f36b6 * Add codes for saas extension. 2022-05-10 13:24:06 +08:00
tanghucheng 528fa45357 * Fix bug. 2022-05-10 05:13:35 +00:00
王怡栋 a5ca2e65eb Merge branch 'tanghucheng_autotest' into 'master'
* Finish mail test.

See merge request easycorp/zentaopms!3291
2022-05-10 05:00:57 +00:00
tianshujie 5c00aa823c * Modify language item error. 2022-05-10 11:24:17 +08:00
tianshujie 896e36c90c * Finish task #53667. 2022-05-10 10:50:02 +08: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
tianshujie c3fdb74a24 * Finish task #53668. 2022-05-10 10:12:48 +08: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
sunjun 84ad06f3ec *task_sunjun_53672 2022-05-10 01:37:07 +00:00
zhouxudong 4bb2ff1862 * Finish task #53670. 2022-05-10 01:34:01 +00: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