 Lufei
|
b19ce38241
|
* Fix doc comment for user module.
|
2022-12-22 16:27:40 +08:00 |
|
|
王怡栋
|
747579cb2b
|
Merge branch 'sprint/feedback1799' into 'master'
Sprint/feedback1799
See merge request easycorp/zentaopms!6616
|
2022-12-22 07:17:39 +00:00 |
|
|
孙广明
|
d93c194410
|
Merge branch 'zhouxin_feedback_1807' into 'master'
* Fix bug for feedback 1807.
See merge request easycorp/zentaopms!6618
|
2022-12-22 06:41:56 +00:00 |
|
|
zhouxin
|
14f967733f
|
* Fix bug for feedback 1807.
|
2022-12-22 06:31:58 +00:00 |
|
|
chaideqing
|
b72e6e2d0c
|
* Fix feedback 1799.
|
2022-12-22 12:13:52 +08:00 |
|
|
chaideqing
|
435852fd14
|
* Fix feedback 1799 .
|
2022-12-22 11:53:20 +08:00 |
|
|
wangyidong
|
e6eddbb075
|
* fix bug #30242.
|
2022-12-21 17:31:08 +08:00 |
|
|
wangyidong
|
d24441491c
|
* fix bug #30591.
|
2022-12-21 16:48:09 +08:00 |
|
|
孙广明
|
a712a8df5a
|
Merge branch 'zhouxin_feedback_1807' into 'master'
* Resolve feedback #1807.
See merge request easycorp/zentaopms!6612
|
2022-12-21 08:26:12 +00:00 |
|
|
wangyidong
|
b8b0affbee
|
* fix bug #30994.
|
2022-12-21 16:19:29 +08:00 |
|
|
zhouxin
|
e56ac56ca3
|
* Resolve feedback #1807.
|
2022-12-21 07:58:28 +00:00 |
|
|
wangyidong
|
bc02660990
|
* code for task #80451.
|
2022-12-21 15:50:17 +08:00 |
|
|
wangyidong
|
034c750da5
|
* code for task #80457.
|
2022-12-21 15:15:28 +08:00 |
|
|
wangyidong
|
164cca5ffe
|
* code task #80451.
|
2022-12-21 10:31:46 +08:00 |
|
|
孙广明
|
dd6992d4bc
|
Merge branch 'zhouxin_feedback_172' into 'master'
* Resolve feedback #172.
See merge request easycorp/zentaopms!6604
|
2022-12-20 07:43:46 +00:00 |
|
|
zhouxin
|
d741dfd154
|
* Resolve feedback #172.
|
2022-12-20 07:29:13 +00:00 |
|
|
wangyidong
|
ac9e876101
|
* code task #80452.
|
2022-12-20 13:53:37 +08:00 |
|
|
wangyidong
|
58efe7b011
|
* code task #80458,80463.
|
2022-12-20 11:31:15 +08:00 |
|
|
王怡栋
|
ffe0b359e9
|
Merge branch 'sprint/feedback1752' into 'master'
Sprint/feedback1752
See merge request easycorp/zentaopms!6599
|
2022-12-20 02:43:23 +00:00 |
|
|
chaideqing
|
b670a052de
|
* Fix feedback1752.
|
2022-12-20 10:10:33 +08:00 |
|
|
wangyidong
|
d28ea77f0d
|
* code for task #80461.
|
2022-12-20 09:24:07 +08:00 |
|
|
wangyidong
|
c093724f9d
|
* fix bug #80463.
|
2022-12-20 09:24:06 +08:00 |
|
|
王怡栋
|
6b4135e66f
|
Merge branch 'bug_30798' into 'master'
* Fix bug#30798
See merge request easycorp/zentaopms!6595
|
2022-12-20 00:15:29 +00:00 |
|
|
朱金勇
|
4fc76fe596
|
Merge branch 'fix_execution_view' into 'master'
* Fix search style error in execution view page.
See merge request easycorp/zentaopms!6596
|
2022-12-19 08:39:18 +00:00 |
|
|
Lufei
|
c3244b958f
|
* Fix search style error in execution view page.
|
2022-12-19 16:36:14 +08:00 |
|
|
zenggang
|
14dc7079d1
|
* Fix bug#30798
|
2022-12-19 08:17:56 +00:00 |
|
|
孙广明
|
137ba608bd
|
Merge branch 'sprint/hufangzhou_xuantag' into 'master'
* Adjust the xuan tag.
See merge request easycorp/zentaopms!6592
zentaopms_18.0.beta2
|
2022-12-19 03:22:34 +00:00 |
|
|
孙广明
|
309903e055
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30943
See merge request easycorp/zentaopms!6591
|
2022-12-19 03:18:52 +00:00 |
|
|
hufangzhou
|
66f38dd976
|
* Adjust the xuan tag.
|
2022-12-19 03:18:27 +00:00 |
|
|
lanzongjun
|
7e91261485
|
* Fix Bug #30943
|
2022-12-19 11:15:51 +08:00 |
|
|
胡方舟
|
d051fbabf7
|
Merge branch 'bugfix/liwenrui/upgradelang' into 'master'
* add upgrade lang for xuan.
See merge request easycorp/zentaopms!6590
|
2022-12-19 03:13:44 +00:00 |
|
|
Wenrui LI
|
74fb0305ee
|
* add upgrade lang for xuan.
|
2022-12-19 11:11:38 +08:00 |
|
|
胡方舟
|
9ff12a3a07
|
Merge branch 'fix_local_upgrade' into 'master'
- Remove useless code for local upgrade.
See merge request easycorp/zentaopms!6589
|
2022-12-19 02:56:25 +00:00 |
|
|
Lufei
|
9ca8e975c3
|
- Remove useless code for local upgrade.
|
2022-12-19 10:55:05 +08:00 |
|
|
胡方舟
|
ed83ba0142
|
Merge branch 'bugfix/liwenrui/zentaoxxmake' into 'master'
* fix makefile for zentaoxx.
See merge request easycorp/zentaopms!6587
|
2022-12-19 01:54:03 +00:00 |
|
|
文睿 李
|
098954ef7d
|
* fix makefile for zentaoxx.
|
2022-12-19 01:52:37 +00:00 |
|
|
王怡栋
|
ceb821579a
|
Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize word.
See merge request easycorp/zentaopms!6586
|
2022-12-19 00:59:26 +00:00 |
|
|
孔令茂
|
5de767bed3
|
* Optimize word.
|
2022-12-17 14:06:27 +00: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 |
|