Commit Graph
4480 Commits
Author SHA1 Message Date
lanzongjun 3438ffbbc0 * fix bug #27793 2022-09-22 15:27:04 +08:00
lanzongjun db22ae810a Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-22 15:24:55 +08:00
lanzongjun 4c7fe09c1e * fix bug #27793 2022-09-22 15:24:24 +08:00
王怡栋 1b67944be1 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27786

See merge request easycorp/zentaopms!5485
2022-09-22 06:55:30 +00:00
lanzongjun c4c57794ea * fix bug #27788 2022-09-22 14:49:33 +08:00
王怡栋 66d557a280 Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
Sprint/zentaopms240 lanzongjun

See merge request easycorp/zentaopms!5470
2022-09-22 06:42:54 +00:00
lanzongjun 9ca3193772 Merge branch 'sprint/zentaopms240_lanzongjun' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240_lanzongjun 2022-09-22 11:11:48 +08:00
lanzongjun 4acd0b7401 fix noSprint create default execu 2022-09-22 09:42:30 +08:00
wangyidong 64bb6eb19f * adjust for no sprint menu. 2022-09-22 09:42:01 +08:00
lanzongjun bfba29a435 fix noSprint def val 2022-09-22 09:39:48 +08:00
王怡栋 e5cad7fd7a Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
* fix bug #27684#27607

See merge request easycorp/zentaopms!5460
2022-09-21 09:14:08 +00:00
wangyidong 6bb5b51ca8 * adjus for create story for no sprint project. 2022-09-21 16:41:39 +08:00
lanzongjun 222a65223f * fix meeting 2022-09-21 16:30:05 +08:00
王怡栋 259e03174d Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240'
fix noSprint

See merge request easycorp/zentaopms!5451
2022-09-21 07:02:35 +00:00
wangyidong d4f7d6725f * fix for create project. 2022-09-21 14:20:57 +08:00
lanzongjun 6ab0868d6e resolve conflict 2022-09-21 13:37:43 +08:00
lanzongjun 24f686b75a fix noSprint 2022-09-21 13:35:42 +08:00
王怡栋 c360743193 Merge branch 'sprint/zentaopms240_daitingting_optimize' into 'sprint/zentaopms240'
* Rename noExecution to noSprint.

See merge request easycorp/zentaopms!5436
2022-09-21 01:27:42 +00:00
wangyidong 42e85921d6 * code for task #69715. 2022-09-21 09:19:47 +08:00
daitingting 8490bf7dbf * Rename noExecution to noSprint.
* Optimize codes.
2022-09-21 01:12:39 +00:00
wangyidong 8be950d693 * code for task #69707. 2022-09-21 08:25:56 +08:00
wangyidong 64689cbd17 * code for task #69707. 2022-09-20 15:44:33 +08:00
lanzongjun 305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
lanzongjun 322ac53e2b resolve conflict 2022-09-19 14:55:20 +08:00
lanzongjun 8f92f57390 * finish task #69255 2022-09-19 14:52:21 +08:00
wangyidong ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +08:00
wangyidong 6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00
wangyidong 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
lanzongjun 49faebaad7 * task #69250#69251 2022-09-16 14:58:39 +08:00
lanzongjun b0c3bccc9d * task #69250 2022-09-16 11:07:26 +08:00
lanzongjun 2578a14d63 * task #69250 2022-09-15 10:45:05 +08:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
liumengyi 2500ad1fb7 * Fix bug #27428. 2022-09-09 09:45:33 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
wangyidong cf1399e0f6 * adjust for unit test. 2022-09-08 11:35:25 +08:00
wangyidong 6a6a049170 * fix bug. 2022-09-07 15:50:23 +08:00
wangyidong 4092d95876 * code for task #68204. 2022-09-07 15:01:27 +08:00
liumengyi ed78e77035 * Fix bug #27020. 2022-09-06 15:04:00 +08:00
liumengyi ea3071279b * Fix bug #27020. 2022-09-06 14:52:24 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
孙广明 a321b87f1c Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
2022-09-06 00:42:27 +00:00
liumengyi 6a2deee711 * Fix bug for task #67727. 2022-09-06 08:39:49 +08:00
liumengyi 796d0423bc * Fix bug #27020. 2022-09-05 16:30:02 +08:00
xieqiyu 066b6a129d * Modify project and release test case. 2022-09-04 12:20:01 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
sunguangming 54c54108e6 * Code for task effort. 2022-09-02 14:17:39 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00:00
王怡栋 121e8fc33d Merge branch 'sprint/235_dongli_bug26188' into 'master'
* Fix bug #26188,#26715.

See merge request easycorp/zentaopms!5241
2022-09-01 07:53:43 +00:00