Commit Graph
48948 Commits
Author SHA1 Message Date
xieqiyu 0e39758f3f * Code for task#79668. 2022-12-14 09:58:40 +08:00
孙广明 d48ae97cf0 * Code for change story title style. 2022-12-14 09:24:16 +08:00
xieqiyu 8ac26c73c3 * Code for task#79668. 2022-12-13 22:05:32 +08:00
王怡栋 4866ca582f Merge branch 'zentaopms273_wyd' into 'master'
* fix bug #30748.

See merge request easycorp/zentaopms!6537
2022-12-13 09:25:16 +00:00
孙广明 b8aa4597a7 Merge branch 'sprint_273_79661' into 'master'
Sprint 273 79661

See merge request easycorp/zentaopms!6535
2022-12-13 09:18:04 +00:00
孙广明 009b6345c8 Merge branch 'master_xieqiyu_79672' into 'master'
* Code for task#79672.

See merge request easycorp/zentaopms!6538
2022-12-13 09:17:51 +00:00
xieqiyu 455e7af0da * Code for task#79672. 2022-12-13 17:08:30 +08:00
wangyidong 4ca4c4ccdb * fix bug #30748. 2022-12-13 17:06:14 +08:00
孙广明 01165d0082 Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!6536
2022-12-13 08:46:14 +00:00
xieqiyu 54a12ea735 * Fix bug of task#79663. 2022-12-13 16:44:33 +08:00
xieqiyu 5c2ed30fd3 * Fix bug of task#79663. 2022-12-13 16:42:17 +08:00
孙广明 0beb81ebd7 * Fix multi task bug. 2022-12-13 16:15:28 +08:00
王怡栋 01277efa82 Merge branch 'bugfix/liwenrui/userping' into 'master'
* remove ping from user update.

See merge request easycorp/zentaopms!6533
2022-12-13 08:10:43 +00:00
文睿 李 cb87d73f59 * remove ping from user update. 2022-12-13 07:26:56 +00:00
王怡栋 4f02b6651a Merge branch 'zentaopms273_wyd' into 'master'
* code for task #79852,79853.

See merge request easycorp/zentaopms!6532
2022-12-13 07:21:03 +00:00
孙广明 55c79e0399 * Code for task #79664. 2022-12-13 15:20:09 +08:00
wangyidong f691ba2918 * code for task #79852,79853. 2022-12-13 15:19:54 +08:00
王怡栋 f722967983 Merge branch 'sprint/hufangzhou_minify' into 'master'
* Fix bug for helper class not found.

See merge request easycorp/zentaopms!6529
2022-12-13 06:18:17 +00:00
王怡栋 e70366d1c7 Merge branch 'zentaopms273_wyd' into 'master'
* code task #79859,79858,79857,79856,79855,79854.

See merge request easycorp/zentaopms!6531
2022-12-13 06:17:58 +00:00
wangyidong 8dc609e4a0 * code task #79859,79858,79857,79856,79855,79854. 2022-12-13 14:15:39 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
朱金勇 2a69111edc Merge branch 'fix_doccomment' into 'master'
* Use string instead of varchar.

See merge request easycorp/zentaopms!6504
2022-12-13 04:29:38 +00:00
liuhong 9013eda03b * Add Sql column for zt_feedback #79661. 2022-12-13 02:35:04 +00:00
hufangzhou 68108737e6 * Fix bug for helper class not found. 2022-12-13 02:18:30 +00:00
孙广明 17b092b060 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #79450#79671#79665#79670#79466

See merge request easycorp/zentaopms!6525
2022-12-13 01:47:15 +00:00
lanzongjun 493910031a * Finish Task #79466 2022-12-13 09:45:01 +08:00
孙广明 389a68e863 Merge branch 'master_xieqiyu_79663' into 'master'
* Code for task#79663.

See merge request easycorp/zentaopms!6526
2022-12-13 01:33:28 +00:00
lanzongjun 0a492b61fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-13 09:08:08 +08:00
lanzongjun 6da0c6ea01 * Finish Task #79670 2022-12-13 09:06:53 +08:00
王怡栋 29ffa09b81 Merge branch 'zentaopms273_wyd' into 'master'
* code for task #79861,79860.

See merge request easycorp/zentaopms!6527
2022-12-13 00:40:15 +00:00
王怡栋 90acd9abcf Merge branch 'feedback_1692' into 'master'
* Resolve feedback#1692

See merge request easycorp/zentaopms!6524
2022-12-13 00:39:42 +00:00
wangyidong 5bf3b27262 * code for task #79861,79860. 2022-12-13 08:38:36 +08:00
liuhong d3d10ea6a7 * Adjust code task #79661. 2022-12-12 12:03:10 +00:00
lanzongjun d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
王怡栋 38f24ef6f0 Merge branch 'sprint/konglingmao_feedback#1472' into 'master'
* Resolved feedbak #1472,privilege error in my work requirement.

See merge request easycorp/zentaopms!6523
2022-12-12 09:17:30 +00:00
Yagami fa0b93874d * Code for markdown preview bug. 2022-12-12 16:55:33 +08:00
xieqiyu a46ddf8ee7 * Code for task#79663. 2022-12-12 16:40:23 +08:00
lanzongjun c3d53daa5a * Finish Task #79665 2022-12-12 16:36:32 +08:00
Yagami 27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
Yagami de6e9b07ac * Code for function review. 2022-12-12 16:11:03 +08:00
Yagami 92ba115642 * Finish task #79460. 2022-12-12 15:57:05 +08:00
lanzongjun 295bfadc5b * Finish Task #79671 2022-12-12 15:38:55 +08:00
Yagami 8a5d1a8e04 * Finish task #79461. 2022-12-12 15:22:45 +08:00
lanzongjun 835577a6f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-12 14:17:14 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
lanzongjun ad203dfbf9 * Finish Task #79450 2022-12-12 13:25:39 +08:00
zenggang ee78bb255b * Resolve feedback#1692 2022-12-12 02:53:26 +00:00
Yagami b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
朱金勇 9f741a612a Merge branch 'sprint/sunhao/fix_gantt_export' into 'master'
* fix gantt export not work as expected, not include all rows

See merge request easycorp/zentaopms!6458
2022-12-11 13:58:26 +00:00
朱金勇 62c7224c01 Merge branch 'sprint/sunhao/optimize_open_app' into 'master'
* hide old tab content on open from hidden state

See merge request easycorp/zentaopms!6455
2022-12-11 13:58:11 +00:00