169 Commits

Include renames

Author	SHA1	Message	Date
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
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
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
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
liugang	7c62eef9dc	Merge branch 'master' into sprint/biz17	2022-11-21 13:08:59 +08:00
liugang	3171c65b1f	* Fix bug #29905.	2022-11-17 09:25:28 +08: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	1630ab8885	Merge branch 'master' into zenops_46	2022-11-08 09:24:42 +08:00
liumengyi	a38461a20e	* Fix bug for manage chart group.	2022-11-06 16:03:14 +08:00
daitingting	cb90a2e25b	* Finish task #74176.	2022-11-02 06:30:01 +00:00
tanghucheng	3821cc3e53	* Code for sibling story.	2022-11-02 13:12:19 +08:00
xieqiyu	0a9a801389	* Code for task#74152.	2022-11-01 07:48:34 +00:00
tanghucheng	35b7acb4f6	* Add language.	2022-11-01 13:26:56 +08:00
wangyidong	148d3d6d6b	Merge branch 'master' into zentaopms_239	2022-10-27 11:39:47 +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
mayue	5e7ab9df55	* Fix bug #28700.	2022-10-20 15:02:59 +08:00
hufangzhou	d3f7df5518	* Add the new version.	2022-10-19 05:41:40 +00:00