Commit Graph
38416 Commits
Author SHA1 Message Date
孙广明 9b71e80d5e Merge branch 'testcase_zhouxin_1' 2022-05-07 15:36:24 +08:00
孙广明 0227b5868f Merge branch 'master' into 'testcase_zhouxin_1'
# Conflicts:
#   test/class/holiday.class.php
2022-05-07 07:35:48 +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
李玉春 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
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
李玉春 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
tianshujie d9a9b4c978 * Add a test case for the setting module. 2022-05-07 13:22:22 +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
孙广明 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
liumengyi 87e4148d22 * Add unit test of file. 2022-05-07 10:58:07 +08:00
zhouxudong db997a1fb0 * Add tutorial auto test. 2022-05-07 02:54:01 +00:00
liyuchun 40f9664724 Merge branch 'cyy_test' 2022-05-07 02:53:34 +00:00
李玉春 45586621ac Merge branch 'master' into 'cyy_test'
# Conflicts:
#   test/ztest
2022-05-07 02:52:56 +00:00
李玉春 b39ee89055 Merge branch 'autotest_wangxiaomeng' into 'master'
weekly unit tests

See merge request easycorp/zentaopms!3266
2022-05-07 02:50:18 +00:00
wangxiaomeng 80fea70b03 edit weekly 2022-05-07 10:42:49 +08:00
tanghucheng ba65954555 * Fix bug. 2022-05-07 10:42:34 +08:00
zhouxudong b482db69c8 * Add tutorial auto test. 2022-05-07 02:41:12 +00:00
tanghucheng 11a6f3353c * Fix bug. 2022-05-07 10:32:27 +08:00
caoyanyi d27114d98d * Remove bind func. 2022-05-07 10:32:17 +08:00
zhouxudong 84f9b06602 * Add tutorial auto test. 2022-05-07 02:31:57 +00:00
wangxiaomeng 10020ed142 edit weekly 2022-05-07 10:31:54 +08:00
caoyanyi 31944ec84f * Add sso test case. 2022-05-07 10:31:14 +08:00
孙广明 945393bfde Merge branch 'autotest_ly' into 'master'
Add notify data

See merge request easycorp/zentaopms!3265
2022-05-07 02:27:19 +00:00
liyang a667418b50 Add notify data 2022-05-07 10:26:34 +08:00
wangxiaomeng 2dea32e6be edit weekly 2022-05-07 10:25:48 +08:00
wangxiaomeng 319ec152a2 edit weekly 2022-05-07 10:18:27 +08:00
孙广明 647208c827 Merge branch 'autotest_ly' into 'master'
Add data

See merge request easycorp/zentaopms!3264
2022-05-07 02:13:53 +00:00
liyang 7eddd0aad5 Add data 2022-05-07 10:12:34 +08:00
孙广明 7e04ce3fb7 Merge branch 'test_sunjun1' into 'master'
test_sunjun1

See merge request easycorp/zentaopms!3263
2022-05-07 02:03:15 +00:00