Commit Graph
1749 Commits
Author SHA1 Message Date
zhujinyong a65662436d Merge branch 'sprint/biz17' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/biz17 2022-11-08 14:09:44 +08:00
liumengyi 9c1f8b2be1 * Fix bug #29325. 2022-11-08 13:02:01 +08:00
wangzemei 261eb124ae * fix bug 29345 2022-11-07 13:51:53 +08:00
lanzongjun 30bae3ed2d * fix bug ticket count show 2022-11-07 10:51:18 +08:00
tianshujie 4ea862f2ee * Fix bug #28222. 2022-11-01 14:20:20 +08:00
tianshujie 438bd7cb8c * Delete useless code. 2022-10-31 17:13:54 +08:00
tianshujie 5543d1ec40 * Finish task #74082. 2022-10-31 17:09:59 +08:00
tianshujie e56e4acd07 * Remove useless code. 2022-10-31 16:59:58 +08:00
tianshujie c79a78afe4 * Fix bug #28222. 2022-10-31 15:43:28 +08:00
tianshujie 11f969dc9f * Finish task #74082. 2022-10-31 15:24:22 +08:00
tianshujie 2bf41732ef * Fix bug #29000. 2022-10-28 16:08:40 +08:00
tianshujie 5031451ce8 * Fix bug #29000. 2022-10-28 09:53:28 +08:00
caoyanyi f974f45e90 Merge branch 'master' into cyy_optimize 2022-10-27 15:46:26 +08:00
caoyanyi 9d6646cc7d * Add bug list style. 2022-10-27 14:01:53 +08:00
李玉春 954e5e6b14 Merge branch 'cyy_optimize' into 'master'
* Modify product plan desc style.

See merge request easycorp/zentaopms!5901
2022-10-27 05:52:41 +00:00
wangyidong bac3655fee * fix bug #28976. 2022-10-27 09:56:24 +08:00
caoyanyi 6570992da4 * Fix bug #28997. 2022-10-27 09:15:40 +08:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
caoyanyi b2a64e9f25 * Modify status style. 2022-10-26 13:41:39 +08:00
caoyanyi a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
caoyanyi 3867eb0f55 * Code for execution #3238. 2022-10-24 16:56:27 +08:00
Lufei 4628dfe98a - Remove useless loadModel search. 2022-10-20 14:25:07 +08:00
wangzemei 25f8023fef * Solve width calculation problems 2022-10-19 14:31:55 +08:00
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
zhouxin efbbc8a15e * Fix bug. 2022-10-18 15:34:05 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
zhouxin 9593f24d92 * Fix bugs. 2022-10-17 23:05:00 +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
tianshujie e05f1e7f89 * Finish task #72374. 2022-10-17 16:58:30 +08:00
zhouxin 4bab4bc356 * Fix some bugs of ticket. 2022-10-17 14:01:04 +08:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
zhouxin da5d515b45 * Add search form for my ticket. 2022-10-17 09:09:09 +08:00
曹延义 1929b943c2 * Code for story #38730. 2022-10-14 09:58:09 +08:00
zhouxin 9d1b695b20 * Fix bugs of ticket. 2022-10-11 15:40:00 +08:00
李玉春 30238c658f Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888

See merge request easycorp/zentaopms!5723
2022-10-11 06:51:55 +00:00
wangzemei e31a9c3a01 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_28406 2022-10-11 14:44:04 +08:00
tianshujie 65d21e59b6 Delete unnecessary Spaces. 2022-10-11 13:49:39 +08:00
tianshujie f64f1c4848 * Finish task #71888. 2022-10-11 13:22:11 +08:00
tianshujie df424fcefe * Fix bug #28431. 2022-10-11 13:19:03 +08:00
tianshujie 5ea1955b6d * Fix todo list error. 2022-10-11 13:11:05 +08:00
tianshujie d498b40d17 * Finish task #71890. 2022-10-11 10:55:21 +08:00
wangzemei 66dfa21542 * fix bug28406 2022-10-11 10:05:47 +08:00
李玉春 6a5148bbe8 Merge branch 'sprint/247_tianshujie_71905' into 'master'
Sprint/247 tianshujie 71905

See merge request easycorp/zentaopms!5713
2022-10-10 09:16:37 +00:00
tianshujie 11ab1572af * Delete unnecessary Spaces. 2022-10-10 16:58:25 +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 2d2f0f63c3 * Delete unnecessary Spaces. 2022-10-10 16:32:22 +08:00
tianshujie 6947f423f4 * Finish task #71889. 2022-10-10 16:16:55 +08:00
李玉春 e9f5c5add9 Merge branch 'sprint/247_wzm_71885' into 'master'
* finish task #71885 && #71893

See merge request easycorp/zentaopms!5705
2022-10-10 08:14:44 +00:00
李玉春 713d35512d Merge branch 'sprint/gfl_71881' into 'master'
* finish task 71881

See merge request easycorp/zentaopms!5701
2022-10-10 08:06:26 +00:00
zhouxin 0cfb69ac5b * Finish task #71836. 2022-10-10 15:23:22 +08:00