Commit Graph
46119 Commits
Author SHA1 Message Date
liyuchun 315dacdc1d * Finish task #74675. 2022-11-02 14:36:18 +08:00
liyuchun 202fdfe374 * Fix bug #28455. 2022-10-25 17:21:31 +08:00
liyuchun 11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
王怡栋 107c689484 Merge branch 'bug_28886' into 'master'
* Fix bug#28886

See merge request easycorp/zentaopms!5878
2022-10-25 01:27:59 +00:00
胡方舟 91f8a7dd05 Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* escape `&` in sed script.

See merge request easycorp/zentaopms!5866
2022-10-25 01:25:00 +00:00
zenggang 1e22332937 * Fix bug#28886 2022-10-25 01:02:04 +00:00
liyuchun 539c7a776f * Fix bug when link bug to revision. 2022-10-24 17:17:30 +08:00
liyuchun 06da2b4e8a * Finish task #28484. 2022-10-24 16:09:12 +08:00
王怡栋 64e252da24 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug #28876.

See merge request easycorp/zentaopms!5872
2022-10-24 07:57:41 +00:00
tanghucheng 9282ff949d * Fix bug #28876. 2022-10-24 15:53:19 +08:00
朱金勇 5446757526 Merge branch 'sprint/sunhao/fix_burn_chart_precision' into 'master'
* fix burn chart precision

See merge request easycorp/zentaopms!5860
2022-10-24 07:51:04 +00:00
王怡栋 57e396987a Merge branch 'tanghucheng_feedback_module' into 'master'
* Code for bug #28684.

See merge request easycorp/zentaopms!5868
2022-10-24 07:37:07 +00:00
李玉春 ac9a1f2f1f Merge branch 'sprint/wzm/fixtable' into 'master'
* Solves the table component style for editing pages

See merge request easycorp/zentaopms!5869
2022-10-24 07:04:58 +00:00
tanghucheng 645072d3ae * Fix bug #28711. 2022-10-24 14:44:12 +08:00
Yagami 254320984c * Fix bug #28698. 2022-10-24 14:29:48 +08:00
tanghucheng 4ad1ac2435 * Code for bug #28684. 2022-10-24 14:27:58 +08:00
wangzemei 77cd72b7d6 * Solves the table component style for editing pages 2022-10-24 14:27:03 +08:00
wangyidong ef7072c10a * fix bug #28870. 2022-10-24 14:11:29 +08:00
Wenrui LI 46c9acf43a * escape & in sed script. 2022-10-24 14:04:29 +08:00
王怡栋 f996ef5c19 Merge branch 'tanghucheng_feedback_module' into 'master'
* Fix bug export.

See merge request easycorp/zentaopms!5861
2022-10-24 05:35:51 +00:00
胡方舟 de739ea1ac Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* fix sed for target zentaoxx.

See merge request easycorp/zentaopms!5865
2022-10-24 05:33:20 +00:00
Wenrui LI d62bbdf959 * fix sed for target zentaoxx. 2022-10-24 13:30:25 +08:00
李玉春 1abcb9b399 Merge branch 'sprint/tianshujie_28866' into 'master'
* Fix bug #28866.

See merge request easycorp/zentaopms!5864
2022-10-24 05:17:37 +00:00
tianshujie bc8eb40f31 * Fix bug #28866. 2022-10-24 13:07:48 +08:00
胡方舟 d4541ebf3d Merge branch 'bugfix/liwenrui/chatavatar' into 'master'
* fix chat avatar failing to upload.

See merge request easycorp/zentaopms!5862
2022-10-24 02:33:37 +00:00
Wenrui LI a514f87ad1 * fix chat avatar failing to upload. 2022-10-24 10:24:03 +08:00
tanghucheng f5e4fbbe9c * Set memory_limit for export. 2022-10-24 10:17:41 +08:00
tanghucheng 43d340fd2f * Fix bug export. 2022-10-24 10:12:38 +08:00
liyuchun 862aadaeb8 * Fix bug #27259. 2022-10-24 10:09:10 +08:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
Hao Sun ec454fb5ce * increase baseline accuracy for burn chart. 2022-10-22 13:57:28 +00:00
Hao Sun b8923acf1d * fix burn chart precision 2022-10-22 13:54:40 +00:00
李玉春 90f948780e Merge branch 'cyy_bug' into 'master'
* Fix bug #28786.

See merge request easycorp/zentaopms!5851
2022-10-21 08:30:02 +00:00
王怡栋 7c1d105f9e Merge branch 'sprint/zentaobiz12_ticket' into 'master'
fix bug guide

See merge request easycorp/zentaopms!5859
2022-10-21 08:15:04 +00:00
lanzongjun da3f54870d fix bug guide 2022-10-21 16:13:38 +08:00
王怡栋 b39c666128 Merge branch 'bug_28795' into 'master'
Bug 28795

See merge request easycorp/zentaopms!5858
2022-10-21 07:59:10 +00:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
王怡栋 de5212fd90 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug#28145.

See merge request easycorp/zentaopms!5855
2022-10-21 07:58:16 +00:00
xieqiyu 6731c7d6cb * Fix bug#26119. 2022-10-21 15:40:36 +00:00
xieqiyu 1a4bfe923e * Fix bug#26953. 2022-10-21 14:58:17 +00:00
xieqiyu 530f513af0 * Fix bug#26957. 2022-10-21 14:55:46 +00:00
xieqiyu cdb45a8925 * Fix bug#28145. 2022-10-21 13:16:52 +00:00
王怡栋 d84799d514 Merge branch 'master_bug_28775' into 'master'
* Fix bug #28775.

See merge request easycorp/zentaopms!5854
2022-10-21 07:57:39 +00:00
王怡栋 d1960a0f55 Merge branch 'master_bug_24436' into 'master'
* Fix bug #24436.

See merge request easycorp/zentaopms!5853
2022-10-21 07:57:15 +00:00
李玉春 ea7ed2c31b Merge branch 'sprint/247_wzm_blue' into 'master'
* fix table line aboout blue

See merge request easycorp/zentaopms!5857
2022-10-21 06:04:17 +00:00
wangzemei 04755d5920 * fix table line aboout blue 2022-10-21 14:01:30 +08:00
liuhong bb47c6e1da * Fix bug #28775. 2022-10-21 05:22:05 +00:00
liuhong 482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +00:00
孙广明 768aa9ba1b Merge branch 'biz13_mayue_bug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!5849
2022-10-21 03:44:34 +00:00
mayue bd13e39ade * Add product column. 2022-10-21 11:42:43 +08:00