Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,684 Commits 2 Branches 292 Tags
449d092eb20306ae03ba85291f33a10fdc5671da
Commit Graph
39684 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
leiyong 449d092eb2 * Update language items. 2022-06-01 09:31:17 +00:00
leiyong 967861a589 * Finish task#55622. 2022-06-01 07:22:32 +00:00
孙广明 7da0bea1d6 Merge branch 'sprint/197_liumengyi_55677' into 'master' 
* Finish tash #55677.

See merge request easycorp/zentaopms!3684
 2022-06-01 06:51:37 +00:00
孙广明 270c56cb96 Merge branch 'sprint/master_zhouxudong_23108' into 'master' 
* Fix bug #23129 #23126 #23108.

See merge request easycorp/zentaopms!3685
 2022-06-01 06:49:09 +00:00
liumengyi d93d30e2d7 * Optimize code for task #55677. 2022-06-01 14:39:11 +08:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
liumengyi 07bebde892 * Fix bug for #task #55677. 2022-06-01 14:28:51 +08:00
liumengyi 61ef8e945f * Fix bug for #task #55677. 2022-06-01 14:27:56 +08:00
王怡栋 5846c3d0fd Merge branch 'sprint/scx_bugsearch' into 'master' 
* Fix bug #23068.

See merge request easycorp/zentaopms!3675
 2022-06-01 03:00:36 +00:00
宋辰轩 7d1341e710 * Fix bug #23068. 2022-06-01 10:59:52 +08:00
liumengyi 499024e935 * Finish tash #55677. 2022-06-01 10:36:46 +08:00
王怡栋 f64b61a487 Merge branch 'sprint/196' into 'master' 
Sprint/196

See merge request easycorp/zentaopms!3677
 2022-06-01 02:28:26 +00:00
王怡栋 817dffafc8 Merge branch 'sprint/196_zhouxudong_55623' into 'sprint/196' 
Sprint/196 zhouxudong 55623

See merge request easycorp/zentaopms!3676
 2022-06-01 02:20:14 +00:00
李玉春 767c6e3464 Merge branch 'cyy_23100' into 'master' 
* Fix bug #23100.

See merge request easycorp/zentaopms!3669
 2022-06-01 02:18:27 +00:00
王怡栋 6e034396e4 Merge branch 'sprint/hufangzhou_jar' into 'master' 
* Change the jar package path to environment variable.

See merge request easycorp/zentaopms!3674
 2022-06-01 02:12:11 +00:00
宋辰轩 081b7352e9 * Fix bug #23068. 2022-06-01 09:51:55 +08:00
hufangzhou 19673dbfc7 * Change the jar package path to environment variable. 2022-06-01 09:48:03 +08:00
王怡栋 678df875bb Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3671
 2022-06-01 00:44:41 +00:00
唐胡成 0b68898f0a Update model.php 2022-06-01 00:43:27 +00:00
tanghucheng c9daed297e * Fix bug #23105. 2022-06-01 08:41:04 +08:00
孙广明 b7aecebb76 Merge branch 'sprint/193_leiyong_task_54979' into 'sprint/196' 
Sprint/193 leiyong task 54979

See merge request easycorp/zentaopms!3640
 2022-06-01 00:29:56 +00:00
xieqiyu b041e5c885 * After creating a bug in the execution bug list, you jump to the execution testcase list. 2022-05-31 20:28:13 +08:00
zhouxudong 88e32db3a6 * Finish task #55623. 2022-06-01 01:42:38 +00:00
zhouxudong 71a55f5dcf * Finish task #55623. 2022-06-01 01:37:18 +00:00
朱金勇 ec29b05431 Merge branch 'sprint/193_hufangzhou_branch' into 'master' 
* Handle modules without non-trunk branches.

See merge request easycorp/zentaopms!3672
 2022-05-31 09:45:10 +00:00
hufangzhou daffe7c220 * Handle modules without non-trunk branches. 2022-05-31 17:41:18 +08:00
tanghucheng 648362bfdb * Fix bug #23095. 2022-05-31 17:22:15 +08:00
tanghucheng f3a1f7cf2a * Fix bug #23114. 2022-05-31 16:47:13 +08:00
王怡栋 947a247dc6 Merge branch 'master_xieqiyu_23055' into 'sprint/196' 
Master xieqiyu 23055

See merge request easycorp/zentaopms!3667
 2022-05-31 08:39:09 +00:00
王怡栋 e0adec2091 Merge branch 'master_xieqiyu_55620' into 'sprint/196' 
* Finish task#55620,#55627.

See merge request easycorp/zentaopms!3666
 2022-05-31 08:15:51 +00:00
王怡栋 0876b18db8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug workflowdatasource

See merge request easycorp/zentaopms!3670
zentaopms_17.0.beta2 		2022-05-31 08:14:29 +00:00
lanzongjun 61234b500f * fix bug workflowdatasource 2022-05-31 16:07:58 +08:00
caoyanyi 828760e66e * Fix bug #23100. 2022-05-31 16:01:26 +08:00
孙广明 0ee8c705b9 Merge branch 'sprint/193_hufangzhou_xuanxuansql' into 'master' 
* Modify the xuan upgrade sql.

See merge request easycorp/zentaopms!3665
 2022-05-31 07:20:30 +00:00
hufangzhou 44f99c26a5 * Modify the xuan upgrade sql. 2022-05-31 15:18:57 +08:00
孙广明 4e913acb10 Merge branch 'sprint/master_zhiuxudong_55626' into 'sprint/196' 
Sprint/master zhiuxudong 55626

See merge request easycorp/zentaopms!3664
 2022-05-31 07:01:18 +00:00
孙广明 df9054ce9c Merge branch 'sunhuawei_fixbug_23034' into 'master' 
*Fix bug #23034.

See merge request easycorp/zentaopms!3659
 2022-05-31 06:46:06 +00:00
孙华伟 c9f567453e *Fix bug #23034. 2022-05-31 14:41:55 +08:00
王怡栋 375444f16e Merge branch 'sprint/master_zhouxudong_22936' into 'master' 
* Fix bug #29936.

See merge request easycorp/zentaopms!3658
 2022-05-31 06:18:51 +00:00
王怡栋 47ab52884d Merge branch 'sprint/193_hufangzhou_23093' into 'master' 
* Fix bug #23093.

See merge request easycorp/zentaopms!3663
 2022-05-31 06:14:01 +00:00
zhouxudong 93e753b39e * Finish task #55619 #55626. 2022-05-31 06:03:37 +00:00
hufangzhou 2e494852df * Fix bug #23093. 2022-05-31 13:58:25 +08:00
王怡栋 2f5befb470 Merge branch 'sgm_fixbug' into 'master' 
* Fix upgrade bug.

See merge request easycorp/zentaopms!3661
 2022-05-31 03:57:32 +00:00
孙广明 ef40b0e3c5 * Fix upgrade bug. 2022-05-31 11:41:20 +08:00
朱金勇 4410f1fb0b Merge branch 'master_liwenrui_bugfix_xuan' into 'master' 
* fix client related issues.

See merge request easycorp/zentaopms!3653
 2022-05-31 03:35:32 +00:00
Wenrui LI 2a98caf35a * fix langName not set for web client. 2022-05-31 11:32:47 +08:00
Wenrui LI 96d4a06f35 * fix client notification. 2022-05-31 11:29:31 +08:00
李玉春 1020c941bf Merge branch 'cyy_fixbug' into 'master' 
* Modify editor saved bug.

See merge request easycorp/zentaopms!3660
 2022-05-31 02:22:40 +00:00
caoyanyi 55fe921331 * Modify editor saved bug. 2022-05-31 10:20:37 +08:00
孙华伟 6b69778c43 *Fix bug #23034. 2022-05-31 10:17:15 +08:00