Commit Graph
1316 Commits
Author SHA1 Message Date
王怡栋 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
wangyidong 6bb5b51ca8 * adjus for create story for no sprint project. 2022-09-21 16:41:39 +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 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 63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +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
xieqiyu 066b6a129d * Modify project and release test case. 2022-09-04 12:20:01 +08: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
hufangzhou aa7fec1a32 * Fix bug #25898. 2022-08-31 17:08:38 +08:00
liumengyi 6db1eac73f * Finish task #66938. 2022-08-29 11:07:47 +08:00
tianshujie 915baa54b5 * Fix bug #26936. 2022-08-29 10:09:10 +08:00
王怡栋 03ea51fe76 Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.

See merge request easycorp/zentaopms!5076
2022-08-24 01:14:44 +00:00
王怡栋 0036bac572 Merge branch 'master_liuhong_26000' into 'master'
*Fix bug #26000.

See merge request easycorp/zentaopms!5047
2022-08-24 00:46:46 +00:00
liuhong 329238d8cd *Fix bug #26000. 2022-08-23 09:23:09 +00:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
liuhong 7d89582ab7 *Fix bug #26000. 2022-08-19 07:10:02 +00:00
dongli e3800e4e49 * Finish task #64969. 2022-08-19 05:31:03 +00:00
dongli 9fa036cb34 Revert "* Finish task #64969."
This reverts commit bacc10ccc0.
2022-08-19 05:31:02 +00:00
dongli 93adfc3971 * Finish task #64969. 2022-08-19 05:31:02 +00:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
xieqiyu 4da9aac7c3 * Fix bug#26177. 2022-08-12 13:49:10 +08:00
tianshujie 6d662334f9 * Fix bug #26167. 2022-08-10 10:16:23 +08:00
王怡栋 6ba5f3bd67 Merge branch 'master_liuhong_35865' into 'master'
Master liuhong 35865

See merge request easycorp/zentaopms!4857
2022-08-09 05:34:18 +00:00
liuhong a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun 15cce6ebfa fix cp project 2022-08-08 18:18:09 +08:00
wangyidong 1204fcf8db Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-05 08:46:32 +08:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
xieqiyu f9f47e14cb * Fix bug#26019. 2022-08-05 08:32:27 +08:00
wangyuting2 1b2f9f68e6 * Adjust assetlib caselib approval menu. 2022-08-04 13:47:12 +08:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
wangyidong d4c95e6e9c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 09:14:41 +08:00