Commit Graph
2904 Commits
Author SHA1 Message Date
王怡栋 97fb666982 Merge branch 'sprint/master_zhouxudong' into 'master'
* Optimization task #64884.

See merge request easycorp/zentaopms!5032
2022-08-22 05:55:46 +00:00
zhouxudong 183e45ec05 * Optimization task #64884. 2022-08-22 05:12:58 +00:00
王怡栋 4446295fd7 Merge branch 'sprint_liuhong' into 'master'
Sprint liuhong

See merge request easycorp/zentaopms!5040
2022-08-22 01:31:06 +00:00
liuhong 650d491c44 *Fix bug 2022-08-19 08:30:20 +00:00
zhouxudong c42f97c564 * Optimization task #64884. 2022-08-19 06:04:44 +00:00
liuhong f0cdfea18a *Fix bug 2022-08-19 02:39:40 +00:00
王怡栋 5d28a2973f Merge branch 'sprint/229' into 'master'
Sprint/229

See merge request easycorp/zentaopms!5018
2022-08-19 00:50:35 +00:00
liuhong c8497c2b78 Merge branch 'master_liuhong_26228' into sprint_liuhong 2022-08-18 02:55:01 +00:00
liuhong 3fcef9c093 *Finish task #64879. 2022-08-18 02:51:35 +00:00
liuhong 0ec7394ed8 *Fix bug #2622.8 2022-08-18 02:02:47 +00:00
王怡栋 dd1761b300 Merge branch 'sprint/229_zhouxudong_64884' into 'sprint/229'
* Finish task #64884.

See merge request easycorp/zentaopms!4992
2022-08-17 07:29:08 +00:00
周旭东 a3ebcf33d5 Update control.php 2022-08-17 07:18:11 +00:00
zhouxudong ab7e863b62 * Finish task #64884. 2022-08-17 01:03:45 +00:00
zhouxudong c322d1cea5 * Finish task #64877. 2022-08-15 12:59:27 +00:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
王怡栋 1f1242ca9c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
add cp gantt task move

See merge request easycorp/zentaopms!4953
2022-08-12 09:06:24 +00:00
lanzongjun 5915e3189c add gantt move order 2022-08-12 17:04:49 +08:00
王怡栋 71093a980c Merge branch 'sprint/224_dongli_bug26194' into 'master'
* Fix bug #26194.

See merge request easycorp/zentaopms!4950
2022-08-12 08:49:11 +00:00
lanzongjun 886c392287 add cp gantt task move 2022-08-12 16:18:57 +08:00
lanzongjun 9fa80dcd94 add cp gantt task move 2022-08-12 16:15:08 +08:00
dongli 8ae85f440c * Fix bug #26194. 2022-08-12 07:22:28 +00:00
tianshujie 26085d7a41 * Operations type execution and story or design type stage do not display story field. 2022-08-12 14:56:27 +08:00
mayue b7310d4748 * Fix bug 25891. 2022-08-11 10:12:23 +08:00
liuyongkai fa4d37f1a2 * Fix bug #25249 2022-08-10 03:01:48 +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 c34c0276b2 * Finish task #63692. 2022-08-09 16:18:18 +08:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
tianshujie 1200e97722 * Finish task #63692. 2022-08-09 15:19:16 +08:00
王怡栋 2dec053c27 Merge branch 'sprint/221_dongli_bug63666' into 'master'
* Fix bug #63666.

See merge request easycorp/zentaopms!4861
2022-08-09 06:50:20 +00:00
dongli bec6a7c3bf * Fix bug #63666. 2022-08-09 06:09:17 +00:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
孙广明 e3eeddfbc0 Merge branch 'lyk_25690' into 'master'
* Fix bug #25690

See merge request easycorp/zentaopms!4846
2022-08-08 08:59:32 +00:00
liuyongkai dafa228a04 * Fix bug #25690 2022-08-08 08:57:42 +00:00
孙广明 ef27964ad2 Merge branch 'lyk_25690' into 'master'
* Fix bug 25690.

See merge request easycorp/zentaopms!4841
2022-08-08 08:30:21 +00:00
liuyongkai 327336b7bf * Fix bug 25690. 2022-08-08 05:59:13 +00:00
tanghucheng 36b07367c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-08 12:07:23 +08:00
王怡栋 ed951dc12e Merge branch 'sprint/gantt_upgrade' into 'master'
Sprint/gantt upgrade

See merge request easycorp/zentaopms!4835
2022-08-08 03:25:42 +00:00
tanghucheng d71cb4dd67 * Code for port. 2022-08-08 11:07:36 +08:00
mayue b338d96743 * Optimize code. 2022-08-08 10:41:26 +08:00
mayue fc13fad289 resolve conflict 2022-08-08 10:39:25 +08:00
lanzongjun 8adc70569f fix 2022-08-05 14:21:04 +08:00
tanghucheng 3bfdc7d342 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-05 13:07:31 +08:00
孙广明 9f323c631a Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249

See merge request easycorp/zentaopms!4816
2022-08-05 03:34:42 +00:00
liuyongkai eef158bcb6 * Fix bug 26002,25249 2022-08-05 03:32:47 +00:00
liuyongkai 697ecffce7 * Fix bug #26002,25249 2022-08-05 03:29:29 +00:00
liuyongkai 8837c4c100 * Fix bug $26002,25249 2022-08-05 03:08:10 +00:00
王怡栋 351b8f37f5 Merge branch 'sprint/221_liumengyi_fixbug' into 'master'
* Fix bug #25978, #25968, #26020.

See merge request easycorp/zentaopms!4814
2022-08-05 02:51:24 +00:00
liumengyi f33721b4a9 * Fix bug #25978. 2022-08-05 10:38:23 +08:00
liumengyi 3dc8d9c097 * Fix issue #710. 2022-08-05 10:18:43 +08:00
mayue 02e14250d5 Merge branch 'sprint/gantt_upgrade' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/max40_gantt_upgrade 2022-08-05 09:49:54 +08:00