Commit Graph
50510 Commits
Author SHA1 Message Date
guofeilong ffe1ccdbe8 * code for lang 2023-01-31 10:25:38 +08:00
guofeilong 0959b76706 * code for css in plug 2023-01-31 09:14:53 +08:00
guofeilong e7468f1699 * code for css in admin.html 2023-01-31 08:27:03 +08:00
guofeilong 6ce4ae36ec Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into dev/gfl_task_#83327 2023-01-30 17:20:05 +08:00
caoyanyi 02f6b95c20 * Add extension list. 2023-01-30 17:11:28 +08:00
guofeilong 6df1f2daa6 * code for task_#83327 2023-01-30 16:37:24 +08:00
王怡栋 1856a26312 Merge branch 'dev/gfl_task_#83327' into 'sprint/285'
* code for task #83327

See merge request easycorp/zentaopms!6798
2023-01-30 08:04:43 +00:00
guofeilong 44b526f9fc * code for task #83327 2023-01-30 14:57:46 +08:00
wangyidong 516d773d1d * fix bug #31718. 2023-01-30 09:01:15 +08:00
王怡栋 73bc6538d0 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6794
2023-01-30 00:37:19 +00:00
孙广明 827f9c9508 Merge branch 'fixbug_liumengyi_31808' into 'master'
* Fix bug #31808.

See merge request easycorp/zentaopms!6795
2023-01-30 00:34:10 +00:00
liumengyi ba1f64daf9 * Fix bug #31808. 2023-01-30 08:29:51 +08:00
wangyidong b4598b8738 * fix bug #31725. 2023-01-29 17:18:40 +08:00
tianshujie 5968e26cd9 * Fix bug #28027. 2023-01-29 17:02:06 +08:00
王怡栋 5ce0bb3c97 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389 :if delete execution directly the execute is empty.

See merge request easycorp/zentaopms!6793
2023-01-29 08:49:21 +00:00
tianshujie 1d2c6ee0f6 * Fix bug #27999. 2023-01-29 16:46:56 +08:00
tianshujie 7ca322300b * Fix bug #25848. 2023-01-29 16:21:42 +08:00
tianshujie 0b4897b2bb Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tianshujie_fixbug 2023-01-29 16:15:27 +08:00
tianshujie dec6df72b2 * Fix bug #25848. 2023-01-29 16:15:06 +08:00
liuhong 3a2ef158b5 * Fix bug #30389 :if delete execution directly the execute is empty. 2023-01-29 08:00:24 +00:00
tianshujie 30ed2fd65c * Fix bug #25848. 2023-01-29 15:58:48 +08:00
王怡栋 10371d204b Merge branch 'sprint/hufangzhou_jenkinsTest' into 'master'
* Modify for trigger jenkins.

See merge request easycorp/zentaopms!6792
2023-01-29 07:44:57 +00:00
hufangzhou a1bafd0f38 * Modify for trigger jenkins. 2023-01-29 07:43:12 +00:00
王怡栋 87480efae9 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6791
2023-01-29 07:28:22 +00:00
tianshujie 87af5d21a7 * Fix bug #31809. 2023-01-29 15:16:36 +08:00
孙广明 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
tianshujie f08ba04142 * Fix bug #23550. 2023-01-29 12:05:13 +08: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