 zhaoke
|
cfcb3be5d1
|
* Fix issue.
|
2022-12-09 07:58:14 +00: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 |
|
|
caoyanyi
|
fc95313a40
|
Merge branch 'master' into zenops_46
|
2022-11-28 08:41:37 +08:00 |
|
|
zhaoke
|
38f77f0ae4
|
* Remve unused code.
|
2022-11-25 06:17:10 +00:00 |
|
|
Yagami
|
f881d7951e
|
* Fix bug #30017.
|
2022-11-24 13:46:14 +08:00 |
|
|
caoyanyi
|
4361cb4182
|
Merge branch 'master' into zenops_46
|
2022-11-24 13:01:30 +08:00 |
|
|
lanzongjun
|
63e0556741
|
* Fix Task #77267
|
2022-11-23 10:54:58 +08:00 |
|
|
zhaoke
|
c2b0f0a656
|
* Update zanode name
|
2022-11-23 02:44:27 +00:00 |
|
|
caoyanyi
|
0d81c7f4fe
|
Merge branch 'master' into zenops_46
|
2022-11-22 15:39:59 +08:00 |
|
|
wangyuting
|
5811dc886d
|
* Fix bug #28274.
|
2022-11-21 02:23:48 +00:00 |
|
|
caoyanyi
|
e60b21e1b6
|
Merge branch 'master' into zenops_46
|
2022-11-16 13:00:45 +08:00 |
|
|
caoyanyi
|
b2adb6ab92
|
* Fix bug #29839.
|
2022-11-16 09:32:02 +08:00 |
|
|
caoyanyi
|
5145b98f24
|
* Modify actions get.
|
2022-11-14 16:24:49 +08:00 |
|
|
caoyanyi
|
f1425eff27
|
Merge branch 'master' into zenops_46
|
2022-11-14 08:55:13 +08:00 |
|
|
wangyidong
|
126d55f807
|
* code task #74929.
|
2022-11-10 15:19:57 +08:00 |
|
|
caoyanyi
|
1630ab8885
|
Merge branch 'master' into zenops_46
|
2022-11-08 09:24:42 +08:00 |
|
|
wangyidong
|
bd18396178
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-08 08:41:50 +08:00 |
|
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
|
tianshujie
|
c05b94e3b0
|
* Fix bug #29377.
|
2022-11-07 16:00:47 +08:00 |
|
|
caoyanyi
|
90331724dc
|
Merge branch 'master' into zenops_46
|
2022-11-07 14:00:34 +08:00 |
|
|
daitingting
|
cb90a2e25b
|
* Finish task #74176.
|
2022-11-02 06:30:01 +00:00 |
|
|
wangyidong
|
f2cd7c12b4
|
* code for task #74779.
|
2022-11-02 14:21:24 +08:00 |
|
|
wangyidong
|
4a0a5649a0
|
* adjust code.
|
2022-11-02 09:16:51 +08:00 |
|
|
wangyidong
|
40e20fa112
|
* code for task #74178.
|
2022-11-01 10:22:13 +08:00 |
|
|
daitingting
|
16706253e7
|
* Finish task #73989, #73990.
|
2022-10-31 06:27:40 +00:00 |
|
|
xieqiyu
|
f7a84e569b
|
* Fix bug#29013.
|
2022-10-29 05:47:34 +00:00 |
|
|
tianshujie
|
0c2fd62c0a
|
8 Fix bug #29021.
|
2022-10-28 09:30:51 +08:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
tianshujie
|
49da824085
|
* Remove useless code.
|
2022-10-27 08:17:42 +08:00 |
|
|
tianshujie
|
a72173cd72
|
* Finish task #73752.
|
2022-10-26 15:49:13 +08:00 |
|
|
tianshujie
|
2f97d5a8ad
|
* Finish task #73750.
|
2022-10-26 13:50:52 +08:00 |
|
|
liyuchun
|
11a4983080
|
Merge branch 'master' into zenops_46
|
2022-10-25 11:28:43 +08:00 |
|
|
daitingting
|
ec2b4f4722
|
* Finish task #73064.
|
2022-10-25 01:30:25 +00:00 |
|
|
wangjianhua
|
5a6ea5fc09
|
* Fix bug #28553: not display project of shadow product.
|
2022-10-24 12:28:46 +08:00 |
|
|
liyuchun
|
00547dc0f5
|
Merge branch 'master' into zenops_46
|
2022-10-24 09:18:10 +08:00 |
|
|
daitingting
|
ea9b26e581
|
* Finish task #71574.
|
2022-10-21 00:52:14 +00:00 |
|
|
王怡栋
|
647dd3107c
|
Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
* fix bug
See merge request easycorp/zentaopms!5835
|
2022-10-20 07:35:52 +00:00 |
|
|
mayue
|
5e7ab9df55
|
* Fix bug #28700.
|
2022-10-20 15:02:59 +08:00 |
|
|
lanzongjun
|
e1330d9de1
|
* fix bug
|
2022-10-20 14:48:30 +08:00 |
|
|
hufangzhou
|
d3f7df5518
|
* Add the new version.
|
2022-10-19 05:41:40 +00:00 |
|
|
李玉春
|
a7c7185f56
|
Merge branch 'zentaopms_239_wangjianhua_70793' into 'zentaopms_239'
* Rebuild linking repo and project without product.
See merge request easycorp/zentaopms!5788
|
2022-10-19 01:26:52 +00:00 |
|
|
wangjianhua
|
b27e504f4c
|
* Adjust codes format.
|
2022-10-19 09:19:57 +08:00 |
|
|
wangjianhua
|
42d8122e7a
|
* Add lang items.
|
2022-10-19 08:51:08 +08:00 |
|
|
wangyidong
|
6c5ae13ce7
|
* fix bug #72263.
|
2022-10-18 13:45:12 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
mayue
|
811285c53f
|
Merge branch 'biz13_mayue_task#71837' into sprint/zentaobiz12_ticket
|
2022-10-14 14:45:17 +08:00 |
|