Commit Graph
43376 Commits
Author SHA1 Message Date
tanghucheng 824b9219d9 * Code for gantt. 2022-08-10 13:34:57 +08:00
tanghucheng 3317e70203 * Code for port. 2022-08-10 13:20:37 +08:00
tanghucheng b1544eb12e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tanghucheng_task 2022-08-10 12:46:22 +08:00
tanghucheng 52cad31920 * Code for port. 2022-08-10 12:37:14 +08:00
王怡栋 6045f06f48 Merge branch 'sprint/ZUI_guofeilong_fix_bug_in_c-name' into 'master'
* Fix css bug in td.c-title

See merge request easycorp/zentaopms!4883
2022-08-10 03:09:30 +00:00
guofeilong f7c76765c6 * Fix css bug in td.c-title 2022-08-10 03:04:13 +00:00
王怡栋 b690d95d2a Merge branch 'sprint/224_liumengyi_63891' into 'master'
* Finish task #63891.

See merge request easycorp/zentaopms!4879
2022-08-10 02:49:44 +00:00
王怡栋 cc2c2b2a54 Merge branch 'master_liuhong_63771' into 'master'
*Finish task #63771.

See merge request easycorp/zentaopms!4881
2022-08-10 02:20:29 +00:00
liuhong e1f9bc1e14 *Finish task #63771. 2022-08-10 02:18:01 +00:00
liumengyi 0ee1e4a63b * Finish task #63891. 2022-08-10 09:55:02 +08:00
wangyidong 9959006f46 * change upgrade for change engine. 2022-08-10 09:43:40 +08:00
王怡栋 c3376a2116 Merge branch 'master_liuhong_63783' into 'master'
Master liuhong 63783

See merge request easycorp/zentaopms!4876
2022-08-10 01:33:40 +00:00
王怡栋 03deac02c8 Merge branch 'master_liuhong_63782' into 'master'
*Finish task #63782.

See merge request easycorp/zentaopms!4874
2022-08-10 01:32:29 +00:00
王怡栋 d51846a966 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4875
2022-08-10 01:32:04 +00: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
王怡栋 bedec71945 Merge branch 'master_liuhong_63776' into 'master'
*Finish task #63776

See merge request easycorp/zentaopms!4872
2022-08-10 01:29:59 +00:00
王怡栋 ffa4b1f85d Merge branch 'master_xieqiyu_63790' into 'master'
* Code for task#63790.

See merge request easycorp/zentaopms!4871
2022-08-10 01:29:35 +00:00
tianshujie 59306ba53d * Modify the name newline problem in the story list. 2022-08-10 09:16:43 +08:00
tianshujie aa031fd130 * In classic mode, search execution does not show the owning project. 2022-08-10 09:11:49 +08:00
王怡栋 1ef8043796 Merge branch 'sprint/devplat_31' into 'master'
* Finish task #63896.

See merge request easycorp/zentaopms!4877
2022-08-10 01:08:40 +00:00
tanghucheng 39c3c2a53f * Code for stage gantt. 2022-08-10 08:34:21 +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
liuhong 59afee1b05 *Finish task #63783. 2022-08-10 00:12:08 +00:00
liuhong 70c3da8303 *Finish task 63783 2022-08-09 15:47:46 +00:00
liuhong f763f35484 *Fix bug #63783. 2022-08-09 15:43:56 +00:00
xieqiyu 930d72178e * Code for task#63790. 2022-08-09 22:39:41 +08:00
tanghucheng 5544a9ded5 * Code for port. 2022-08-09 21:11:36 +08:00
tanghucheng 2b1046d40b * Finish task #63793. 2022-08-09 17:34:51 +08:00
daitingting 088a414920 * Finish task #63896. 2022-08-09 09:21:43 +00:00
liuhong 5ba4f3efe0 *Finish task #63783. 2022-08-09 09:05:01 +00:00
孙广明 6ba3fb01ea Merge branch 'sprint/224_liumengyi_63694' into 'master'
* Finish task #63694.

See merge request easycorp/zentaopms!4868
2022-08-09 08:53:40 +00: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 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
liuhong 45fdb52a30 *Finish task #63782. 2022-08-09 08:08:59 +00:00
liumengyi 9713a1d816 * Optimize code for task #63694. 2022-08-09 16:04:27 +08:00
liumengyi a286f17021 * Modify language items for task #63694. 2022-08-09 15:42:18 +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
liuhong 12f1f00b16 Finish task #35865. 2022-08-09 07:21:41 +00:00
tianshujie 92490ede5d Merge branch 'sprint/224_tianshujie_63692' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63692 2022-08-09 15:20:06 +08:00
tianshujie 1200e97722 * Finish task #63692. 2022-08-09 15:19:16 +08:00
tianshujie f28f7e6ffd * Finish task #63692. 2022-08-09 15:17:07 +08:00
liumengyi 45ba659ef9 * Add language item for task #63694. 2022-08-09 15:16:47 +08:00