 zhaoke
|
2a4a15ea53
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-22 01:40:30 +00:00 |
|
|
zhaoke
|
f93ddc5b41
|
* Remove test code.
|
2022-12-22 01:40:27 +00:00 |
|
|
caoyanyi
|
5e354b7420
|
* Modify page height.
|
2022-12-21 21:39:54 +08:00 |
|
|
zhaoke
|
db795a619e
|
* Update lang.
|
2022-12-21 07:28:54 +00:00 |
|
|
zhaoke
|
33e6a5b55a
|
* Fix bug.
|
2022-12-21 07:27:55 +00:00 |
|
|
zhaoke
|
e70e5043aa
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-12-21 07:11:55 +00:00 |
|
|
zhaoke
|
190f85e351
|
* Fix auto radio margin.
|
2022-12-21 07:11:02 +00:00 |
|
|
caoyanyi
|
4e8d0c1515
|
* Modify sql.
|
2022-12-21 14:15:42 +08:00 |
|
|
caoyanyi
|
34ebaa78f8
|
* Update sql.
|
2022-12-21 14:09:57 +08:00 |
|
|
caoyanyi
|
a9723aef23
|
* Update sql.
|
2022-12-21 14:09:11 +08:00 |
|
|
zhaoke
|
caceac2b20
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-21 06:00:42 +00:00 |
|
|
zhaoke
|
ddeffea161
|
* Fix bug.
|
2022-12-21 06:00:29 +00:00 |
|
|
caoyanyi
|
71bc8ac80a
|
Merge branch 'master' into zenops_46
|
2022-12-21 13:56:27 +08:00 |
|
|
wangyidong
|
164cca5ffe
|
* code task #80451.
|
2022-12-21 10:31:46 +08:00 |
|
|
zhaoke
|
800573c6cb
|
* Fix bug.
|
2022-12-21 01:57:21 +00:00 |
|
|
zhaoke
|
37d5fb0673
|
* Fix bug 30985.
|
2022-12-21 00:30:26 +00:00 |
|
|
zhaoke
|
99f06984fe
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-12-20 08:47:55 +00:00 |
|
|
zhaoke
|
5eb635414f
|
* Disable click when result is empty.
|
2022-12-20 08:47:51 +00:00 |
|
|
tanghucheng
|
a25e76b320
|
Merge branch 'zenops_46' into zenops_46_tanghucheng
|
2022-12-20 16:45:04 +08:00 |
|
|
tanghucheng
|
5975278edc
|
* Merge master into zenops_46.
|
2022-12-20 16:44:27 +08:00 |
|
|
tanghucheng
|
5b2babca14
|
Merge branch 'master' into zenops_46
|
2022-12-20 16:36:44 +08:00 |
|
|
tanghucheng
|
ea6e03772c
|
* Fix bug #31065.
|
2022-12-20 15:56:19 +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 |
|
|
zhaoke
|
4446ffdc37
|
* Fix bug.
|
2022-12-20 07:19:35 +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 |
|
|
zhaoke
|
6cc59dcf08
|
Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng
|
2022-12-20 03:24:45 +00:00 |
|
|
zhaoke
|
b060117c18
|
* Update log style.
|
2022-12-20 03:24:37 +00:00 |
|
|
tanghucheng
|
38a7cfe4df
|
* Fix bug #31051.
|
2022-12-20 11:18:42 +08:00 |
|
|
zhaoke
|
db6dab44a5
|
Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng
|
2022-12-20 02:43:31 +00:00 |
|
|
zhaoke
|
14ee6a0737
|
* Fix bug 30988.
|
2022-12-20 02:43:25 +00:00 |
|
|
王怡栋
|
ffe0b359e9
|
Merge branch 'sprint/feedback1752' into 'master'
Sprint/feedback1752
See merge request easycorp/zentaopms!6599
|
2022-12-20 02:43:23 +00:00 |
|
|
tanghucheng
|
d789075902
|
* Finish task #80388.
|
2022-12-20 10:36:19 +08: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 |
|
|
tanghucheng
|
f754f0b0e0
|
* Fix lang file for zahost.
|
2022-12-20 08:42:48 +08:00 |
|
|
tanghucheng
|
ca4666f7a0
|
* Fix merge clash.
|
2022-12-20 08:36:33 +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 |
|
|
zhaoke
|
c67f366f89
|
Merge branch 'zenops_46_tanghucheng' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46_tanghucheng
|
2022-12-19 10:57:58 +00:00 |
|
|
zhaoke
|
57681a20a1
|
* Finish task 80387.
|
2022-12-19 10:57:17 +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 |
|
|
tanghucheng
|
6d20a68043
|
* Finish task #80389.
|
2022-12-19 16:23:24 +08:00 |
|
|
tanghucheng
|
b77a939f38
|
* Finish task #80728,80727.
|
2022-12-19 16:19:26 +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 |
|