Commit Graph
2879 Commits
Author SHA1 Message Date
Yagami 55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
wangyidong fdc4c4159f * adjust for icon. 2022-12-05 10:29:48 +08:00
wangyidong 33d2c170fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-05 10:11:28 +08:00
wangyidong 42e85ebbb8 * code for task #78384. 2022-12-05 10:10:59 +08:00
lanzongjun ea0d3d44ba Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-05 09:23:07 +08:00
lanzongjun 9fc3e25635 * fix execution plans 2022-12-05 09:23:01 +08:00
Yagami 3c088eb548 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 15:59:02 +08:00
Yagami d7d897a8f7 * Fix code error. 2022-12-02 15:58:52 +08:00
lanzongjun a0c214eace * fix bug #30475 2022-12-02 15:54:05 +08:00
lanzongjun 3b09109e21 * fix bug #30496 2022-12-02 15:34:11 +08:00
lanzongjun a1bd34b3ce * fix bug #30496 2022-12-02 15:32:36 +08:00
lanzongjun 546a417339 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 14:41:56 +08:00
lanzongjun 8a81c215b5 * fix bug #30472 2022-12-02 14:41:49 +08:00
Yagami dda0446e57 * Fix bug #30436. 2022-12-02 14:34:34 +08:00
Yagami dbc00993c6 * Fix execution manage products bug. 2022-12-02 13:42:09 +08:00
zenggang 2b66d5d5ca * Fix bug#30470 2022-12-02 05:32:33 +00:00
Yagami 8cb3e136d3 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 10:48:11 +08:00
Yagami 32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
王怡栋 7013e19604 Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
2022-12-01 07:54:50 +00:00
liumengyi a6c8171286 * Fix bug #30278. 2022-12-01 10:33:59 +08:00
chaideqing 756a9dc5a5 * Add vi lang. 2022-12-01 10:25:28 +08:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
lanzongjun 65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
lanzongjun 9eebd0051d * Finish Task #77799 2022-11-30 13:44:25 +08:00
lanzongjun ea1b231783 * Finish Task #77799 2022-11-30 13:14:27 +08:00
lanzongjun 7e0f9114c0 code meeting fix 2022-11-30 09:17:05 +08:00
wangyidong 5f0355999c * adjust for link for de lang. 2022-11-29 16:55:40 +08:00
lanzongjun d671be8b02 project link plan tips 2022-11-29 16:22:24 +08:00
lanzongjun 9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
胡方舟 13448090a3 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6388
2022-11-25 09:52:30 +00:00
wangyuting 88f5f0dd3b * Fix bug. 2022-11-25 09:47:27 +00:00
王怡栋 c4b3e8d18a * code for bug #devops. 2022-11-25 15:57:52 +08:00
王怡栋 46d98dcada Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-25 15:56:16 +08:00
王怡栋 a14dc11193 * fix bug #30271. 2022-11-25 15:55:07 +08:00
xieqiyu 79a9c38403 * Delete unused code. 2022-11-25 15:11:54 +08:00
Yagami 83a76c2636 * Fix execution list bug. 2022-11-25 14:47:13 +08:00
王怡栋 67a0be29e7 * fix bug. 2022-11-25 13:59:22 +08:00
王怡栋 860e2eaec8 Merge branch 'zentaopms_263_bug#29566' into 'master'
* Fix bug #29566.

See merge request easycorp/zentaopms!6378
2022-11-25 03:10:02 +00:00
wangyuting 6a445b8a42 * Fix bug #29566. 2022-11-25 01:48:56 +00:00
lanzongjun 3e2648ab5e * Fix Bug #30240 2022-11-25 09:34:57 +08:00
lanzongjun 675891f136 * Fix Bug #30028 2022-11-24 14:26:27 +08:00
孙广明 31dc028cff Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #77263#77267 Bug #30022

See merge request easycorp/zentaopms!6310
2022-11-23 05:18:07 +00:00
王怡栋 db4bd4ebd6 * fix bug #29996. 2022-11-23 13:12:53 +08:00
lanzongjun 13d7490288 * Fix Task #77263 2022-11-23 09:39:10 +08:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
Yagami a9bc199c38 * Finish task #77279. 2022-11-22 13:53:40 +08:00
Yagami ae3bbae974 * Finish task #76491. 2022-11-22 13:21:44 +08:00