Commit Graph
47547 Commits
Author SHA1 Message Date
liuyongkai dd519c7587 * Resolve feedback #1411. 2022-11-11 13:02:26 +08:00
孙广明 1a65c652fc Merge branch 'master_xieqiyu_29483' into 'master'
* Fix bug#29483.

See merge request easycorp/zentaopms!6114
2022-11-11 01:41:38 +00:00
孙广明 3b5f93bd66 Merge branch 'sprint/tianshujie_issue' into 'master'
Sprint/tianshujie issue

See merge request easycorp/zentaopms!6113
2022-11-11 01:40:09 +00:00
tianshujie ea99f50a0a * Fix bug #29361. 2022-11-11 09:36:10 +08:00
xieqiyu 318f8b7b31 * Fix bug#29483. 2022-11-11 01:32:38 +00:00
tianshujie caaf32b57a * Fix bug #29508. 2022-11-11 09:23:39 +08:00
tianshujie 0544c75976 * Modify the project list name display question. 2022-11-11 09:20:55 +08:00
tianshujie 2c75eaf8f6 * Modify the statistics of the plan list. 2022-11-11 09:04:31 +08:00
孙广明 3cc1a5f1ef Merge branch 'mayue_fix_bug#29466' into 'master'
* Fix bug #29466.

See merge request easycorp/zentaopms!6103
2022-11-11 00:28:22 +00:00
孙广明 b21f84513b Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!6104
2022-11-11 00:28:11 +00:00
王怡栋 bca89293fb Merge branch 'zentaopms_258_task_#75243' into 'master'
* Finish task #75243.

See merge request easycorp/zentaopms!6111
2022-11-10 08:31:57 +00:00
王怡栋 77280a9aad Merge branch 'zentaopms_258_task#75237' into 'master'
Zentaopms 258 task#75237

See merge request easycorp/zentaopms!6110
2022-11-10 08:31:34 +00:00
daitingting f3b21a7076 * Finish task #75243. 2022-11-10 08:27:04 +00:00
wangyuting 8559d77319 * Optimize code. 2022-11-10 08:09:17 +00:00
wangyuting 53dbe65eb8 * Fix noSprint project bug. 2022-11-10 07:52:58 +00:00
wangyidong a5b9f374d1 * merge git stash. 2022-11-10 15:50:17 +08:00
wangyidong 6eae8345f7 * merge ztSessionHandler. 2022-11-10 15:47:05 +08:00
wangyuting 29bb8e22b6 * Add project build priv. 2022-11-10 07:40:52 +00:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
王怡栋 e8f50c14c6 Merge branch 'sprint/chaideqing/feedback#893' into 'master'
* Fix feedback #893.

See merge request easycorp/zentaopms!6107
2022-11-10 07:26:02 +00:00
Yagami 03fc112e9f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-10 15:25:51 +08:00
Yagami a97b9ea972 * Finish task #75355. 2022-11-10 15:25:40 +08:00
王怡栋 c9291ba5f9 Merge branch 'zentaopms_258_task_#75242' into 'master'
* Finish task #75242.

See merge request easycorp/zentaopms!6108
2022-11-10 07:25:30 +00:00
wangyidong 126d55f807 * code task #74929. 2022-11-10 15:19:57 +08:00
daitingting 1f949f1b3f * Finish task #75242. 2022-11-10 07:15:23 +00:00
chaideqing 50eea5b6be * Fix feedback #893. 2022-11-10 14:30:02 +08:00
王怡栋 3beb994fe8 Merge branch 'master_bug_29451' into 'master'
* Fix bug #29451

See merge request easycorp/zentaopms!6095
2022-11-10 06:24:33 +00:00
王怡栋 fc2d6509a5 Merge branch 'zentaopms_258_fix_bug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6099
2022-11-10 06:24:15 +00:00
王怡栋 759d18bf43 Merge branch 'sprint/ZUI_guofeilong_updateIcon_gantt-alt' into 'master'
+ ZUI: add icon gantt-alt

See merge request easycorp/zentaopms!6105
2022-11-10 06:24:01 +00:00
王怡栋 e66d842cf9 Merge branch 'zentaopms258_wyd' into 'master'
Zentaopms258 wyd

See merge request easycorp/zentaopms!6106
2022-11-10 06:23:42 +00:00
wangyidong ca0d6b9c36 * code for task #75247. 2022-11-10 14:18:38 +08:00
wangyidong b8c4c2bb9d * code for task #75426,75427. 2022-11-10 14:13:29 +08:00
guofeilong f6bd7c11dc + ZUI: add icon gantt-alt 2022-11-10 06:01:07 +00:00
mayue fc2ebb5b61 * Fix bug #29466. 2022-11-10 13:53:32 +08:00
xieqiyu 53bde8fe9f * Fix bug#29533. 2022-11-10 05:38:49 +00:00
朱金勇 8d45e689af Merge branch 'ta_liyang' into 'master'
* Add custom test data.

See merge request easycorp/zentaopms!6101
2022-11-10 05:29:12 +00:00
xieqiyu 3ec48f0386 * Fix bug#29467. 2022-11-10 05:05:13 +00:00
wangyidong 8ca97ef86e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-10 12:10:37 +08:00
wangyidong e2cf4aa1be * fix bug #29534. 2022-11-10 12:09:14 +08:00
wangyidong 2e6e289f1a * fix bug #29528. 2022-11-10 12:08:21 +08:00
liyang 9682ec1923 * Add custom test data. 2022-11-10 11:16:34 +08:00
孙广明 50614c2640 Merge branch 'mayue_fix_bug#27324' into 'master'
* Fix bug #27324.

See merge request easycorp/zentaopms!6100
2022-11-10 03:15:09 +00:00
mayue a9e282e760 * Fix bug #27324. 2022-11-10 11:09:27 +08:00
xieqiyu a00eb4b6bc * Fix bug#29459. 2022-11-10 03:00:38 +00:00
孙广明 3ea6ada0b5 Merge branch 'master_xieqiyu_fixTips' into 'master'
* Modify tips of batch change plan.

See merge request easycorp/zentaopms!6096
2022-11-10 02:49:34 +00:00
daitingting 6868b09d1a * Fix bug. 2022-11-10 02:20:59 +00:00
Yagami 7ec0c9581f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-10 09:46:35 +08:00
Yagami 7bd15c19ce * Fix bug #75356. 2022-11-10 09:46:25 +08:00
王怡栋 97d2ccf52d Merge branch 'bug_29460' into 'master'
* Fix bug #29460

See merge request easycorp/zentaopms!6090
2022-11-10 01:24:19 +00:00
王怡栋 9e45c0494f Merge branch 'zentaopms258_wyd' into 'master'
* code for task #75244,75245.

See merge request easycorp/zentaopms!6097
2022-11-10 01:23:40 +00:00