Commit Graph

255 Commits

Author SHA1 Message Date
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie
a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
tianshujie
935faa00bd * Finish task #73752. 2022-10-26 14:01:04 +08:00
tianshujie
308a8b9f5e * Finish task #73750. 2022-10-26 13:15:38 +08:00
Yagami
33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
wangzemei
478bbcc87c * Fix bug #28447 2022-10-14 17:21:37 +08:00
wangzemei
01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +08:00
wangzemei
740e144707 * fix bug 28388 && 28395 2022-10-11 14:05:33 +08:00
田淑杰
f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
tianshujie
ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
tianshujie
e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
wangzemei
f0c3b79018 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878 2022-10-09 15:42:16 +08:00
wangzemei
ec7844f035 * compatible datatable style 2022-10-09 15:42:00 +08:00
王怡栋
1f68a6b1e7 Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.

See merge request easycorp/zentaopms!5658
2022-10-09 05:08:34 +00:00
曹延义
bff2bdcbb3 * Finish task #71877. 2022-10-09 10:07:41 +08:00
wangzemei
ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
xieqiyu
57dd6eb716 * Fix bug#26098. 2022-09-30 07:19:21 +00:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
tianshujie
badfc68859 * Fix bug #28165. 2022-09-29 17:42:36 +08:00
sunguangming
595b5f8f83 * Code for task #71167. 2022-09-29 11:36:18 +08:00
tianshujie
4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
tianshujie
92eb14d26e * Finish task #70015. 2022-09-26 16:13:39 +08:00
tianshujie
0e0d13b0a0 * Finish task #70015. 2022-09-26 10:52:36 +08:00
dingyongliang
5ceb75a7c2 * tash #68929, center the kanban title. 2022-09-14 06:04:57 +00:00
xieqiyu
4f9128b9c1 * Fix bug#27288. 2022-09-06 15:51:03 +08:00
xieqiyu
36dc478de5 * Finish task#67693. 2022-09-06 10:21:24 +08:00
tianshujie
f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
zhouxudong
7ed184a915 * Fix bug. 2022-08-23 03:26:11 +00:00
zhouxudong
cc6d27636f * Finish task #66231. 2022-08-22 08:06:41 +00:00
曾刚
caed6b27cd Fix bug#26664 2022-08-19 05:10:19 +00:00
zhujinyong
50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
Hao Sun
da2fa732bf * fix white-space in table. 2022-08-10 03:08:56 +00:00
xieqiyu
930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
liuhong
12f1f00b16 Finish task #35865. 2022-08-09 07:21:41 +00:00
tianshujie
f4147a73a1 * Resolve issue #708. 2022-08-05 10:24:12 +08:00
tianshujie
e0aaa4c18c * Fix bug #26008. 2022-08-04 09:28:18 +08:00
tianshujie
b4a394718f * Finish task #62947. 2022-08-03 14:49:42 +08:00
liumengyi
6d019f65e5 * Fix bug for task #62935. 2022-08-03 08:39:25 +08:00
liumengyi
dd2c92fb9d * Finish task #62935. 2022-08-01 15:41:14 +08:00
liumengyi
e13315a151 * Finish task #62494. 2022-07-28 09:57:02 +08:00
liumengyi
60b32e04da * Fix bug #25797. 2022-07-28 09:54:42 +08:00
liumengyi
5551773576 * Finish story #35409, #35408, #35407. 2022-07-27 14:50:07 +08:00
zhouxudong
38ae663640 * Fix bug #25703. 2022-07-27 01:52:04 +00:00
liumengyi
865986c216 * Finish task #61973. 2022-07-26 09:36:30 +08:00
王怡栋
7e682c99c2 Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110

See merge request easycorp/zentaopms!4563
2022-07-15 03:17:39 +00:00
王怡栋
11f2eb8a0f Merge branch 'sprint/215_liumengyi_60476' into 'master'
Sprint/215 liumengyi 60476

See merge request easycorp/zentaopms!4485
2022-07-12 09:20:31 +00:00
mayue
a21626979e * Fix bug #25081. 2022-07-12 14:25:58 +08:00
liumengyi
154c18ee43 * Finish task #60476. 2022-07-12 11:07:16 +08:00
zenggang
5d116c16c9 * Finish task#60640 2022-07-12 02:29:20 +00:00
孙广明
107060744e Merge branch 'sprint/216_mayue_task#60639' into 'master'
* Finish task #60639.

See merge request easycorp/zentaopms!4463
2022-07-12 00:54:34 +00:00