Commit Graph
1537 Commits
Author SHA1 Message Date
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
tianshujie c0377d939a * Fix bug #28476. 2022-10-11 16:22:13 +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
宋辰轩 05b8fa3317 * Fix bug for api requests using json. 2022-10-09 14:12:51 +08:00
zenggang af225c1284 * Fix bug#28284 2022-10-09 03:27:18 +00:00
tianshujie d375b98af6 * Fix bug #28256. 2022-09-30 14:01:33 +08:00
tianshujie 73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +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
wangyidong e7d65e1dce Merge branch 'sprint/zentaopms230' 2022-09-01 13:28:26 +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
王怡栋 5580dd55d9 Merge branch 'master_liuhong' into 'master'
*Fix bug

See merge request easycorp/zentaopms!5122
2022-08-26 02:10:06 +00:00
liuhong c14d0ed155 *Fix bug before #64879. 2022-08-26 02:04:50 +00:00
tanghucheng 827d6f5082 * Fix bug #26903 and Fix todo unit test. 2022-08-26 09:09:45 +08:00
liuhong d1576572ff *Fix bug 2022-08-25 06:49:05 +00:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
tianshujie ee63dc4f17 * Finish task #64967. 2022-08-22 09:24:18 +08: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
wangyidong 1a9905ec88 * adjust for add team status. 2022-08-18 16:28:37 +08: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 a998967592 * Finish task #65551. 2022-08-18 08:21:33 +08:00
liumengyi 698510fadf * Fix bug #26325. 2022-08-12 13:13:38 +08:00
liumengyi c5522146da * Fix bug #26325. 2022-08-12 13:12:56 +08:00
liumengyi 9713a1d816 * Optimize code for task #63694. 2022-08-09 16:04:27 +08:00
liumengyi a286f17021 * Modify language items for task #63694. 2022-08-09 15:42:18 +08:00
liumengyi 45ba659ef9 * Add language item for task #63694. 2022-08-09 15:16:47 +08:00
liumengyi 7252dc6b7c * Finish task #63694. 2022-08-09 14:51:15 +08:00
liumengyi 28bd299fee * Fix bug for task #62949. 2022-08-05 15:04:34 +08:00
tianshujie a09b7662d7 * Finish task #62936. 2022-08-03 17:15:49 +08:00
tianshujie 175fd06bc2 * Finish task #62936. 2022-08-03 17:07:23 +08:00
liumengyi 08ffbda087 * Optimize code for task #62949. 2022-08-03 09:03:19 +08:00
liumengyi 7c8df39c3c * Finish task #62949. 2022-08-02 16:08:10 +08:00