67 Commits

Include renames

Author	SHA1	Message	Date
liumengyi	c7f4be90f7	* Move upgrade code from 18.x.	2023-10-23 16:40:31 +08:00
daitingting	0e3150ea6f	* Refactor the backup view.	2023-08-01 06:51:03 +00:00
qixinzhi	511240d0fa	Merge branch 'master' into sprint/biz17	2023-03-22 17:15:46 +08:00
daitingting	f439868d08	* ProcessChart and processReport when upgrade.	2023-03-21 02:34:08 +00:00
王怡栋	f526a16291	Merge branch 'master' into 'tsj_fixbug' ... # Conflicts: # module/custom/lang/zh-cn.php	2023-03-15 06:19:32 +00:00
tianshujie	c513f5cb95	* Modify product line language.	2023-03-15 10:59:36 +08:00
hufangzhou	125a4384af	* Add the new version.	2023-03-15 02:53:46 +00:00
tianshujie	71db1e3c2e	* Fix bug 31232.	2023-03-10 09:45:36 +08:00
tianshujie	5c84a44f0d	* Fix bug 31232.	2023-03-10 09:42:07 +08:00
hufangzhou	f3cd2e7d4d	* Change the Easy Soft to ZenTao Software.	2023-02-15 17:01:22 +08:00
wangyuting	5835a11610	* Fix bug #29994.	2022-11-23 01:40:30 +00:00
daitingting	3750be48c5	* Finish task #77143.	2022-11-22 08:17:17 +00:00
daitingting	cb90a2e25b	* Finish task #74176.	2022-11-02 06:30:01 +00:00
wangyidong	f9ec235880	* code for task #74183,74184,74185.	2022-10-31 14:20:48 +08:00
wangyuting2	782bdbb2a8	* Finish task #72257. Fix bug #28511.	2022-10-17 06:33:20 +00:00
wangyuting2	129bec2618	* Finish task #70192.	2022-09-26 06:44:02 +00:00
wangyidong	0ba479e9e5	* finish task #70196.	2022-09-26 13:15:48 +08:00
wangyuting2	e5976d126c	* Optimize lang file.	2022-09-22 02:42:36 +00:00
王怡栋	47d0b6e08a	Merge branch 'sprint/zentaopms240_lanzongjun' into 'sprint/zentaopms240' ... * finish task #69706 See merge request easycorp/zentaopms!5429	2022-09-20 08:34:01 +00:00
lanzongjun	f389919243	* finish task #69706	2022-09-20 15:39:38 +08:00
lanzongjun	d3cec62717	* finish task #69706	2022-09-20 15:38:00 +08:00
wangyuting2	cea05451b1	* Add lang.	2022-09-20 06:56:09 +00:00
lanzongjun	07ad0b92f6	modify upgrade install	2022-09-19 15:21:43 +08:00
lanzongjun	7ff2af63ff	modify lang	2022-09-19 13:30:23 +08:00
wangyidong	6b541a7c60	Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240	2022-09-16 16:26:29 +08:00
lanzongjun	b0c3bccc9d	* task #69250	2022-09-16 11:07:26 +08:00
wangyuting2	3d54c6ea82	* Finish task #69256.	2022-09-16 01:25:47 +00:00
lanzongjun	78107e92dc	* task #69250	2022-09-15 17:31:47 +08:00
wangyuting2	74a5adef7d	* Optimize code.	2022-09-15 03:22:36 +00:00
wangyidong	9a3513a15c	* change for change table engine.	2022-08-12 16:11:35 +08:00
wangyidong	660c82b46e	* adjust for change table engine in upgrade.	2022-08-08 14:05:50 +08:00
liuruogu	cfdb0f849a	* Finish task #62920.	2022-08-02 09:21:49 +00:00
mayue	a9773c6be0	* Finish task #59700.	2022-07-04 17:22:22 +08:00
tianshujie	7372f7f936	* Finish story #32623.	2022-06-22 08:51:05 +08:00
孙广明	b896377846	* Change zentao license.	2022-06-08 10:02:29 +08:00
孙广明	b528156589	* Change license.	2022-06-08 09:34:46 +08:00
李玉春	392463cace	Merge branch 'sprint/168_sgm_45161' into 'sprint/168' ... Sprint/168 sgm 45161 See merge request easycorp/zentaopms!641	2021-11-30 05:16:08 +00:00
孙广明	9e9c024982	* Adjust lang.	2021-11-30 13:10:51 +08:00
孙广明	d58fb3c8e7	* Add lang and comment.	2021-11-30 13:08:17 +08:00
孙广明	19e08aafdc	* Finish task #45161.	2021-11-29 10:29:56 +08:00
孙广明	8656350081	* Remove noproject merge method.	2021-11-25 15:28:54 +08:00
孙广明	182106be13	* Finish task #45153.	2021-11-25 15:14:10 +08:00
holan20180123	1d51ae04a6	* Finish task #40824.	2021-08-03 09:18:03 +08:00
holan20180123	79087c0ac3	* Finish task #40509.	2021-07-30 09:26:30 +08:00
wangyidong	eab9f17636	* adjust for english.	2021-07-20 16:48:14 +08:00
zenggang	d8f8ae1e45	* English video task #40002	2021-07-16 14:31:28 +08:00
zenggang	f448f4d37e	* Finish task #40002	2021-07-15 16:33:59 +08:00
tianshujie98	1f4d75765d	* Adjust lang.	2021-07-15 16:03:56 +08:00
tianshujie98	2759b55b41	* Adjust lang.	2021-07-15 14:39:58 +08:00
tianshujie98	d95833ed27	*Fix bug #13666.	2021-07-15 13:09:38 +08:00