Commit Graph

215 Commits

Author SHA1 Message Date
tanghucheng
62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
wangyidong
b8b0affbee * fix bug #30994. 2022-12-21 16:19:29 +08:00
caoyanyi
4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zenggang
748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
caoyanyi
e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
mayue
e45a22f25d * Fix bug #29410. 2022-11-14 14:47:50 +08:00
caoyanyi
1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
caoyanyi
90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
tianshujie
32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
tianshujie
5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
tianshujie
dd98b3e2de * Fix bug #28783. 2022-11-03 09:58:45 +08:00
tianshujie
ff4593f9d2 * Fix bug #28783. 2022-11-03 09:49:47 +08:00
liyuchun
00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
tianshujie
ae0c045c02 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 16:06:26 +08:00
tianshujie
faabb32285 * Optimize the style of maintaining multi-tasking teams. 2022-10-20 15:53:21 +08:00
tianshujie
4bce0e6e99 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 14:17:54 +08:00
tianshujie
209d2b6d8d * Adjust task list and create task page style. 2022-10-20 13:56:53 +08:00
tianshujie
d55aedf3e5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 11:04:27 +08:00
tianshujie
4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
孙广明
020fada011 Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5800
2022-10-19 09:04:21 +00:00
tianshujie
8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
李玉春
a18bb50ef9 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
* Fixed maintenance task team style issues.

See merge request easycorp/zentaopms!5795
2022-10-19 05:13:36 +00:00
tianshujie
056358363d * Fixed maintenance task team style issues. 2022-10-19 11:56:03 +08:00
wangzemei
68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
wangzemei
9eb84fcc4e * modify format 2022-10-18 13:06:15 +08:00
wangzemei
0b2907217f * replace input component 2022-10-18 09:43:23 +08:00
wangzemei
7075426106 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349 2022-10-18 08:56:26 +08:00
wangzemei
5064fc3669 * update createTaskTeam style 2022-10-17 16:45:59 +08:00
wangzemei
72c1b4819e * finish task #72349 2022-10-17 16:24:14 +08:00
tianshujie
f9b2fd0aff * Fix bug #28531. 2022-10-17 15:46:56 +08:00
tianshujie
bafc9a6020 * Fix bug #28528. 2022-10-17 13:54:11 +08:00
tianshujie
6e1ebabb80 * Finish task #70498. 2022-10-11 09:11:21 +08:00
wangzemei
f7a8569d2e * modify team style 2022-10-10 13:30:35 +08:00
tianshujie
e8757d4692 * Finish task #70498. 2022-09-29 14:51:52 +08:00
liyuchun
6bed7509e7 Merge branch 'master' into zenops_46 2022-09-29 09:25:12 +08:00
曹延义
5a652d9ef6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 15:57:00 +08:00
tianshujie
7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
李玉春
d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
tianshujie
90946ab3d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 09:23:23 +08:00
tianshujie
061d5050f7 * Adjust the record effort style. 2022-09-27 13:24:14 +08:00
曹延义
0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00
tianshujie
36744c5175 * Adjust the record effort style. 2022-09-27 08:32:17 +08:00
tianshujie
e479767a69 * Adjust the record effort style. 2022-09-26 15:28:05 +08:00
tianshujie
dfe1c9dc39 * Fix bug #27875. 2022-09-23 15:54:04 +08:00
dingyongliang
09e50c54e8 * task #70014, rm zebra bg. 2022-09-23 05:35:11 +00:00
曹延义
ee0eafe9c6 * Optimize record estimate style. 2022-09-23 09:32:18 +08:00
liyuchun
bf10b415df Merge branch 'zenops_44' into zenops_46 2022-09-20 08:33:44 +08:00
liuhong
624c000f7d *Fix bug #27183 for newline when kanban create task. 2022-09-19 02:15:34 +00:00
wangyidong
0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
曹延义
d5fa809755 Merge branch 'master' into zenops_44 2022-09-09 10:59:26 +08:00