Commit Graph
3573 Commits
Author SHA1 Message Date
tianshujie e0537276bd * Delete useless code. 2022-07-21 09:30:35 +08:00
wangyidong 2cf2c96ebd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 17:25:00 +08:00
wangyidong ab6ee566e7 * code for task #61191. 2022-07-20 16:14:55 +08:00
王怡栋 d3c3973346 Merge branch 'sprint/hufangzhou_doc' into 'master'
* Finish task #59750.

See merge request easycorp/zentaopms!4608
2022-07-20 06:27:44 +00:00
hufangzhou fab8fedf10 * Adjust the judgment condition to a configuration item. 2022-07-20 14:15:43 +08:00
wangyidong bbb79d5f94 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-20 10:59:50 +08:00
wangyidong 7542c26998 * code for task #61483. 2022-07-20 10:58:57 +08:00
hufangzhou 1dcf2dcb2c * Code for task #59750. 2022-07-20 10:13:21 +08:00
王怡栋 1e14279144 Merge branch 'cyy_mr' into 'master'
Cyy mr

See merge request easycorp/zentaopms!4601
2022-07-20 01:16:22 +00:00
tianshujie e19b245d2a * Finish task #61177. 2022-07-20 08:56:53 +08:00
caoyanyi 07465a327d * Modify merge request view. 2022-07-19 17:04:12 +08:00
tianshujie 7791a30013 * Finish task #61177. 2022-07-19 13:32:03 +08:00
caoyanyi 8163199cf1 * Modify merge request for gitea. 2022-07-19 10:56:04 +08:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +08:00
wangyidong 1fcfdf2972 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-07-15 10:06:00 +08:00
wangyidong c4af3c24b6 * fix bug #25346. 2022-07-15 10:05:43 +08:00
Wenrui LI bcaaf11dfc * fix double header covering main in zentaoclient. 2022-07-15 08:52:25 +08:00
王怡栋 c1a012bb91 Merge branch 'sprint/hufangzhou_25281' into 'master'
* Fix bug #25281.

See merge request easycorp/zentaopms!4551
2022-07-14 08:23:43 +00:00
王怡栋 d282c902de Merge branch 'liugang_fixbug' into 'master'
* Fix bug of print kanban.

See merge request easycorp/zentaopms!4549
2022-07-14 08:22:53 +00:00
tianshujie dee593663b * Fix bug #25309. 2022-07-14 16:19:14 +08:00
hufangzhou 8c62376d05 * Fix bug #25281. 2022-07-14 15:49:55 +08:00
liugang a53697f342 * Fix bug of print kanban. 2022-07-14 15:36:10 +08:00
tianshujie 49007c2a17 * Fix bug #25234. 2022-07-14 10:05:15 +08:00
tianshujie b5a9fe8c52 * Fix bug #25234,25233. 2022-07-14 09:57:56 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
王怡栋 96ad1bfff8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #25016

See merge request easycorp/zentaopms!4440
2022-07-08 07:22:37 +00:00
孙广明 0264b6c3f9 Merge branch 'sprint/scx_translate' into 'master'
Sprint/scx translate

See merge request easycorp/zentaopms!4429
2022-07-08 07:11:20 +00:00
lanzongjun 5c95d9fd18 * fix bug #25016 2022-07-08 14:52:46 +08:00
wangyidong 9c61acba52 * fix bug for misc-captcha. 2022-07-08 14:46:25 +08:00
zhouxudong f7b8ef064f * Fix bug #24844. 2022-07-08 05:51:40 +00:00
tianshujie 9df3094887 * Troubleshooting Play Course 302 Network Issues. 2022-07-08 11:32:17 +08:00
宋辰轩 5c103233e3 * Edit design module lang. 2022-07-08 10:54:34 +08:00
wangyidong 38cc476bb9 * fix bug #22749. 2022-07-08 09:47:42 +08:00
liumengyi d24c7185f5 * Fix bug of task #59480, #59481. 2022-07-07 15:35:19 +08:00
孙广明 c540e7002d Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555

See merge request easycorp/zentaopms!4392
2022-07-07 02:51:51 +00:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
孙广明 b5a365422f * Code for pri error. 2022-07-07 09:57:20 +08:00
caoyanyi 99fa5aaae3 * Add gitea module. 2022-07-07 08:29:46 +08:00
王怡栋 f25fcc1eb2 Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
#   module/testcase/css/create.css
2022-07-06 06:47:25 +00:00
王怡栋 29bed0101b Merge branch 'sprint/master_zhouxudong_59525' into 'master'
Sprint/master zhouxudong 59525

See merge request easycorp/zentaopms!4365
2022-07-06 02:17:24 +00:00
zhouxudong bf19599c0e * Finish task #59525. 2022-07-06 02:15:33 +00:00
tianshujie cdaf164f0a * Fix bug #24752,24747. 2022-07-06 08:26:27 +08:00
孙广明 d175ae0f5e Merge branch 'master' into 'liyuchun_59437'
# Conflicts:
#   module/repo/control.php
2022-07-05 09:20:43 +00:00
liyuchun 8a3d924e2b * Finish task #59451. 2022-07-05 08:42:48 +00:00
王怡栋 ae7cc6764d Merge branch 'sgm_kanban' into 'master'
* Finish task #59701.

See merge request easycorp/zentaopms!4348
2022-07-05 07:08:41 +00:00
孙广明 25028997fa * Finish task #59701. 2022-07-05 15:03:15 +08:00
李玉春 c1f66467cd Merge branch 'cyy_59436' into 'master'
Finish task 59436

See merge request easycorp/zentaopms!4335
2022-07-05 05:52:18 +00:00
liyuchun 0044a55b76 * Finish task #59439. 2022-07-05 05:48:02 +00:00
caoyanyi b2085d27c6 * Modify language. 2022-07-05 13:03:26 +08:00