Commit Graph
604 Commits
Author SHA1 Message Date
xieqiyu ef70a4c142 * Fix bug#30188. 2022-11-24 09:57:35 +08:00
xieqiyu bfafc2996d * Fix bug#30026. 2022-11-23 10:54:51 +08:00
zenggang 8370d27ee4 * Fix feedback#1231 2022-11-16 08:24:12 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
tianshujie 73dd27e207 * Delete unnecessary Spaces. 2022-10-28 10:46:21 +08:00
tianshujie 1b575f2024 * Fix bug #29081. 2022-10-28 09:56:54 +08:00
tianshujie 5031451ce8 * Fix bug #29000. 2022-10-28 09:53:28 +08:00
tianshujie c96621c63a * Fix bug #29015. 2022-10-28 09:37:22 +08:00
tianshujie 118098b77e * Fix bug #29048. 2022-10-28 08:42:12 +08:00
caoyanyi 467f1ba3e1 * Modify todo page style. 2022-10-27 14:33:04 +08:00
caoyanyi 249ef3592c * Fix bug #29001. 2022-10-27 09:26:28 +08:00
caoyanyi 6b589558f0 * Fix bug #28990. 2022-10-27 08:38:14 +08:00
caoyanyi e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +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
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
tianshujie 40f225d93b * Finish task #71890. 2022-10-11 15:11:14 +08:00
tianshujie e1aa6ac3d4 * Fix bug #28433. 2022-10-11 15:06:55 +08:00
李玉春 bd488328ab Merge branch 'sprint/gfl_71875' into 'master'
* finish task 71875

See merge request easycorp/zentaopms!5716
2022-10-11 06:52:12 +00: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
tianshujie 5ffeb14e65 * Finish task #71888. 2022-10-11 13:53:50 +08:00
tianshujie 1d4bab43ab * Fix bug #28423. 2022-10-11 11:01:52 +08:00
曹延义 8f73e4d340 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gfl_71875 2022-10-11 08:36:05 +08:00
曹延义 3f32ccdcb5 * Modify bug title. 2022-10-11 08:34:53 +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 ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
曹延义 d6bd6c978b * Modify bug list style. 2022-10-10 10:05:40 +08:00
tianshujie d375b98af6 * Fix bug #28256. 2022-09-30 14:01:33 +08:00
王怡栋 20852c3bc7 Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #27020, #27004.

See merge request easycorp/zentaopms!5273
2022-09-06 07:53:08 +00:00
liumengyi 2bf626bc9f * Fix bug #27004. 2022-09-06 15:24:07 +08:00
liumengyi 6e118674b9 * Fix bug #26193. 2022-09-06 10:57:20 +08:00
李玉春 0bc581b21c Merge branch 'sprint/235' into 'master'
Sprint/235

See merge request easycorp/zentaopms!5216
2022-08-31 08:19:32 +00:00
dongli c93028b04e * Fix bug #66816. 2022-08-30 03:00:07 +00:00
liuhong ceae38f4e1 *Fix bug before 26239. 2022-08-29 03:12:43 +00:00
liuhong c14d0ed155 *Fix bug before #64879. 2022-08-26 02:04:50 +00:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
liuhong e863a2c792 *Fix bug 64879. 2022-08-19 05:30:24 +00:00
liuhong 06e7729212 *Fix bug 2022-08-19 00:47:06 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 6b6f9c39ee *Finish task #64879. 2022-08-18 02:51:35 +00:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
tianshujie 175fd06bc2 * Finish task #62936. 2022-08-03 17:07:23 +08:00
zenggang 0baf0d5fda * Finish task#62107 2022-07-26 08:51:47 +00:00
liumengyi d73346c395 * Finish task #61171, #61170. 2022-07-19 15:22:38 +08:00
liumengyi f711e0984e * Fix bug #24991. 2022-07-12 17:10:11 +08:00
zhouxudong 1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zenggang 3b87d63a4b * Fix bug #24663 2022-07-01 02:59:20 +00:00