Commit Graph
50357 Commits
Author SHA1 Message Date
tanghucheng a82e54a830 * Fix bug #31522. 2023-01-12 11:01:38 +08:00
tanghucheng f64ccc30d8 * Fix bug #31540. 2023-01-12 10:48:50 +08:00
tanghucheng 9383d497de Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-12 10:30:00 +08:00
孙广明 d46420846e Merge branch 'sprint/biz26_liumengyi_82412' into 'master'
* Add nav-steps component.

See merge request easycorp/zentaopms!6755
2023-01-12 00:59:37 +00:00
liumengyi 7b71ce60de * Add nav-steps component. 2023-01-12 08:30:04 +08:00
zhaoke f665030cb1 * Finish task #82697. 2023-01-11 09:46:57 +00:00
孙广明 f5605ff9b4 Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!6754
2023-01-11 09:08:22 +00:00
wangyidong a044694678 Merge branch 'sprint/hufangzhou_user_unit' 2023-01-11 17:02:51 +08:00
王怡栋 cac39118cb Merge branch 'master' into 'sprint/hufangzhou_user_unit'
# Conflicts:
#   test/class/user.class.php
2023-01-11 09:02:25 +00:00
王怡栋 64799a5082 Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6752
2023-01-11 09:00:10 +00:00
王怡栋 10ece401cc Merge branch 'sprint/hufangzhou_user_identifyby' into 'master'
* Add the identifybycookie and identifybyphpauth unit testcase.

See merge request easycorp/zentaopms!6750
2023-01-11 08:59:19 +00:00
王怡栋 7756949675 Merge branch 'sprint/hufangzhou_user_getparentstageauthedusers' into 'master'
* Modify the getparentstageauthedusers unit testcase.

See merge request easycorp/zentaopms!6748
2023-01-11 08:58:53 +00:00
王怡栋 499294685d Merge branch 'sprint/hufangzhou_user_getlistbyaccount' into 'master'
* Add the getlistbyaccount unit testcase.

See merge request easycorp/zentaopms!6747
2023-01-11 08:58:36 +00:00
王怡栋 b2f1b7aa00 Merge branch 'sprint/hufangzhou_user_getcontactlists' into 'master'
* Modify the getcontactlists unit testcase.

See merge request easycorp/zentaopms!6746
2023-01-11 08:58:06 +00:00
hufangzhou d7a6d70037 * Add the checklocked,failplus,islogon unit testcase. 2023-01-11 08:56:18 +00:00
xieqiyu 7e5bcb8182 * Fix bug#31478. 2023-01-11 16:46:54 +08:00
xieqiyu 9bd57aa0d4 * Fix bug#31581. 2023-01-11 15:59:30 +08:00
xieqiyu 03a227dbe6 * Fix bug#31506. 2023-01-11 15:47:47 +08:00
caoyanyi fbac16fba8 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 15:46:19 +08:00
caoyanyi d30e78f620 * Add test case. 2023-01-11 15:46:05 +08:00
田淑杰 256838497b * Add case of execution model. 2023-01-11 15:45:21 +08:00
caoyanyi cba5433ddc Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 15:07:13 +08:00
caoyanyi 789b63ec3f * Remove bak file. 2023-01-11 15:06:07 +08:00
田淑杰 a06c7b95ab * Add case of execution model. 2023-01-11 14:47:46 +08:00
田淑杰 fda9b8eee3 * Add case of execution model. 2023-01-11 14:40:01 +08:00
孙广明 243a877816 Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6749
2023-01-11 06:00:32 +00:00
caoyanyi 20286c89fc * Add test case. 2023-01-11 13:58:11 +08:00
caoyanyi a6f0888097 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 13:53:01 +08:00
caoyanyi 17ee65375b * Add test case. 2023-01-11 13:52:48 +08:00
田淑杰 70d0e8a429 * Add case of execution model. 2023-01-11 13:52:02 +08:00
caoyanyi 3c111ad9a0 * Update test case. 2023-01-11 13:45:16 +08:00
caoyanyi e10611ee23 * Update test case. 2023-01-11 13:27:31 +08:00
孙广明 0762cfa0ca Merge branch 'master_bug_30830' into 'master'
* Fix bug #30830.

See merge request easycorp/zentaopms!6735
2023-01-11 05:27:15 +00:00
hufangzhou eb7b151b4a * Add the identifybycookie and identifybyphpauth unit testcase. 2023-01-11 05:18:05 +00:00
caoyanyi 2aa5561d76 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 13:15:24 +08:00
caoyanyi c9da43ca51 * Update test case. 2023-01-11 13:15:08 +08:00
田淑杰 6f6112e798 * Add case of execution model. 2023-01-11 13:07:44 +08:00
caoyanyi ab4c20d17d Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 11:26:40 +08:00
caoyanyi f32a0ade07 * Update test case, 2023-01-11 11:26:28 +08:00
田淑杰 d3b11b51f9 * Add case of execution model. 2023-01-11 11:22:37 +08:00
caoyanyi 07e851c23c Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 11:00:43 +08:00
caoyanyi ed9d91089c * Update test case. 2023-01-11 11:00:11 +08:00
田淑杰 e8df6b36c4 * Add case of execution model. 2023-01-11 10:55:53 +08:00
caoyanyi aad8bef140 * Update uni test. 2023-01-11 10:35:04 +08:00
caoyanyi 85552386f4 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 10:24:23 +08:00
caoyanyi 68aead31b7 * Updaye test case. 2023-01-11 10:23:59 +08:00
田淑杰 afe74e70ed * Add case of execution model. 2023-01-11 10:23:22 +08:00
田淑杰 f5ad89ea13 * Add case of execution model. 2023-01-11 10:15:25 +08:00
田淑杰 dbd926aa1c * Add case of execution model. 2023-01-11 09:42:03 +08:00
caoyanyi 8f4b75ab1c Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-11 09:36:51 +08:00