Commit Graph
49125 Commits
Author SHA1 Message Date
wangzemei 1868b3155d * finish task 79625 2022-12-20 09:59:43 +08:00
wangzemei 6b8c4daf06 * add modal 2022-12-20 09:33:25 +08:00
wangzemei 93ece5bb70 * ztask 79625 2022-12-20 08:04:27 +08:00
孙广明 927cf0762d Merge branch 'sprint/272_tsj' into 'sprint/272'
Sprint/272 tsj

See merge request easycorp/zentaopms!6594
2022-12-19 07:43:12 +00:00
田淑杰 e441c004b0 * Fix bug #31010. 2022-12-19 14:56:42 +08:00
田淑杰 c08ab35765 * Finish task #79624. 2022-12-19 14:51:56 +08:00
田淑杰 0bce13f996 * Compatible lite page. 2022-12-19 13:13:28 +08:00
孙广明 9b9763c45c Merge branch 'sprint/272_tianshujie' into 'sprint/272'
* Add update function of task #79622.

See merge request easycorp/zentaopms!6593
2022-12-19 03:22:28 +00:00
田淑杰 d6bad0942f * Add update function of task #79622. 2022-12-19 11:11:28 +08:00
王怡栋 b1238c8fae Merge branch 'sprint/272_cyy' into 'sprint/272'
Sprint/272 cyy

See merge request easycorp/zentaopms!6588
2022-12-19 02:17:59 +00:00
caoyanyi 46085e314d * Modify client picture. 2022-12-19 10:08:35 +08:00
caoyanyi c7c37f1db0 * Finish task #79628. 2022-12-19 10:03:35 +08:00
田淑杰 edd54c534e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-19 08:55:38 +08:00
孙广明 aedf34e7dc Merge branch 'master_xieqiyu_30291' into 'master'
* Fix bug#30291.

See merge request easycorp/zentaopms!6585
2022-12-16 08:22:35 +00:00
孙广明 a5a440f62e Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug

See merge request easycorp/zentaopms!6584
2022-12-16 07:55:58 +00:00
xieqiyu d0fb46062d * Fix bug#30291. 2022-12-16 15:55:54 +08:00
lanzongjun cbe351104a * Fix Bug 2022-12-16 15:55:01 +08:00
孙广明 a84250c27b Merge branch 'bugfix/liwenrui/defaultbottweak' into 'master'
修复喧喧机器人所用语言项

See merge request easycorp/zentaopms!6581
2022-12-16 07:09:40 +00:00
孙广明 6fe0374751 Merge branch 'master_xieqiyu_30855' into 'master'
* Fix bug#30855.

See merge request easycorp/zentaopms!6582
2022-12-16 07:09:28 +00:00
孙广明 4c98d0cd33 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30957

See merge request easycorp/zentaopms!6583
2022-12-16 07:09:02 +00:00
lanzongjun febbe41e69 * Fix Bug #30957 2022-12-16 15:01:38 +08:00
xieqiyu af8cf547ea * Fix bug#30855. 2022-12-16 14:52:42 +08:00
Wenrui LI a0e733cd12 * update xuan release ref. 2022-12-16 14:49:03 +08:00
Wenrui LI 293b9146bc * use correct lang for client status. 2022-12-16 14:48:52 +08:00
孙广明 1bfeab6584 Merge branch 'sprint/hufangzhou_feature_deleteBI' into 'master'
* Remove the bi's info from the version.

See merge request easycorp/zentaopms!6578
2022-12-16 06:34:28 +00:00
孙广明 4369fcda5a Merge branch 'master_xieqiyu_30583' into 'master'
* Fix bug#30583.

See merge request easycorp/zentaopms!6579
2022-12-16 06:34:17 +00:00
孙广明 18597ae994 Merge branch 'bugfix/liwenrui/botloadmodel' into 'master'
修复客户端中机器人 model 加载问题

See merge request easycorp/zentaopms!6580
2022-12-16 06:34:03 +00:00
Wenrui LI 49d0c7e674 * fix search user on default bot. 2022-12-16 14:30:35 +08:00
xieqiyu 61e41379be * Fix bug#30583. 2022-12-16 14:23:21 +08:00
Wenrui LI 2d7c094937 * fix im user model gets replaced. 2022-12-16 14:14:51 +08:00
hufangzhou 73207bedbb * Remove the bi's info from the version. 2022-12-16 06:04:42 +00:00
孙广明 ad96400f69 Merge branch 'sprint/272_tianshujie' into 'sprint/272'
Sprint/272 tianshujie

See merge request easycorp/zentaopms!6577
2022-12-16 05:59:30 +00:00
孙广明 4ffbfab306 * Fix bug #30929. 2022-12-16 13:44:44 +08:00
caoyanyi 1748e9a48c Merge branch 'master' into sprint/272_tianshujie 2022-12-16 13:39:04 +08:00
wangzemei 3eddaf8808 * theme: update zui theme 2022-12-16 13:11:47 +08:00
孙广明 9d4bd9d8e1 Merge branch 'bugfix/liwenrui/zentaobottasks' into 'master'
* fix bot error handling.

See merge request easycorp/zentaopms!6574
2022-12-16 05:11:23 +00:00
孙广明 6036606f6e Merge branch 'master_xieqiyu_30866' into 'master'
* Fix bug#30866.

See merge request easycorp/zentaopms!6572
2022-12-16 05:07:06 +00:00
孙广明 294ab34e83 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug product release show error #30883

See merge request easycorp/zentaopms!6573
2022-12-16 05:06:52 +00:00
孙广明 dc33dd6283 Merge branch 'master_xieqiyu_30891' into 'master'
* Fix bug#30891.

See merge request easycorp/zentaopms!6576
2022-12-16 05:06:37 +00:00
孙广明 9a6929062a * Fix bug #30882. 2022-12-16 11:12:40 +08:00
xieqiyu f17dbd2c68 * Fix bug#30861. 2022-12-16 11:01:03 +08:00
lanzongjun 8e7afd50c9 * Fix Bug #30883 2022-12-16 11:00:36 +08:00
田淑杰 38f1576937 * Finish task #79626. 2022-12-16 10:41:52 +08:00
xieqiyu dc425fd923 * Fix bug#30891. 2022-12-16 10:36:40 +08:00
孙广明 8649716ad4 * Fix bug #30916. 2022-12-16 10:30:46 +08:00
Wenrui LI 7d8e0d43ac * handle incorrect api response for now. 2022-12-16 10:18:13 +08:00
Wenrui LI 8d6014d0be * fix bot error handling. 2022-12-16 09:57:52 +08:00
lanzongjun 09ccb1ebd7 * Fix Bug product release show error 2022-12-16 09:44:55 +08:00
田淑杰 5b8d6f92d9 Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_tianshujie 2022-12-16 08:40:13 +08:00
xieqiyu 0fb96ef566 * Fix bug#30866. 2022-12-15 17:04:03 +08:00