Commit Graph
44811 Commits
Author SHA1 Message Date
xieqiyu 638586bea2 * Fix bug#27445. 2022-09-09 16:44:09 +08:00
wangyidong 4bd3d07e34 Merge branch 'sprint/237_liumengyi_fixbug' 2022-09-09 15:19:04 +08:00
王怡栋 b1c87862f2 Merge branch 'master' into 'sprint/237_liumengyi_fixbug'
# Conflicts:
#   module/doc/css/createbasicinfo.css
2022-09-09 07:18:21 +00:00
王怡栋 b9564e50a1 Merge branch 'master_xieqiyu_27124' into 'master'
Master xieqiyu 27124

See merge request easycorp/zentaopms!5300
2022-09-09 07:17:43 +00:00
xieqiyu f7883bf7b7 * Fix bug#26350. 2022-09-09 15:08:06 +08:00
sunguangming abffa486a1 * Fix bug #27442. 2022-09-09 14:51:41 +08:00
xieqiyu 4d439f7337 * Fix bug#26180. 2022-09-09 14:33:29 +08:00
xieqiyu 9f28ebf56b * Fix bug#26180. 2022-09-09 14:27:18 +08:00
xieqiyu dfe4de62a5 * Fix bug#26179. 2022-09-09 14:14:53 +08:00
xieqiyu a258b7b9db * Fix bug#26156. 2022-09-09 14:11:36 +08:00
xieqiyu 8fe84e651f * Modify submit review icon. 2022-09-09 13:23:09 +08:00
liumengyi 52bdcfb8d1 * Fix bug. 2022-09-09 13:07:54 +08:00
liumengyi d2deaca78e * Fix bug. 2022-09-09 13:07:25 +08:00
王怡栋 eeaad02185 Merge branch 'sprint/tianshujie_bug' into 'master'
Sprint/tianshujie bug

See merge request easycorp/zentaopms!5299
2022-09-09 03:24:09 +00:00
xieqiyu 981aaf5755 * Fix bug#26874. 2022-09-09 11:24:04 +08:00
xieqiyu 40bc0e7966 * Fix bug#26942. 2022-09-09 11:17:37 +08:00
tianshujie e9efb56769 * Fix bug #27437. 2022-09-09 10:37:28 +08:00
tianshujie 490c0f8791 * Fix bug #27281. 2022-09-09 10:10:17 +08:00
tianshujie adb25f92b3 * Fix bug #27296. 2022-09-09 09:55:42 +08:00
liumengyi 2500ad1fb7 * Fix bug #27428. 2022-09-09 09:45:33 +08:00
wangyidong 1bb552b34d * fix bug for linear task. 2022-09-09 09:23:12 +08:00
wangyidong 7e683404db * adjust for waterfall report. 2022-09-09 09:11:07 +08:00
xieqiyu ea1b08905c * Fix bug#27124. 2022-09-09 08:19:44 +08:00
王怡栋 0e71ec7d2a Merge branch 'sprint/237_tianshujie_bug' into 'master'
* Fix bug #24318.

See merge request easycorp/zentaopms!5294
2022-09-09 00:15:17 +00:00
王怡栋 e07d28fd82 Merge branch 'master_xieqiyu_27406' into 'master'
* Fix bug#27406,#27235.

See merge request easycorp/zentaopms!5293
2022-09-09 00:14:59 +00:00
wangyidong ce91c9945e * adjust for show linear effort. 2022-09-08 17:30:50 +08:00
wangyidong 2a8eacad9c * Fix weekly report. 2022-09-08 17:30:50 +08:00
李玉春 1f19d1301c Merge branch 'cyy_api' into 'master'
* Modify report api error.

See merge request easycorp/zentaopms!5291
2022-09-08 09:04:02 +00:00
曹延义 8ff5cc1f25 * Fix bug 27149. 2022-09-08 08:57:47 +00:00
xieqiyu 924f288ed5 * Fix bug#27406,#27235. 2022-09-08 16:55:57 +08:00
王怡栋 457063cc44 Merge branch 'sprint/hufangzhou_fixxuanxuan' into 'master'
* Fix error for xuan.

See merge request easycorp/zentaopms!5292
2022-09-08 08:12:42 +00:00
hufangzhou 8fef2d9166 * Remove the unsed code. 2022-09-08 16:12:27 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
hufangzhou e828862deb * Fix error for xuan. 2022-09-08 16:04:41 +08:00
曹延义 29cc8f3ec1 * Modify report api error. 2022-09-08 07:54:24 +00:00
王怡栋 01b4d9b7d6 Merge branch 'master_xieqiyu_27354' into 'master'
* Fix bug#27354.

See merge request easycorp/zentaopms!5289
2022-09-08 07:34:16 +00:00
王怡栋 b6f17557af Merge branch 'sprint/237_hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!5290
2022-09-08 07:33:39 +00:00
xieqiyu b82ca41f3d * Fix bug#27298. 2022-09-08 15:24:20 +08:00
hufangzhou 55ce88445b * Add the new version. 2022-09-08 15:17:06 +08:00
tianshujie 3304ee781b * Fix bug #24318. 2022-09-08 14:57:34 +08:00
xieqiyu 5f427364c7 * Fix bug#27346. 2022-09-08 13:47:57 +08:00
xieqiyu 51e32c7179 * Modify lang of task. 2022-09-08 13:17:13 +08:00
wangyidong cf1399e0f6 * adjust for unit test. 2022-09-08 11:35:25 +08:00
xieqiyu 052556f908 * Fix bug#27354. 2022-09-08 11:28:18 +08:00
王怡栋 28abbc2a71 Merge branch 'master_xieqiyu_67691' into 'master'
* Code for task#67691.

See merge request easycorp/zentaopms!5288
2022-09-08 03:15:45 +00:00
xieqiyu 5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu 97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +08:00
wangyidong c7c586691d * fix bug #27344. 2022-09-08 10:31:10 +08:00
wangyidong a195088ba3 * fix for edit team. 2022-09-08 10:07:45 +08:00
wangyidong 00b0aa0ba0 * adjust for create effort. 2022-09-08 09:47:56 +08:00