Commit Graph
574 Commits
Author SHA1 Message Date
王怡栋 20852c3bc7 Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #27020, #27004.

See merge request easycorp/zentaopms!5273
2022-09-06 07:53:08 +00:00
liumengyi 2bf626bc9f * Fix bug #27004. 2022-09-06 15:24:07 +08:00
liumengyi 6e118674b9 * Fix bug #26193. 2022-09-06 10:57:20 +08:00
李玉春 0bc581b21c Merge branch 'sprint/235' into 'master'
Sprint/235

See merge request easycorp/zentaopms!5216
2022-08-31 08:19:32 +00:00
dongli c93028b04e * Fix bug #66816. 2022-08-30 03:00:07 +00:00
liuhong ceae38f4e1 *Fix bug before 26239. 2022-08-29 03:12:43 +00:00
liuhong c14d0ed155 *Fix bug before #64879. 2022-08-26 02:04:50 +00:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 6b6f9c39ee *Finish task #64879. 2022-08-18 02:51:35 +00:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
tianshujie 175fd06bc2 * Finish task #62936. 2022-08-03 17:07:23 +08:00
zenggang 0baf0d5fda * Finish task#62107 2022-07-26 08:51:47 +00:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
liumengyi f711e0984e * Fix bug #24991. 2022-07-12 17:10:11 +08:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zenggang 3b87d63a4b * Fix bug #24663 2022-07-01 02:59:20 +00:00
tianshujie c971b72c48 * Fix bug #24579. 2022-06-30 14:19:48 +08:00
xieqiyu a757ea76c1 * Code for task#58567. 2022-06-28 17:23:20 +08:00
xieqiyu 3d7fd651db * Code for task#58567. 2022-06-28 16:11:40 +08:00
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
zenggang f1c802d979 * Fix bug#24184 2022-06-23 07:28:21 +00:00
hufangzhou 48fb1a45f0 * Fix bug #24151. 2022-06-22 16:50:42 +08:00
tianshujie 226a7fc69b * Finish task #57893. 2022-06-21 16:37:35 +08:00
tianshujie f6f4bc5f7c * Finish task #57894. 2022-06-21 15:13:21 +08:00
tianshujie 42aa5a0f28 * Finish task #57894. 2022-06-21 14:05:36 +08:00
tianshujie b812104494 * Finish task #57894. 2022-06-21 13:14:06 +08:00
tianshujie 9585c4f031 * Finish task #57894. 2022-06-21 11:26:07 +08:00
tianshujie 30bff5f852 * Finish task #57894. 2022-06-21 11:15:16 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
leiyong 71a4c1099d * Adjust the prompt text for plugin expiration. 2022-05-26 10:39:16 +00:00
leiyong ea4eb1d2de * Finish task#54979. 2022-05-26 07:28:03 +00:00
zhouxudong 925aa3f8d8 * Finish task #54480. 2022-05-17 08:12:27 +00:00
zhouxudong c097334f3b * Finish task #54480. 2022-05-17 07:58:26 +00:00
zhouxudong cca3f56437 * Finish task #54480. 2022-05-17 07:38:22 +00:00
sunjun 445279bb1a *Fixbug_sunjun_17828 2022-04-28 05:26:17 +00:00
xieqiyu 565ea292d3 * Fix bug#21642. 2022-04-20 14:31:47 +08:00
zhouxin 1571548411 * Fix bug #21654. 2022-04-12 01:34:40 +00:00
zhouxin d79f9f22e4 * Fix bug #21320. 2022-04-11 06:14:00 +00:00
zhouxin 50fe51a2e5 * Fix bug #21320. 2022-04-11 01:18:40 +00:00
孙广明 1c8f929a0d Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #13324.

See merge request easycorp/zentaopms!2684
2022-04-02 06:49:30 +00:00
liyuchun 4240b563c9 * Fix bug #21061. 2022-04-01 10:27:27 +08:00
Zongjun Lan 7c99a6153d * fix bug gantt 2022-03-29 16:11:21 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
Zongjun Lan 47b88a959d * fix bug classic user edit and batchedit 2022-03-25 10:15:31 +08:00
Zongjun Lan b80761648b * fix bug classic vision 2022-03-25 09:36:56 +08:00