 zhaoke
|
4f2d69bbee
|
Merge branch 'feature/42422' into zenops_66
|
2023-03-17 11:03:38 +08:00 |
|
|
zhaoke
|
30dc9afb0a
|
- Remove repeat var.
|
2023-03-17 11:03:21 +08:00 |
|
|
zhaoke
|
e4ed673953
|
Merge branch 'feature/42422' into zenops_66
|
2023-03-17 11:01:01 +08:00 |
|
|
zhaoke
|
e9a89012bd
|
Merge branch 'zenops_65' into feature/42422
|
2023-03-17 10:58:27 +08:00 |
|
|
zhaoke
|
d95057d9a2
|
* Fix vm status error.
|
2023-03-17 10:42:08 +08:00 |
|
|
zhaoke
|
1f5f93d583
|
* Fix bug #32870.
|
2023-03-17 09:00:16 +08:00 |
|
|
zhaoke
|
d3753c48af
|
Merge branch 'feature/42422' into zenops_66
|
2023-03-17 08:50:47 +08:00 |
|
|
zhaoke
|
f6f2c4d495
|
* Vm node hide init fail notice.
|
2023-03-17 08:50:07 +08:00 |
|
|
zhaoke
|
b337c77151
|
Merge branch 'feature/42422' into zenops_66
|
2023-03-16 09:45:04 +08:00 |
|
|
zhaoke
|
abda5fbc2e
|
Merge branch 'master' into feature/42422
|
2023-03-16 09:40:27 +08:00 |
|
|
zhaoke
|
75c713bab0
|
* Add curl instead file_get_contents in zahost model.
|
2023-03-16 09:40:13 +08:00 |
|
|
zhaoke
|
d78fa58ddf
|
Merge branch 'feature/42422' into zenops_66
|
2023-03-16 09:39:13 +08:00 |
|
|
zhaoke
|
dad27dc1ad
|
* Fix hostType error when add vm node.
|
2023-03-16 08:45:29 +08:00 |
|
|
liyang
|
c72c81c097
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_66
|
2023-03-15 14:44:35 +08:00 |
|
|
wangyidong
|
5729bb2f7e
|
Merge branch 'tsj_fixbug'
|
2023-03-15 14:20:00 +08:00 |
|
|
王怡栋
|
f526a16291
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/custom/lang/zh-cn.php
|
2023-03-15 06:19:32 +00:00 |
|
|
管西迎
|
39847e1cf5
|
Merge branch 'sprint/hufangzhou_bug_32940' into 'master'
* Fix bug #32940.
See merge request easycorp/zentaopms!7196
|
2023-03-15 06:17:38 +00:00 |
|
|
hufangzhou
|
047dfd6e54
|
* Fix bug #32940.
|
2023-03-15 14:09:10 +08:00 |
|
|
孙广明
|
41538eb1db
|
Merge branch 'feature/38477' into 'master'
* Fix bug of task #87014.
See merge request easycorp/zentaopms!7190
|
2023-03-15 05:38:41 +00:00 |
|
|
wangyidong
|
ede15c92db
|
* fix for upgrade for editor module.
|
2023-03-15 13:08:05 +08:00 |
|
|
管西迎
|
d0817bc8a0
|
Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.
See merge request easycorp/zentaopms!7193
|
2023-03-15 03:10:17 +00:00 |
|
|
tianshujie
|
07e2128147
|
* Modify program language.
|
2023-03-15 11:02:06 +08:00 |
|
|
tianshujie
|
445323e278
|
* Modify product line language.
|
2023-03-15 11:00:45 +08:00 |
|
|
tianshujie
|
c513f5cb95
|
* Modify product line language.
|
2023-03-15 10:59:36 +08:00 |
|
|
tianshujie
|
5f6f52e86e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-15 10:57:18 +08:00 |
|
|
tianshujie
|
dc8fdfb263
|
* Modify product line language.
|
2023-03-15 10:56:13 +08:00 |
|
|
管西迎
|
93ca7dda5f
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.
See merge request easycorp/zentaopms!7192
|
2023-03-15 02:55:12 +00:00 |
|
|
tianshujie
|
bdc83c7088
|
* Modify product line language.
|
2023-03-15 10:54:45 +08:00 |
|
|
hufangzhou
|
125a4384af
|
* Add the new version.
|
2023-03-15 02:53:46 +00:00 |
|
|
tianshujie
|
cd925cee0e
|
* Modify product line language.
|
2023-03-15 10:53:15 +08:00 |
|
|
tianshujie
|
3756e90cfd
|
* Fix bug 32929.
|
2023-03-15 10:41:40 +08:00 |
|
|
tianshujie
|
7e17061d3d
|
* Fix bug 32928.
|
2023-03-15 10:41:33 +08:00 |
|
|
wangyidong
|
a946e5edeb
|
Merge branch 'easycorp/zentaopms-sprint/hufangzhou_task_87019'
|
2023-03-15 09:44:59 +08:00 |
|
|
tianshujie
|
e49090d03a
|
* Fix bug 32911.
|
2023-03-15 09:43:54 +08:00 |
|
|
王怡栋
|
49c755c8a6
|
Merge branch 'tsj_fixbug' into 'master'
* Add skip stash page.
See merge request easycorp/zentaopms!7188
|
2023-03-15 01:36:22 +00:00 |
|
|
tianshujie
|
2b7cff9090
|
* Fixed list title color issues.
|
2023-03-15 09:22:49 +08:00 |
|
|
liumengyi
|
196f9035e9
|
* Modify language item.
|
2023-03-15 00:36:12 +00:00 |
|
|
liumengyi
|
5b546fd987
|
* Fix bug of task #87014.
|
2023-03-15 00:28:45 +00:00 |
|
|
liumengyi
|
eeb106132c
|
* Fix bug of task #87014.
|
2023-03-15 00:19:22 +00:00 |
|
|
zhaoke
|
5db08a5f04
|
* Add support physics machine in zanode module,finish task #85169 cost:10h.
|
2023-03-14 17:40:43 +08:00 |
|
|
liumengyi
|
6a5966d8ca
|
* Fix bug of task #87013.
|
2023-03-14 09:20:55 +00:00 |
|
|
孙广明
|
d235b8e924
|
Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.
See merge request easycorp/zentaopms!7184
|
2023-03-14 09:15:08 +00:00 |
|
|
孙广明
|
bcc201b7a5
|
Merge branch 'wxp_bug87025' into 'master'
* Fixed bug #87025.
See merge request easycorp/zentaopms!7185
|
2023-03-14 09:11:42 +00:00 |
|
|
孙广明
|
5476ddf0c3
|
Merge branch 'fixbug/32817' into 'master'
* Fix bug #32817, #32818.
See merge request easycorp/zentaopms!7180
|
2023-03-14 09:11:00 +00:00 |
|
|
liumengyi
|
1d16c63d87
|
* Fix bug of task #87013.
|
2023-03-14 08:57:00 +00:00 |
|
|
孙广明
|
6820d74967
|
Merge branch 'sprint/scx_storyapibug' into 'master'
* Fix execution story api bug.
See merge request easycorp/zentaopms!7161
|
2023-03-14 08:54:28 +00:00 |
|
|
孙广明
|
96c39649bb
|
Merge branch 'wxp_bug87020' into 'master'
Fixed bug #87020.
See merge request easycorp/zentaopms!7189
|
2023-03-14 08:52:43 +00:00 |
|
|
wangxuepeng
|
ca5a98e5ad
|
Fixed bug #87020.
|
2023-03-14 07:37:42 +00:00 |
|
|
tianshujie
|
25cffc0574
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-14 15:06:01 +08:00 |
|
|
tianshujie
|
8580b13627
|
* Fix bug 32911.
|
2023-03-14 15:05:42 +08:00 |
|