Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
50,204 Commits 2 Branches 292 Tags
0de469de30c06c61ea67d8a689003c82c368bfa3
Commit Graph
50204 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
caoyanyi 0de469de30 * Modify test case. 2023-01-09 09:25:29 +08:00
王怡栋 d9abd19c2d Merge branch 'zentaopms_283_task_#82067' into 'master' 
* Finish task #82067.

See merge request easycorp/zentaopms!6730
 2023-01-09 00:25:33 +00:00
王怡栋 7fe559597f Merge branch 'zentaopms_283_fix_task_#82075' into 'master' 
* Finish task #82075.

See merge request easycorp/zentaopms!6729
 2023-01-09 00:25:09 +00:00
wangyidong 49c392d16a Merge branch 'zentaopms_283_task_#82064' 2023-01-09 08:24:11 +08:00
王怡栋 0b625878de Merge branch 'master' into 'zentaopms_283_task_#82064' 
# Conflicts:
#   module/story/view/view.html.php
 2023-01-09 00:23:49 +00:00
daitingting 2003a9bf99 * Finish task #82067. 2023-01-08 02:31:02 +00:00
daitingting 40f8690b60 * Finish task #82075. 2023-01-08 02:29:13 +00:00
daitingting 903cfc57ac * Finish task #82064. 2023-01-06 09:15:42 +00:00
王怡栋 b6f3986894 Merge branch 'zentaopms_283' into 'master' 
Zentaopms 283

See merge request easycorp/zentaopms!6725
 2023-01-06 08:31:14 +00:00
王怡栋 91f38d82f5 Merge branch 'zentaopms_283_task_#82058' into 'zentaopms_283' 
* Finish task #82058.

See merge request easycorp/zentaopms!6723
 2023-01-06 07:37:28 +00:00
王怡栋 f4b70ec8c7 Merge branch 'zg_bug' into 'master' 
* Adjust code

See merge request easycorp/zentaopms!6722
 2023-01-06 07:37:03 +00:00
daitingting f455ff5a89 * Finish task #82058. 2023-01-06 07:22:45 +00:00
孙广明 41d8faab5b Merge branch 'master_bug_31537' into 'master' 
* Fix bug #31538.

See merge request easycorp/zentaopms!6717
zentaopms_18.0 		2023-01-06 07:03:08 +00:00
孙广明 db12662dcd Merge branch 'master_bug' into 'master' 
* Fix bug #31537.

See merge request easycorp/zentaopms!6720
 2023-01-06 07:02:56 +00:00
zenggang 2014040461 * Adjust code 2023-01-06 06:58:49 +00:00
王怡栋 cb8d6ea6af Merge branch 'sprint/hufangzhou_user_getgroupsbyvisions' into 'master' 
* Modify the getgroupsbyvisions unit testcase.

See merge request easycorp/zentaopms!6721
 2023-01-06 06:54:35 +00:00
王怡栋 90f458cc41 Merge branch 'sprint/hufangzhou_user_getgroups' into 'master' 
* Modify the getgroups unit testcase.

See merge request easycorp/zentaopms!6719
 2023-01-06 06:54:18 +00:00
王怡栋 4f37519422 Merge branch 'sprint/hufangzhou_user_login' into 'master' 
* Modify the login unit testcase.

See merge request easycorp/zentaopms!6718
 2023-01-06 06:54:03 +00:00
王怡栋 4e3f7ad8e8 Merge branch 'sprint/tsj_uinttest' into 'master' 
* Add test data.

See merge request easycorp/zentaopms!6714
 2023-01-06 06:53:27 +00:00
王怡栋 99cee07194 Merge branch 'zentaopms_283_task_#82068' into 'zentaopms_283' 
* Finish task #82068.

See merge request easycorp/zentaopms!6711
 2023-01-06 06:52:59 +00:00
hufangzhou 44cbe6c451 * Modify the getgroupsbyvisions unit testcase. 2023-01-06 06:47:27 +00:00
liuhong 309ee56b03 * Fix bug #31537. 2023-01-06 06:36:13 +00:00
hufangzhou e1dac9ae2d * Modify the getgroups unit testcase. 2023-01-06 06:32:20 +00:00
hufangzhou 2428521b8e * Modify the login unit testcase. 2023-01-06 06:08:31 +00:00
liuhong 913a8d8470 * Fix bug #31537. 2023-01-06 06:04:38 +00:00
孙广明 afdd435209 Merge branch 'zenops_46' into 'master' 
* Fix success success prompt is not displayed.

See merge request easycorp/zentaopms!6716
 2023-01-06 05:39:58 +00:00
zhaoke 7314399cad * Remove test code. 2023-01-06 05:24:43 +00:00
zhaoke ebec1436c7 * Open manual page in new window. 2023-01-06 05:06:14 +00:00
caoyanyi 94d6f91563 * Add test data. 2023-01-06 11:45:35 +08:00
zhaoke ae211ba53b * Fix success tips not show. 2023-01-06 03:36:58 +00:00
daitingting aa6206cdb3 * Finish task #82064. 2023-01-06 03:24:35 +00:00
孙广明 02e30b46ed Merge branch 'sprint/tsj_uinttest' into 'master' 
* Update result check.

See merge request easycorp/zentaopms!6712
 2023-01-06 03:14:20 +00:00
caoyanyi cdbdc18187 * Update result check. 2023-01-06 11:12:42 +08:00
王怡栋 703a689309 Merge branch 'zentaopms_283_task_#82070' into 'zentaopms_283' 
* Finish task #82070.

See merge request easycorp/zentaopms!6707
 2023-01-06 03:08:56 +00:00
王怡栋 0002481dc9 Merge branch 'sprint/tsj_uinttest' into 'master' 
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6710
 2023-01-06 03:08:40 +00:00
daitingting 5ccabca585 * Finish task #82068. 2023-01-06 03:07:11 +00:00
caoyanyi bb439b3c0c * Adjust code. 2023-01-06 11:01:49 +08:00
caoyanyi 65f3c96c60 * Adjust code. 2023-01-06 10:57:31 +08:00
caoyanyi 08167f3193 * Add test case. 2023-01-06 10:56:08 +08:00
caoyanyi 0c50333aa6 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-06 10:46:47 +08:00
caoyanyi d1072d16a4 * Add test case. 2023-01-06 10:46:37 +08:00
田淑杰 6efa950486 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-06 10:44:42 +08:00
田淑杰 678cb12e20 * Add case for program model. 2023-01-06 10:44:25 +08:00
caoyanyi e60f3edd64 Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-06 10:38:24 +08:00
caoyanyi 5701d26959 * Add test case. 2023-01-06 10:38:13 +08:00
田淑杰 85c2702bee Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-06 10:33:18 +08:00
田淑杰 09e6d2eefd * Add case of program model. 2023-01-06 10:32:59 +08:00
caoyanyi 60fd9bcfa4 * Add test case. 2023-01-06 10:21:53 +08:00
胡方舟 8b992b0c58 Merge branch 'sprint/hufangzhou_changelog' into 'master' 
* Delete story #40806 from changelog.

See merge request easycorp/zentaopms!6705
 2023-01-06 02:12:53 +00:00
caoyanyi 0875144941 * Add test case. 2023-01-06 10:05:48 +08:00