Commit Graph
50484 Commits
Author SHA1 Message Date
孙广明 9763444083 Merge branch 'sprint/bi_liumengyi_31577' into 'master'
* Fix bug #31577.

See merge request easycorp/zentaopms!6790
2023-01-29 07:07:24 +00:00
liumengyi c37281e278 * Fix bug #31577. 2023-01-29 14:58:15 +08:00
wangyidong 04d62866f2 * fix bug #26541. 2023-01-29 14:49:02 +08:00
孙广明 f5c76bcaf1 Merge branch 'master_xieqiyu_30823' into 'master'
Master xieqiyu 30823

See merge request easycorp/zentaopms!6789
2023-01-29 06:47:42 +00:00
xieqiyu 21947f4aac * Fix bug#30823. 2023-01-29 14:42:13 +08:00
王怡栋 3a2c5a4b00 Merge branch 'sprint/tsj_uinttest' into 'master'
* Add test case and remove unused function.

See merge request easycorp/zentaopms!6788
2023-01-29 06:37:57 +00:00
caoyanyi c3618ef363 * Add test case. 2023-01-29 14:29:54 +08:00
caoyanyi cbadccc033 * Add test case. 2023-01-29 14:11:42 +08:00
caoyanyi 152ec6b49c * Add test case and remove unused function. 2023-01-29 13:58:40 +08:00
xieqiyu b7496913ce * Fix bug#30823. 2023-01-29 13:29:41 +08:00
王怡栋 dcc2392506 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389.

See merge request easycorp/zentaopms!6787
2023-01-29 05:08:18 +00:00
王怡栋 3ed4d5d692 Merge branch 'zenops_46' into 'master'
Merge branch zenops_46 into  'master'

See merge request easycorp/zentaopms!6784
2023-01-29 05:07:38 +00:00
王怡栋 16af42a553 Merge branch 'bug_31595' into 'master'
* Fix bug#31595

See merge request easycorp/zentaopms!6783
2023-01-29 05:07:06 +00:00
王怡栋 c2efcc5bd1 Merge branch 'sprint/tsj_uinttest' into 'master'
Sprint/tsj uinttest

See merge request easycorp/zentaopms!6773
2023-01-29 05:06:44 +00:00
孙广明 a48b8f624d Merge branch 'fixbug/liumengyi_fixbug' into 'master'
* Fix bug for can no password.

See merge request easycorp/zentaopms!6786
2023-01-29 05:05:24 +00:00
孙广明 bfa74e3601 Merge branch 'lyk_fixbug' into 'master'
* Fix project's teamCount displayed incorrectly.

See merge request easycorp/zentaopms!6785
2023-01-29 05:05:17 +00:00
王怡栋 f3595c32de Merge branch 'master_bug_30334' into 'master'
* Adjust code  bug #30334.

See merge request easycorp/zentaopms!6770
2023-01-29 05:05:11 +00:00
caoyanyi 7fbd6d958a Merge branch 'sprint/tsj_uinttest' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-29 11:27:36 +08:00
caoyanyi 97506ed3c1 * Add test case. 2023-01-29 11:27:22 +08:00
tianshujie 466dea12cd * Modify case of execution model. 2023-01-29 11:18:37 +08:00
tianshujie c81992a1c2 * Add case of execution model. 2023-01-29 11:12:13 +08:00
liuhong 14679274a3 * Fix bug #30389. 2023-01-29 03:08:37 +00:00
liumengyi 31ef1a19a3 * Fix bug for can no password. 2023-01-29 10:42:22 +08:00
朱金勇 c6829418b3 Merge branch 'sprint/sunhao/open_help_url' into 'master'
* support to open help app with given url

See merge request easycorp/zentaopms!6777
2023-01-29 02:34:44 +00:00
liuyongkai 3c02bddefd * Fix project's teamCount displayed incorrectly. 2023-01-29 10:33:41 +08:00
caoyanyi 506981148e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-29 10:24:01 +08:00
caoyanyi ce13973107 * Clear team table. 2023-01-29 10:23:35 +08:00
tanghucheng ed313382c1 * Fix bug #31490. 2023-01-29 10:12:46 +08:00
tanghucheng dcd4c81131 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-29 09:54:26 +08:00
tanghucheng 2b3f57c2a6 * Fix bug #31540. 2023-01-29 09:52:49 +08:00
zenggang c29d86fda5 * Fix bug#31595 2023-01-29 01:21:53 +00:00
liuhong 301eed9e71 * Fix bug #30334. 2023-01-29 01:05:57 +00:00
孙广明 f019ae8119 Merge branch 'bug_30754' into 'master'
* Fix bug#30754

See merge request easycorp/zentaopms!6780
2023-01-29 00:56:20 +00:00
liuhong 9605346da7 * Fix bug #30334. 2023-01-29 00:54:45 +00:00
孙广明 b35708d760 Merge branch 'master_xieqiyu_31656' into 'master'
Master xieqiyu 31656

See merge request easycorp/zentaopms!6781
2023-01-29 00:54:38 +00:00
xieqiyu 1a12607799 * Fix bug#25663. 2023-01-19 11:47:54 +08:00
xieqiyu a9c225c532 * Fix bug#30697. 2023-01-19 09:44:56 +08:00
xieqiyu 62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
zenggang dfdefae34b * Fix bug#30754 2023-01-18 08:53:35 +00:00
xieqiyu e722cc1468 * Fix bug#30840. 2023-01-18 16:42:41 +08:00
xieqiyu 5c84bf67bf * Fix bug#30850. 2023-01-18 16:31:08 +08:00
xieqiyu 9a64cf0e50 * Fix bug#30964. 2023-01-18 16:00:17 +08:00
xieqiyu 67a4f16f74 * Fix bug#31685. 2023-01-18 15:12:14 +08:00
xieqiyu df96905ac3 * Fix bug#31656. Modify confirm bug mailto. 2023-01-18 14:13:46 +08:00
xieqiyu 55dae61471 * Fix bug#31656. 2023-01-18 13:59:20 +08:00
zhaoke c7db2db898 * Add open manual in new tab. 2023-01-17 07:06:06 +00:00
zhaoke bc52ae320e Merge branch 'sprint/sunhao/open_help_url' into zenops_46 2023-01-17 07:00:21 +00:00
zhaoke 48ee6f6038 Merge branch 'master' into zenops_46 2023-01-17 07:00:12 +00:00
zhaoke 2c82cb7a0d Fix delete node error. 2023-01-17 06:49:09 +00:00
孙广明 d67a147527 Merge branch 'bug_31514' into 'master'
* Fix bug#31514

See merge request easycorp/zentaopms!6772
2023-01-17 03:21:22 +00:00