Commit Graph

2250 Commits

Author SHA1 Message Date
liyuchun
0e30ba0a3b * Fix bug #16836. 2021-12-02 13:19:50 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
mayue
eec94fd383 * Fix bug #16936. 2021-12-01 17:14:43 +08:00
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
李玉春
4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
songchenxuan
9efa9b1759 * Finish task #45018. 2021-11-30 10:49:38 +08:00
王怡栋
21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
mayue
a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
liumengyi
3e1fc7ad5a * minor refactor. 2021-11-29 10:52:29 +08:00
liumengyi
235d7bbc0a * Finish task #45157. 2021-11-29 10:43:05 +08:00
liumengyi
f77c484548 * Finish task #45157. 2021-11-29 08:21:29 +08:00
liumengyi
e5f3e87ea1 * Finish task #45157. 2021-11-26 15:08:17 +08:00
liumengyi
0c2b88ae38 * Finish task #45157. 2021-11-26 15:04:47 +08:00
liumengyi
4d8b54a0b1 * Finish task #45157. 2021-11-26 10:08:56 +08:00
liumengyi
c6e4ff62d6 * Finish task #45157. 2021-11-26 09:07:28 +08:00
liumengyi
99b52e6b7e * Finish task #45157. 2021-11-26 08:59:55 +08:00
liumengyi
fb843381ca * Finish task #45157. 2021-11-26 08:55:04 +08:00
liumengyi
26da1c72cb * Finish task#45157. 2021-11-25 15:52:15 +08:00
chaideqing
45556985f7 * refactor ifelse code 2021-11-24 11:22:07 +08:00
chaideqing
70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +08:00
qixinzhi
f5d89fee3d * fix scroll bar css invalid after merge 2021-11-22 13:51:27 +08:00
文睿 李
68edb2f0a4 Merge branch 'sprint/168' into 'sprint/168_chaideqing_44636'
# Conflicts:
#   module/task/css/x.view.css
2021-11-22 00:23:57 +00:00
chaideqing
7bfb998913 * refactor 2021-11-19 16:14:47 +08:00
chaideqing
c36c339848 * task #44636, optimize task card in xuanxuan 2021-11-19 09:45:06 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
qixinzhi
e502f80728 * beautify scroll bar for task/bug/story card 2021-11-18 15:13:17 +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
liyuchun
1ae2cffc7c * Fix bug #16165. 2021-11-12 11:01:04 +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
liyuchun
4f6739980e * Finish task #43937. 2021-11-08 10:31:34 +08:00
liyuchun
38fe82e21d * Fix bug #15874. 2021-11-01 16:57:10 +08:00
王怡栋
3cdf3b3395 Merge branch 'sprint/167_wangyidong_api' into sprint/app10 2021-11-01 15:35:49 +08:00
liyuchun
970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08:00
zenggang
6bdf89c293 * Finish task#43410,43411,43413 2021-10-29 03:18:10 +00: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