Commit Graph
38442 Commits
Author SHA1 Message Date
liyang cc16632e02 update zt_config sql 2022-05-10 08:49:22 +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
孙广明 d6aec08e02 Merge branch 'autotest_renying' into 'master'
setting module auto test.

See merge request easycorp/zentaopms!3274
2022-05-07 07:51:35 +00:00
孙广明 7b304b2137 Merge branch 'liyuchun_unittest' into 'master'
* Add unit case.

See merge request easycorp/zentaopms!3285
2022-05-07 07:51:13 +00:00
孙广明 98652c6d3e Merge branch 'autotest_ly' into 'master'
Add doc test

See merge request easycorp/zentaopms!3284
2022-05-07 07:50:52 +00:00
孙广明 70ac965046 Merge branch 'sunhuawei_test_group' into 'master'
Sunhuawei test group

See merge request easycorp/zentaopms!3277
2022-05-07 07:50:32 +00:00
孙广明 35b844d440 Merge branch 'test_sunjun3' 2022-05-07 15:50:06 +08:00
孙广明 9ca22a3add Merge branch 'master' into 'test_sunjun3'
# Conflicts:
#   test/ztest
2022-05-07 07:49:37 +00:00
孙华伟 1132e1b7ed *Delete sort. 2022-05-07 15:49:28 +08:00
孙广明 9b71e80d5e Merge branch 'testcase_zhouxin_1' 2022-05-07 15:36:24 +08:00
liyuchun e2d43c69a6 * Add unit case. 2022-05-07 07:36:05 +00:00
孙广明 0227b5868f Merge branch 'master' into 'testcase_zhouxin_1'
# Conflicts:
#   test/class/holiday.class.php
2022-05-07 07:35:48 +00:00
sunjun 4589db41d3 test_sunjun3 2022-05-07 07:34:35 +00:00
liyang b4c3b1b530 Add doc test 2022-05-07 15:33:58 +08:00
sunjun f12a763ce0 test_sunjun3 2022-05-07 07:32:43 +00:00
zhouxin 400ca9e1f6 * Add testcase. 2022-05-07 07:32:42 +00:00
wangyidong 4459c89c4b Merge branch 'sprint/master_lanzongjun_unit_test2' 2022-05-07 15:25:48 +08:00
王怡栋 efbdc30518 Merge branch 'master' into 'sprint/master_lanzongjun_unit_test2'
# Conflicts:
#   test/ztest
2022-05-07 07:25:30 +00:00
lanzongjun f7891a08a3 * unit test entry 2022-05-07 15:23:33 +08:00
孙华伟 a4055782af *Optimize the code. 2022-05-07 15:23:23 +08:00
李玉春 623b2e4bf5 Merge branch 'sprint/tianshujie_case_doc' into 'master'
* Add test case for doc.

See merge request easycorp/zentaopms!3280
2022-05-07 07:10:25 +00:00
tianshujie 7784f07677 * Add test case for doc. 2022-05-07 15:07:56 +08:00
王怡栋 274c0443f8 Merge branch 'sgm_fixbug' into 'master'
* Rename var.

See merge request easycorp/zentaopms!3276
2022-05-07 07:05:31 +00:00
wangyidong e17cc3017c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-07 15:00:57 +08:00
孙广明 c414a6134c Merge branch 'datatable_unit' into 'master'
Datatable unit

See merge request easycorp/zentaopms!3279
2022-05-07 07:00:46 +00:00
wangyidong 54b4369059 Merge branch 'fixbug' 2022-05-07 15:00:43 +08:00
wangyidong c82550c55c * Finish jenkins test. 2022-05-07 15:00:13 +08:00
王怡栋 06195b0140 Merge branch 'master' into 'fixbug'
# Conflicts:
#   test/ztest
2022-05-07 06:59:57 +00:00
zenggang 9303994da9 * Adjust code 2022-05-07 06:54:18 +00:00
孙华伟 14d52167c9 *Add comments. 2022-05-07 14:53:18 +08:00
zenggang 05a8756da5 * Datatable unit 2022-05-07 06:51:54 +00:00
李玉春 da30abfa77 Merge branch 'sprint/unitTest_liumengyi_doc' into 'master'
* Add unit test of doc.

See merge request easycorp/zentaopms!3278
2022-05-07 06:46:31 +00:00
liumengyi 1bb079b8f3 * Add unit test of doc. 2022-05-07 14:44:27 +08:00
孙华伟 e13a5d02e8 *Test getuserprograms. 2022-05-07 14:32:33 +08:00
李玉春 5a0d28b484 Merge branch 'sprint/unitTest_liumengyi_doc' into 'master'
* Add unit test of doc.

See merge request easycorp/zentaopms!3275
2022-05-07 05:52:00 +00:00
孙广明 305a4074e4 * Rename var. 2022-05-07 13:50:02 +08:00
liumengyi 02a9f4831b * Add unit test of doc. 2022-05-07 13:44:57 +08:00
李玉春 139ea593c2 Merge branch 'sprint/tianshujie_case_setting' into 'master'
* Add a test case for the setting module.

See merge request easycorp/zentaopms!3273
2022-05-07 05:31:18 +00:00
tianshujie 5d4ffe230a * Edit comments. 2022-05-07 13:28:29 +08:00
renying cfd2f78265 setting module auto test. 2022-05-07 13:27:19 +08:00
tianshujie d9a9b4c978 * Add a test case for the setting module. 2022-05-07 13:22:22 +08:00
孙华伟 f75b4147be *Test getUserPairs. 2022-05-07 13:14:00 +08:00
孙广明 7d9bf18449 Merge branch 'autotest_ly' into 'master'
Update doc data

See merge request easycorp/zentaopms!3272
2022-05-07 05:08:39 +00:00
liyang 93fc51fa9a Update doc data 2022-05-07 13:07:28 +08:00
lanzongjun 6e71332b6a * unit test entry 2022-05-07 11:26:53 +08:00
lanzongjun 5670696961 * unit test entry 2022-05-07 11:22:26 +08:00
孙华伟 abeafaa536 *Test getPrivs. 2022-05-07 11:05:09 +08:00
孙广明 b94b3a0866 Merge branch 'sprint/unitTest_liumengyi_file' into 'master'
* Add unit test of file.

See merge request easycorp/zentaopms!3269
2022-05-07 03:00:10 +00:00
孙广明 da672cb682 Merge branch 'sprint/master_zhouxudong_tutoria' into 'master'
Sprint/master zhouxudong tutoria

See merge request easycorp/zentaopms!3268
2022-05-07 02:58:57 +00:00