Commit Graph
3197 Commits
Author SHA1 Message Date
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
李玉春 05e2c8242b Merge branch 'sprint/247_tianshujie_72347' into 'sprint/247'
* Finish task #72347.

See merge request easycorp/zentaopms!5824
2022-10-20 06:15:37 +00:00
李玉春 23b1e0db4c Merge branch 'sprint/cyy_72375' into 'sprint/247'
* Modify multi task activate.

See merge request easycorp/zentaopms!5826
2022-10-20 06:04:53 +00:00
tianshujie 209d2b6d8d * Adjust task list and create task page style. 2022-10-20 13:56:53 +08:00
曹延义 03e4c78c5f * Modify multi task activate. 2022-10-20 11:25:42 +08:00
tianshujie ca79d11271 * Finish task #72347. 2022-10-20 11:06:14 +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
李玉春 c266ba1006 Merge branch 'sprint/cyy_72375' into 'sprint/247'
Sprint/cyy 72375

See merge request easycorp/zentaopms!5818
2022-10-20 01:57:11 +00:00
tianshujie 4da6a0a665 * Fixed style issues with multi task. 2022-10-20 09:44:04 +08:00
曹延义 6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义 fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +08:00
tianshujie cda753b5d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-20 08:54:08 +08:00
曹延义 1b80975ac1 * Code for task #72375. 2022-10-19 17:21:35 +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 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
曹延义 3ce6ca1f4f Merge branch 'master' into sprint/247 2022-10-19 15:21:14 +08: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
tanghucheng 6c063505d6 Merge branch 'master' into tanghucheng_feedback_module 2022-10-18 15:33:45 +08:00
tianshujie 8bbf77788a * Finish task #72348. 2022-10-18 14:34:29 +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
tianshujie 8c85776666 * Finish task #72348. 2022-10-18 09:28:51 +08:00
tianshujie 86929e218d * Finish task #72348. 2022-10-18 09:21:07 +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
李玉春 bb90adf795 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug

See merge request easycorp/zentaopms!5759
2022-10-17 09:24:39 +00: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
liuhong 0e77b9f5e9 *Fix bug #28532. 2022-10-17 01:10:49 +00:00
李玉春 81ca878b03 Merge branch 'sprint/244_tianshujie_70498' into 'master'
Sprint/244 tianshujie 70498

See merge request easycorp/zentaopms!5730
2022-10-13 03:09:37 +00:00
曹延义 e29deea929 * Modify line width. 2022-10-11 17:03:40 +08:00
tianshujie 92692a6e9b * Finish task #70498. 2022-10-11 16:07:34 +08:00
guofeilong 7716314f4a * fix bug in trigger event finish 2022-10-11 08:00:24 +00:00
tianshujie 715aa2e4a4 * Finish task #70498. 2022-10-11 10:47:14 +08:00
tianshujie 9c05622f2f * Finish task #70498. 2022-10-11 10:05:22 +08:00
wangyidong 91ae21caec Merge branch 'master' into sprint/feedback_module 2022-10-11 09:33:25 +08:00
tianshujie 77a912f3d9 * Finish task #70498. 2022-10-11 09:22:32 +08:00
tianshujie 42fbc75fc3 * Finish task #70498. 2022-10-11 09:16:19 +08:00
tianshujie 294cbe7edc * Finish task #70498. 2022-10-11 09:13:31 +08:00
tianshujie 7cbb6b9505 Merge branch 'sprint/244_tianshujie_70498' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498 2022-10-11 09:11:37 +08:00
tianshujie 6e1ebabb80 * Finish task #70498. 2022-10-11 09:11:21 +08:00
曹延义 29f8aad222 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498 2022-10-10 16:56:50 +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 42cc38b87d Merge branch 'sprint/244_tianshujie_70498' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498 2022-10-10 16:20:25 +08:00