Commit Graph
35729 Commits
Author SHA1 Message Date
王怡栋 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 c34c0276b2 * Finish task #63692. 2022-08-09 16:18:18 +08:00
tianshujie d2852b1b1c * Finish task #63692. 2022-08-09 16:12:39 +08:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
tianshujie 87aa837d78 * Finish task #63692. 2022-08-09 15:26:35 +08:00
王怡栋 0d2912cb84 Merge branch 'sgm_filepriv' into 'master'
* Finish task #64212.

See merge request easycorp/zentaopms!4865
2022-08-09 07:22:42 +00:00
tianshujie 564256a29c * Finish task #63692. 2022-08-09 15:22:40 +08:00
tianshujie f28f7e6ffd * Finish task #63692. 2022-08-09 15:17:07 +08:00
sunguangming 5e2135766a * Finish task #64212. 2022-08-09 15:16:14 +08:00
王怡栋 4dd5bb212a Merge branch 'master_liuhong_63780' into 'master'
Master liuhong 63780

See merge request easycorp/zentaopms!4860
2022-08-09 06:53:21 +00: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
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
dongli bec6a7c3bf * Fix bug #63666. 2022-08-09 06:09:17 +00:00
王怡栋 8b4a96dc13 Merge branch 'master_liuhong_63778' into 'master'
Master liuhong 63778

See merge request easycorp/zentaopms!4859
2022-08-09 05:35:05 +00:00
王怡栋 1ed1ec0ab8 Merge branch 'master_liuhong_63781' into 'master'
Master liuhong 63781

See merge request easycorp/zentaopms!4858
2022-08-09 05:34:39 +00: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
王怡栋 2d5d7cf419 Merge branch 'master_liuhong_63779' into 'master'
Master liuhong 63779

See merge request easycorp/zentaopms!4855
2022-08-09 05:33:30 +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
王怡栋 a106fcb5db Merge branch 'master_liuhong_63777' into 'master'
*Finish task #63777.

See merge request easycorp/zentaopms!4852
2022-08-09 05:31:12 +00:00
王怡栋 5e842bff36 Merge branch 'importExport' into 'master'
* Add language file for port.

See merge request easycorp/zentaopms!4849
2022-08-09 05:30:28 +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 bd736db63c * Finish task #63692. 2022-08-09 12:15:44 +08:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
wangyidong 038b43e8f5 * adjust for upgrade. 2022-08-09 11:32:18 +08:00
xieqiyu 33b398b7f8 * Code for task#63778. Change link story in release. 2022-08-09 11:18:52 +08:00
liuhong e88cfbcb73 *Finish task #63778 2022-08-09 03:08:21 +00:00
wangyidong 402d439ee0 * fix bug #26164. 2022-08-09 10:52:08 +08:00
xieqiyu f323e7ad91 * Code for task#63772. 2022-08-09 10:46:05 +08:00
liuhong bb856c1fce *Finish task #63781. 2022-08-09 02:32:04 +00:00
xieqiyu 91e642a863 * Code for task#63780. 2022-08-09 10:29:33 +08:00
王怡栋 b1c4645857 Merge branch 'fix_code_error' into 'master'
* Fix code error.

See merge request easycorp/zentaopms!4853
2022-08-09 01:56:11 +00:00
mayue 6c8cdaad1f * Fix code error. 2022-08-09 09:50:37 +08:00
liuhong 183e53a974 *Finish task #63779. 2022-08-09 01:40:01 +00: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 0fa2de0ff8 *Finish task #63781. 2022-08-09 01:23:43 +00:00
liuhong cc85ddfbc0 *Finish task #63780. 2022-08-09 01:01:50 +00:00
wangyidong 2769e53ea0 * adjust for task #63802. 2022-08-09 08:54:42 +08:00
tanghucheng f30414f8a3 * Add language file for port. 2022-08-09 08:36:12 +08:00
王怡栋 652a3456f0 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4848
2022-08-09 00:33:29 +00:00
tanghucheng 77133a8f4b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-09 08:31:43 +08:00
liuhong b5e0147863 *Finish task #63779. 2022-08-08 22:44:50 +00:00
liuhong f0e17cd3f9 *Finish task #63778. 2022-08-08 22:24:33 +00:00
liuhong 75ddc3fd14 *Finish task #63777. 2022-08-08 21:32:15 +00:00
tanghucheng 851af309cb * Code for port. 2022-08-08 23:26:34 +08:00
liuhong 47db91c402 *Finish task #63772. 2022-08-08 15:25:34 +00:00
liuhong a2adce2bb6 *Finish task #35865. 2022-08-08 13:39:32 +00:00
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00