Commit Graph

237 Commits

Author SHA1 Message Date
曹延义
bff2bdcbb3 * Finish task #71877. 2022-10-09 10:07:41 +08:00
tianshujie
badfc68859 * Fix bug #28165. 2022-09-29 17:42:36 +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
mayue
9248adc1af * Finish task #60639. 2022-07-11 18:10:09 +08:00
chaideqing
3532e82841 * fix card show blank above header 2022-07-11 15:29:26 +08:00
liumengyi
b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
zenggang
a01d530a0a * Hide cfd stat 2022-07-08 01:38:33 +00:00
mayue
8192f8b185 * Fix bug #24811. 2022-07-07 10:52:45 +08:00
王怡栋
5879801b8b Merge branch 'sprint/211_liumengyi_59482' into 'master'
* Finish task #59482.

See merge request easycorp/zentaopms!4395
2022-07-07 01:49:35 +00:00
liumengyi
3049879a44 * Fix bug of task #59482. 2022-07-07 09:40:07 +08:00
王怡栋
e7502f6641 Merge branch 'master' into 'sprint212_leiyong_task_59528'
# Conflicts:
#   module/execution/css/create.css
2022-07-07 01:38:20 +00:00
zenggang
93da33e08d * Adjust cfd style 2022-07-06 09:38:39 +00:00
zenggang
4825e51b78 * Adjust cfd css 2022-07-06 09:04:56 +00:00
孙广明
c97ff18621 Merge branch 'master' into 'sprint213_zg'
# Conflicts:
#   module/execution/css/cfd.css
#   module/execution/js/cfd.js
2022-07-06 07:02:38 +00:00
mayue
ef88d29c90 * Fix bug #24811#24814. 2022-07-06 14:58:46 +08:00
zenggang
8773257051 * Finish task#59703,59711 2022-07-06 06:42:19 +00:00
孙广明
6fe5ef5a23 Merge branch 'sprint_59473' into 'master'
Sprint 59473

See merge request easycorp/zentaopms!4362
2022-07-06 01:13:32 +00:00
sunjun
84e078c1b2 sprint_59473 2022-07-05 14:35:33 +00:00
孙广明
781259ee6f * Code for CFD. 2022-07-05 21:11:03 +08:00
leiyong
53ed45658e * Adjust CSS. 2022-07-05 08:25:10 +00:00
sunjun
900b52a96b sprint_59473 2022-07-05 08:24:41 +00:00