Commit Graph

2217 Commits

Author SHA1 Message Date
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
zhouxin
b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
王怡栋
d4ccff00e3 * fix bug. 2021-11-17 17:13:00 +08:00
zhouxin
b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
hufangzhou
e441e4a28d * Fix the bugs. 2021-11-15 08:50:05 +08:00
xieqiyu
17bee6e900 * Fix bug#16197. 2021-11-11 17:46:10 +08:00
孙广明
eb62dcead9 Merge branch 'sprint/170_zhengrunyu_44163' into 'sprint/170'
*Finish task #44163.

See merge request easycorp/zentaopms!399
2021-11-11 03:16:43 +00:00
zhengrunyu
be094287b6 Finish task #44163. 2021-11-11 11:03:20 +08:00
zhengrunyu
301d5b912e *Finish task #44163. 2021-11-11 10:20:58 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
王怡栋
3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
王怡栋
2c3d42360c * adjust for delete file session. 2021-10-28 16:26:16 +08:00
王怡栋
fb17df4424 * add upload file api. 2021-10-28 13:12:33 +08:00
tanghucheng
554214895b * Finish task #43557 2021-10-27 10:26:23 +08:00
tanghucheng
a6544b38ed * Finish task #43557. 2021-10-27 10:05:51 +08:00
tanghucheng
a577f54958 * Finish task #43557. 2021-10-26 10:45:49 +08:00
xieqiyu
140f2f88c8 * Fix bug#15524. 2021-10-14 16:17:01 +08:00
xieqiyu
92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
hufangzhou
e2f51ef422 * Fix bug #15270. 2021-10-13 10:51:30 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
liyuchun
9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
zenggang
e62809eabd * Fix bug#14360 2021-09-18 15:38:36 +08:00
liyuchun
f182feb33c * Fix bug #15183. 2021-09-18 08:37:12 +08:00
liyuchun
33e946e968 * Fix bug #15183. 2021-09-18 08:33:58 +08:00
tianshujie
caaaa90cf5 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 15:56:33 +08:00
tianshujie
441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
liyuchun
4c0319296c * Fix bug #15183. 2021-09-15 13:58:52 +08:00
王怡栋
d2ef694ea6 * fix for set realStart when edit task. 2021-09-15 10:04:28 +08:00
tianshujie
11ea717fa6 * Fix bug #14858. 2021-09-14 09:31:20 +08:00
tianshujie
a320565459 * Fix bug #14858. 2021-09-14 09:28:02 +08:00
zenggang
e2008d5c31 * Fix bug#15099 2021-09-13 10:23:05 +08:00
tianshujie
275a567b7a * Modify function comment. 2021-09-13 10:12:53 +08:00
liyuchun
1b8e9f4a71 * Finish task #42377. 2021-09-09 10:06:16 +08:00
tianshujie
4ba2c2d7f8 * Fix bug #15060. 2021-09-08 16:18:20 +08:00
王怡栋
71e494840a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 16:01:39 +08:00
王怡栋
d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +08:00
zhujinyong
c4be0c2c26 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-08 15:35:04 +08:00
zhujinyong
88d981a33c + Add comments of api. 2021-09-08 15:34:49 +08:00
tianshujie
7c2cf95f69 * Fix bug #14808. 2021-09-08 14:56:44 +08:00
tianshujie
bf5242da87 * Finish task #42413. 2021-09-08 14:12:10 +08:00
tianshujie
aecf12e083 * Finish task #42415. 2021-09-08 13:51:43 +08:00
liyuchun
54661ec813 * Finish task #42414. 2021-09-08 13:12:19 +08:00
zhujinyong
489a87e0ec * Adjust response of api. 2021-09-08 10:40:25 +08:00
zenggang
3f5dea88f3 * Finish task#42099 2021-09-06 10:04:09 +08:00
王怡栋
4eee4d5523 Merge branch '15.4' 2021-09-02 19:21:30 +08:00
tianshujie
5e96d4544e * Fix bug #14757. 2021-09-01 10:18:00 +08:00
孙广明
9328d2f7eb * Finish task #41715. 2021-09-01 09:15:32 +08:00
tianshujie
1fd8f082fd * Fix error when creating task. 2021-08-31 15:11:08 +08:00
tianshujie
2103bf7b57 * Fix bug #14723. 2021-08-31 13:47:53 +08:00