 田淑杰
|
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 |
|
|
王怡栋
|
fbe78108a5
|
Merge branch 'sprint/wangzemei/project' into 'master'
* project/manageMembers: optimize the style of the picker
See merge request easycorp/zentaopms!6571
|
2022-12-15 08:50:27 +00:00 |
|
|
wangzemei
|
e596b31431
|
* project/manageMembers: optimize the style of the picker
|
2022-12-15 16:41:34 +08:00 |
|
|
朱金勇
|
b04e7295f1
|
Merge branch 'sprint/sunhao/update_kindeditor' into 'master'
* update kindeditor files.
See merge request easycorp/zentaopms!6551
|
2022-12-15 08:36:28 +00:00 |
|
|
王怡栋
|
2225fa3632
|
Merge branch 'zentaopms_bug_#30911' into 'master'
* Fix bug #30911.
See merge request easycorp/zentaopms!6566
|
2022-12-15 08:27:11 +00:00 |
|
|
王怡栋
|
b9828faff2
|
Merge branch 'bugfix/liwenrui/clientalert' into 'master'
* fix unable to alert and confirm in zentaoclient.
See merge request easycorp/zentaopms!6563
|
2022-12-15 08:26:58 +00:00 |
|
|
孙广明
|
1222fd65f0
|
Merge branch 'sprint/hufangzhou_xuancommit' into 'master'
* Adjust the xuanxuan commit.
See merge request easycorp/zentaopms!6570
|
2022-12-15 08:22:23 +00:00 |
|
|
hufangzhou
|
5b13b13d43
|
* Adjust the xuanxuan commit.
|
2022-12-15 08:21:11 +00:00 |
|
|
孙广明
|
c893ac76d8
|
Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907
See merge request easycorp/zentaopms!6567
|
2022-12-15 08:20:12 +00:00 |
|
|
孙广明
|
7ab740a26b
|
Merge branch 'master_xieqiyu_30901' into 'master'
* Fix bug#30901.
See merge request easycorp/zentaopms!6568
|
2022-12-15 08:20:01 +00:00 |
|
|
孙广明
|
d72556fdb4
|
Merge branch 'sprint/scx_taskestimateapi' into 'master'
* Support pms effort.
See merge request easycorp/zentaopms!6569
|
2022-12-15 08:19:54 +00:00 |
|
|
xieqiyu
|
5c34348cd9
|
* Fix bug#30901.
|
2022-12-15 16:18:18 +08:00 |
|
|
liuhong
|
cc631b6e4f
|
* Adjust code #30907.
|
2022-12-15 08:15:03 +00:00 |
|