Commit Graph

853 Commits

Author SHA1 Message Date
liyuchun
4991afb982 * Fix bug #18047. 2021-12-29 13:45:40 +08:00
liyuchun
2b44879ba2 * Adjust code style. 2021-12-29 10:24:39 +08:00
liyuchun
8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00
zhujinyong
45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
朱金勇
56081eb2e3 Merge branch 'sprint/176_mayue_16964' into 'master'
* Fix bug #16964.

See merge request easycorp/zentaopms!892
2021-12-10 06:17:11 +00:00
朱金勇
5ee11088b8 Merge branch 'sprint/176_songchenxuan_45539' into 'master'
Sprint/176 songchenxuan 45539

See merge request easycorp/zentaopms!870
2021-12-10 06:04:23 +00:00
mayue
5761af1ed8 * Fix bug #17248,17246. 2021-12-08 16:31:24 +08:00
songchenxuan
dde57a36cc *Finish task #45539. 2021-12-07 14:03:20 +08:00
mayue
6c4db07b39 * Fix bug #16964. 2021-12-07 11:18:57 +08:00
chaideqing
9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
Wenrui LI
24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +08:00
chaideqing
57b31c8612 * modify card style when in xuanxuan notice 2021-12-02 14:56:05 +08:00
chaideqing
45e127be6e * add linkButton tips in card and card do not show cross scroll 2021-12-01 14:59:33 +08:00
chaideqing
17ba1ea184 * add jump-link in xuanxuan_card which can jump to zentao_extension_page 2021-12-01 11:10:22 +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
chaideqing
70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +08: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
xieqiyu
17bee6e900 * Fix bug#16197. 2021-11-11 17:46:10 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
liyuchun
38fe82e21d * Fix bug #15874. 2021-11-01 16:57:10 +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
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
liyuchun
1b8e9f4a71 * Finish task #42377. 2021-09-09 10:06:16 +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
tianshujie
f4e99b630d * Fix bug #14799. 2021-08-31 13:40:55 +08:00
liyuchun
454ddd6394 * Fix bug #14475. 2021-08-31 10:25:37 +08:00
tianshujie
8ca2119f37 * Fix back link problem of execution module. 2021-08-30 13:57:21 +08:00
liyuchun
cc9ad9a713 * Finish task #41676. 2021-08-30 13:51:35 +08:00
liyuchun
d694419e52 * Code for task #41764. 2021-08-30 11:01:10 +08:00
tianshujie
4e278c4c44 * Finish task #41688. 2021-08-27 17:01:03 +08:00
tianshujie
d9f17ce8b4 * Finish task #41688. 2021-08-27 09:38:39 +08:00
tianshujie
1d9263a077 * Finish task #41688. 2021-08-27 09:06:34 +08:00
tianshujie98
f8074fdafb * Finish task #41800. 2021-08-25 10:45:33 +08:00
tianshujie98
fd9011e14c * Modify the problem of reporting an error when a multiplayer task team member is removed. 2021-08-16 14:08:23 +08:00
tianshujie98
e4d86ff8d9 * Finish task #41231. 2021-08-10 17:22:28 +08:00
qiyu-xie
be67b064d7 * Fix bug#13727. 2021-08-09 09:48:45 +08:00
qiyu-xie
3574dd2f00 * Finish task#40851. 2021-08-03 08:54:04 +08:00
wangyidong
c757f08599 * remove gitlab. 2021-07-20 14:18:06 +08:00
hufangzhou
5e153036fb * Fix bug #13711. 2021-07-19 11:26:54 +08:00
lichengjun
a9862dc312 * Fix Bug 13654 and 13651. 2021-07-14 21:21:36 +08:00