 zenggang
|
af823f8e5f
|
* Fix lang error.
|
2023-08-29 06:05:20 +00:00 |
|
|
zenggang
|
29f2f5187b
|
* Merge 18.x
|
2023-08-28 10:27:22 +00:00 |
|
|
liwenrui
|
4dd127c4a0
|
* merge current 18.x into ai.
|
2023-08-16 10:28:06 +08:00 |
|
|
chaideqing
|
bac8998f6d
|
* Fix bug#36553.
|
2023-08-01 07:24:45 +00:00 |
|
|
zhaoke
|
ee689d84f1
|
* Fix error of action.
|
2023-08-01 13:57:00 +08:00 |
|
|
liwenrui
|
03ecd94c90
|
* add action config and lang for ai prompts, task #97648.
|
2023-07-19 13:42:20 +08:00 |
|
|
hufangzhou
|
d19c6c4d3d
|
* Fix bug #36388.
|
2023-07-07 15:58:48 +08:00 |
|
|
hufangzhou
|
b7bbb9cb16
|
* Adjst the code.
|
2023-04-20 17:12:19 +08:00 |
|
|
hufangzhou
|
e18b37128f
|
Merge branch 'master' into zentaopms_304
|
2023-04-20 13:03:30 +08:00 |
|
|
tianshujie
|
0f2a2b7bc3
|
* Fixed the interface details style problem.
|
2023-04-19 17:14:32 +08:00 |
|
|
liumengyi
|
648dc288ca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-14 15:15:03 +08:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
liumengyi
|
5ee474c83e
|
* Rename the privilege of action-trash.
|
2023-04-14 10:55:48 +08:00 |
|
|
tianshujie
|
e279e91070
|
* Resolve issue #775.
|
2023-04-13 16:22:45 +08:00 |
|
|
zhaoke
|
eb833be4e5
|
Merge branch 'zenops_66' into zenops_69
|
2023-04-13 09:31:12 +08:00 |
|
|
liumengyi
|
e3c6375224
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-12 08:58:39 +08:00 |
|
|
tianshujie
|
81e7153c8e
|
* Code for task #90780.
|
2023-04-11 16:34:29 +08:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
zhaoke
|
8522e6fb58
|
* Add scene control and view file to testcase module.
|
2023-03-29 16:26:59 +08:00 |
|
|
hufangzhou
|
01aaf60e09
|
* Merge master.
|
2023-03-14 05:15:27 +00:00 |
|
|
wangxuepeng
|
a5e86054e3
|
* Code for task #86270.
|
2023-03-10 05:34:34 +00:00 |
|
|
tianshujie
|
a67515ae02
|
* Modify language items for project common.
|
2023-03-08 09:21:58 +08:00 |
|
|
tianshujie
|
4ac15934cd
|
* Modify language items for project common.
|
2023-03-08 08:53:44 +08:00 |
|
|
liumengyi
|
77d435f75b
|
* Finish task #86263, #86266.
|
2023-03-07 06:13:33 +00:00 |
|
|
tianshujie
|
b2eafe0106
|
* Modify language items for product common.
|
2023-03-06 15:43:55 +08:00 |
|
|
caoyanyi
|
e7c8ceed8d
|
* Modify dynamic language.
|
2023-02-23 10:10:11 +08:00 |
|
|
tianshujie
|
484f34396c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-16 08:59:00 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
liumengyi
|
af5fbbab18
|
* Fix bug of task #84584.
|
2023-02-15 08:17:12 +00:00 |
|
|
hufangzhou
|
56c2cdcb21
|
* Finish task #83954.
|
2023-02-14 02:46:34 +00:00 |
|
|
zenggang
|
97fcb6263e
|
* Delete snapshot
|
2023-02-03 05:19:53 +00:00 |
|
|
zenggang
|
597b77af82
|
* Edit snapshot
|
2023-02-02 08:31:06 +00:00 |
|
|
zhaoke
|
81a1bbe039
|
* Fix bug 31405.
|
2023-01-04 01:14:29 +00:00 |
|
|
tanghucheng
|
bf4a0d1bd7
|
Merge branch 'master' into zenops_46
|
2023-01-03 14:17:40 +08:00 |
|
|
hufangzhou
|
b5859c7dc3
|
* Add the new version.
|
2023-01-03 13:56:27 +08:00 |
|
|
tanghucheng
|
0d4ae4ba95
|
* Fix language.
|
2023-01-03 13:42:04 +08:00 |
|
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
|
liugang
|
8100689bb2
|
Merge branch 'sprint/biz17'
|
2022-12-26 08:50:31 +08:00 |
|
|
tanghucheng
|
85ffa23da8
|
Merge branch 'master' into zenops_46_tanghucheng
|
2022-12-15 15:27:59 +08:00 |
|
|
Yagami
|
a299a62db1
|
* Rename siblings to twins.
|
2022-12-12 14:13:06 +08:00 |
|
|
zhaoke
|
cfcb3be5d1
|
* Fix issue.
|
2022-12-09 07:58:14 +00:00 |
|
|
lanzongjun
|
a835220fe1
|
resolve conflict master
|
2022-12-02 10:28:31 +08:00 |
|
|
caoyanyi
|
f58e24e6fc
|
Merge branch 'master' into zenops_46
|
2022-12-02 10:04:48 +08:00 |
|
|
wangyidong
|
93aa0dd1e9
|
* fix bug #30274.
|
2022-11-30 09:37:29 +08:00 |
|
|
唐胡成
|
90155c3eea
|
Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
# module/zanode/view/view.html.php
|
2022-11-29 01:38:30 +00:00 |
|
|
tanghucheng
|
b2ae4e15a1
|
* Code for task #76213.
|
2022-11-29 09:13:53 +08:00 |
|
|
孙广明
|
d4f5170391
|
Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993
See merge request easycorp/zentaopms!6395
|
2022-11-28 06:58:42 +00:00 |
|
|
孙广明
|
6356683483
|
Merge branch 'master' into 256
|
2022-11-28 13:36:48 +08:00 |
|
|
zhaoke
|
38f77f0ae4
|
* Remve unused code.
|
2022-11-25 06:17:10 +00:00 |
|
|
caoyanyi
|
4361cb4182
|
Merge branch 'master' into zenops_46
|
2022-11-24 13:01:30 +08:00 |
|