Commit Graph
4271 Commits
Author SHA1 Message Date
王怡栋 423dfcd7e9 Merge branch 'cyy_bug' into 'master'
* Modify edit multi task.

See merge request easycorp/zentaopms!5512
2022-09-23 05:50:19 +00:00
tianshujie a20a8b6cdf * Fix bug #27871. 2022-09-23 13:49:57 +08:00
liuhong 047cd27da8 *Fix bug #27190 for adjust code. 2022-09-23 05:43:34 +00:00
liuhong 9f309bdeab *Fix bug #27190. 2022-09-23 05:39:06 +00:00
dingyongliang 09e50c54e8 * task #70014, rm zebra bg. 2022-09-23 05:35:11 +00:00
曹延义 8ce8855258 * Modify edit multi task. 2022-09-23 11:52:00 +08:00
曹延义 5667c2cade * Fix bug #27854. 2022-09-23 11:22:36 +08:00
tianshujie 6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
王怡栋 16d1f76ca0 Merge branch 'sprint/cyy_optimize' into 'master'
* Optimize record estimate style.

See merge request easycorp/zentaopms!5499
2022-09-23 02:04:15 +00:00
曹延义 a02d6c751e * Optimize record style. 2022-09-23 09:46:31 +08:00
曹延义 ee0eafe9c6 * Optimize record estimate style. 2022-09-23 09:32:18 +08:00
王怡栋 c77ee31e31 Merge branch 'sprint/hufangzhou_feedback_863' into 'master'
* Handle feedback #863.

See merge request easycorp/zentaopms!5438
2022-09-23 01:23:43 +00:00
tianshujie 3d210a3666 * Finish task #70098. 2022-09-23 09:15:01 +08:00
tianshujie 6fd346708e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task 2022-09-23 08:08:42 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
tianshujie 4908ead6e8 * Finish task #70098. 2022-09-22 18:03:03 +08:00
tianshujie 500078a229 * Finish task #70096. 2022-09-22 17:31:40 +08:00
tianshujie 52fb3e71f7 * Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096. 2022-09-22 16:58:27 +08:00
曹延义 e500e05598 * Finish task #70093. 2022-09-22 16:21:56 +08:00
曹延义 b82fe4e667 * Finish task #70099. 2022-09-22 16:00:42 +08:00
曹延义 0ece96c860 * Finish task #70100. 2022-09-22 15:23:18 +08:00
曹延义 1d195ca297 * Finish task #70095. 2022-09-22 15:14:22 +08:00
tianshujie 073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
hufangzhou 2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
tianshujie a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
hufangzhou 0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
wangyidong 42e85921d6 * code for task #69715. 2022-09-21 09:19:47 +08:00
zhouxin 6ff8f6ba41 * Resolve feedback. 2022-09-20 17:24:37 +08:00
liyuchun bf10b415df Merge branch 'zenops_44' into zenops_46 2022-09-20 08:33:44 +08:00
wangyidong 47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +08:00
王怡栋 fea946a6d0 Merge branch 'master_xieqiyu_27528' into 'master'
* Fix bug#27528.

See merge request easycorp/zentaopms!5384
2022-09-19 05:37:47 +00:00
王怡栋 0801b4a668 Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183

See merge request easycorp/zentaopms!5388
2022-09-19 05:36:46 +00:00
wangyidong ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +08:00
liuhong 624c000f7d *Fix bug #27183 for newline when kanban create task. 2022-09-19 02:15:34 +00:00
xieqiyu 104787503b * Fix bug#27528. 2022-09-19 00:19:56 +00:00
wangyidong d6f395cc1b * fix bug #27012. 2022-09-16 15:00:21 +08:00
wangyidong 633266d9e5 * fix bug #27012. 2022-09-16 14:58:54 +08:00
wangyidong a497bafb9f * fix bug. 2022-09-15 10:49:40 +08:00
wangyidong bb9aa91422 * adjust for finish page style. 2022-09-14 17:34:28 +08:00
wangyidong 7dbf59d067 * Ajax refresh view page when close effort modal. 2022-09-14 15:53:32 +08:00
wangyidong 8db145922d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-14 13:40:05 +08:00
wangyidong 2b75baa004 * fix bug #27472. 2022-09-14 13:39:40 +08:00
sunguangming 3b8b7d2681 * Add lang 'my' to task. 2022-09-14 08:57:53 +08:00
wangyidong 383bee843a * adjust for delete effort logic. 2022-09-13 17:22:13 +08:00
wangyidong 0e46ac4a91 * fix bug #27468. 2022-09-13 16:36:32 +08:00
wangyidong ee148d3a0e * fix bug #27447. 2022-09-13 15:29:55 +08:00
wangyidong 3dc0abf2d1 * adjust for check effort consumed. 2022-09-13 13:58:13 +08:00
wangyidong 09694f3751 * adjust for edit effort. 2022-09-13 13:37:13 +08:00
wangyidong 0142653d2b * adjust lang. 2022-09-13 13:21:14 +08:00