Commit Graph
2439 Commits
Author SHA1 Message Date
胡方舟 2027a69923 Merge branch 'sprint/228' into 'master'
Sprint/228

See merge request easycorp/zentaopms!5015
2022-08-18 07:53:30 +00:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
王怡栋 fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
xieqiyu 7ecf79a163 * Fix bug#26545. 2022-08-16 16:36:03 +08:00
tianshujie 2e8cc2c19f * Restore code. 2022-08-15 19:37:05 +08:00
tianshujie 396673bd6d * Refactor the getStats method under the project. 2022-08-15 18:57:50 +08:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
tianshujie 4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08:00
zhujinyong 50479852ea Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-15 08:47:48 +08:00
liuyongkai 4f60c73ab5 * Fix bug #26364 2022-08-12 08:52:29 +00:00
曾刚 de80b35803 * Fix bug#26389,26333,26328 2022-08-12 08:17:54 +00:00
liumengyi f540e58388 * Fix bug. 2022-08-12 14:25:29 +08:00
tianshujie 4cc14dfe59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-11 11:04:58 +08:00
王怡栋 8901f60b25 Merge branch 'sprint/224_liumengyi_fixbug' into 'master'
* Fix bug #26246.

See merge request easycorp/zentaopms!4917
2022-08-11 02:26:49 +00:00
mayue b7310d4748 * Fix bug 25891. 2022-08-11 10:12:23 +08:00
liumengyi 845b829aaa * Fix bug #26246. 2022-08-11 10:08:06 +08:00
tianshujie 6c0c3a3cda * Fix bug #26110. 2022-08-11 09:30:06 +08:00
孙广明 d4df3b975d Merge branch 'lyk_fixbug' into 'master'
* Fix bug of xiangmu

See merge request easycorp/zentaopms!4906
2022-08-11 00:18:46 +00:00
liuyongkai fd46c9fd62 * Fix bug of xiangmu 2022-08-10 09:15:36 +00:00
tianshujie 9b9d7addb6 * Fix bug #26243. 2022-08-10 16:05:10 +08:00
孙广明 26fe219145 Merge branch 'lyk_25249' into 'master'
* Fix bug #25249

See merge request easycorp/zentaopms!4884
2022-08-10 05:57:30 +00:00
王怡栋 87889f1498 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of edit execution can change closedDate.

See merge request easycorp/zentaopms!4887
2022-08-10 05:51:01 +00:00
xieqiyu 72f038d379 * Fix bug of edit execution can change closedDate. 2022-08-10 11:20:05 +08:00
liumengyi 986ff8cb6c * Fix bug #26109. 2022-08-10 11:09:20 +08:00
Hao Sun da2fa732bf * fix white-space in table. 2022-08-10 03:08:56 +00:00
liuyongkai fa4d37f1a2 * Fix bug #25249 2022-08-10 03:01:48 +00:00
liumengyi 0ee1e4a63b * Finish task #63891. 2022-08-10 09:55:02 +08:00
王怡栋 896f7d2fb1 Merge branch 'master_liuhong_63775' into 'master'
*Finish task #63775

See merge request easycorp/zentaopms!4873
2022-08-10 01:31:10 +00:00
王怡栋 210e4a4d81 Merge branch 'tanghucheng_task' into 'master'
* Finish task #63793.

See merge request easycorp/zentaopms!4870
2022-08-10 01:30:32 +00:00
王怡栋 b31a44f1a4 Merge branch 'sprint/224_tianshujie' into 'master'
Sprint/224 tianshujie

See merge request easycorp/zentaopms!4878
2022-08-10 01:30:17 +00:00
tianshujie aa031fd130 * In classic mode, search execution does not show the owning project. 2022-08-10 09:11:49 +08:00
tianshujie 1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08:00
tanghucheng d4fb654e5a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_task 2022-08-10 08:26:32 +08:00
xieqiyu 930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
tanghucheng 2b1046d40b * Finish task #63793. 2022-08-09 17:34:51 +08:00
王怡栋 964fe5fe4b Merge branch 'master_liuhong_35865' into 'master'
Finish task #35865.

See merge request easycorp/zentaopms!4867
2022-08-09 08:48:24 +00:00
王怡栋 65ed4e9ecb Merge branch 'tanghucheng_task' into 'master'
* Finish task #63794.

See merge request easycorp/zentaopms!4863
2022-08-09 08:27:21 +00:00
李玉春 016ef434ab Merge branch 'sprint/224_tianshujie_63692' into 'master'
Sprint/224 tianshujie 63692

See merge request easycorp/zentaopms!4866
2022-08-09 08:19:33 +00:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
liuhong 12f1f00b16 Finish task #35865. 2022-08-09 07:21:41 +00:00
tanghucheng fb0cf8c0bb * Code for gantt language. 2022-08-09 14:31:05 +08:00
tanghucheng bbf28d9bc0 * Finish task #63794. 2022-08-09 14:24:01 +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
王怡栋 ff55e9ca2e Merge branch 'master_liuhong_63772' into 'master'
* Code for task#63772. Fix bug of plan empty when at the page of project bug...

See merge request easycorp/zentaopms!4854
2022-08-09 05:33:04 +00:00
王怡栋 19f7a0df69 Merge branch 'sprint/224_liumengyi_63691' into 'master'
* Finish task #63691.

See merge request easycorp/zentaopms!4850
2022-08-09 05:30:07 +00:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
xieqiyu 5d422ab3cb * Code for task#63775. 2022-08-09 10:07:45 +08:00
xieqiyu 8a159ba714 * Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product. 2022-08-09 09:39:58 +08:00
liuhong a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
liuhong bd88264c46 *Finish task #63775 2022-08-08 08:08:02 +00:00