Commit Graph
337 Commits
Author SHA1 Message Date
zhouxudong 3c091e8281 * Finish task #57848. 2022-06-22 09:46:26 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu 4abb324459 * Fix bug#21896. 2022-04-21 16:46:09 +08:00
sunjun d2325e9b93 *Fixbug_sunjun_21811 2022-04-20 16:05:26 +08:00
sunjun 0aa9ee7db1 *Fixbug_sunjun_19262 2022-04-18 14:21:57 +08:00
sunjun efb1b2eee2 *Fixbug_sunjun_19262 2022-04-18 14:16:04 +08:00
zhouxudong e6ceaf1201 * Fix bug #17353. 2022-04-15 09:05:10 +08:00
zhouxudong 40aaa97681 * Fix bug #17353. 2022-04-14 17:05:38 +08:00
zhouxudong 7fe4729a58 * Fix bug #17353. 2022-04-14 16:58:37 +08:00
sunjun 38aa249dac *Fixbug_sunjun#21630 2022-04-14 13:08:59 +08:00
zhouxudong 8baef621d2 * Fix bug #17994. 2022-04-12 16:50:56 +08: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 bbea31bd09 * fix bug #20256 2022-04-01 10:01:48 +08:00
tanghucheng 2d3c8464d3 * Fix bug #20458,20369,20140,20373. 2022-03-09 10:20:46 +08:00
王怡栋 c753960b31 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #50357

See merge request easycorp/zentaopms!2147
2022-03-08 09:19:09 +00:00
Zongjun Lan 12245e26a7 * fix code format 2022-03-08 17:18:05 +08:00
Zongjun Lan b7ba61136e * fix bug 50357 2022-03-08 16:32:29 +08:00
王怡栋 aa08dd8b07 * fix bug for batch create todo. 2022-03-07 15:01:11 +08:00
tianshujie 35d1bc80dd * Fix bug #20269. 2022-03-04 09:58:49 +08:00
tianshujie cfb4b274a4 * Fix bug #20170. 2022-03-01 20:06:44 +08:00
tianshujie 59ee1b9038 * Fix bug #19786. 2022-03-01 15:51:11 +08:00
王怡栋 189158dabd Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong 2022-02-23 17:01:24 +08:00
王怡栋 f34bce05bf * code for task #49401. 2022-02-23 17:00:55 +08:00
Wenrui LI 11d3afd565 * use actual idvalue name for todo create/edit, bug #19011. 2022-02-23 08:27:02 +08:00
zhujinyong 37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
lichengjun b1dfaa21bb * Fix Bug #15200. 2021-09-17 07:14:30 +00:00
tianshujie 441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
liyuchun 46f2dc73c3 * Finish task #41764. 2021-08-30 13:00:53 +08:00
hufangzhou 98c0e920b4 * Fix bug #13887. 2021-08-05 16:10:56 +08:00
tianshujie98 c319f176c0 * Code modified when submitting code review. 2021-08-03 08:15:12 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong 84f4723fb6 * finish task #40452. 2021-07-26 17:41:35 +08:00
Yagami 048ec8020b * Code for bug #13766. 2021-07-22 14:57:15 +08:00
Yagami 7d2733396d * Fix bug #13766. 2021-07-22 13:53:24 +08:00
guanxiying bc3bd8316c * Fix bug #12828. 2021-07-05 14:47:15 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
leiyong d74f255057 * Fix bug#12078. 2021-04-16 05:38:49 +00:00
holan20180123 caec97f1b8 * Fix bug #11382., 2021-04-02 11:08:31 +08:00
wangyidong 94045515a0 * fix bug #11064. 2021-04-01 10:26:52 +08:00
wangyidong 361af39093 * adjust code for todo module. 2021-03-05 09:25:26 +08:00
Yagami 76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
holan20180123 319b97430e * Adjust the style. 2021-01-20 14:32:24 +08:00
leiyong 347cc63d74 * Adjust style. 2021-01-08 16:13:42 +08:00
leiyong eee118f742 * Fix bug. 2021-01-08 15:49:21 +08:00
leiyong 19717ee532 * Fix bug. 2021-01-08 15:27:06 +08:00
leiyong 0c4afee4ee * Finish task#8865. 2021-01-01 11:34:11 +08:00
tianshujie98 408a720605 * When editing products, add sorting uniqueness judgment. 2020-12-30 11:28:06 +08:00
holan20180123 0c477305fa * Finish task #8774. 2020-12-22 16:10:58 +08:00