769 Commits

Include renames

Author	SHA1	Message	Date
liyuchun	6c2cacf02c	Merge branch 'master' into zenops_41	2022-08-10 08:26:42 +00:00
wangyuting2	964e64efe1	* Finish task #63892.	2022-08-10 14:14:56 +08:00
王怡栋	9e6111ad6c	Merge branch 'master' into 'sprint/devplat_30' ... # Conflicts: # db/update17.4.sql	2022-08-08 08:44:25 +00:00
daitingting	ebfbc9df97	* Fix bug #26016.	2022-08-05 03:27:07 +00:00
wangyidong	aaee558b83	* code for task #62742.	2022-08-04 17:30:27 +08:00
wangyidong	f5b6edef01	Merge branch 'sprint/devplat_30'	2022-08-04 09:13:53 +08:00
daitingting	8709c1a5ea	* Finish task #62921.	2022-08-03 06:19:09 +00:00
caoyanyi	06abe97624	* Modify branch check error.	2022-08-02 15:19:08 +08:00
hufangzhou	8883ac8e77	* Finish task #62132, #62133, #62134, #62135, #62136.	2022-07-26 18:14:09 +08:00
宋辰轩	f82626dfab	* Fix api bug.	2022-07-21 17:05:38 +08:00
wangyidong	7542c26998	* code for task #61483.	2022-07-20 10:58:57 +08:00
wangyidong	35c8543a74	* adjust for check account in set vision.	2022-07-11 10:08:40 +08:00
wangyidong	072945f180	* fix for tid.	2022-07-07 10:09:19 +08:00
daitingting	e06b64e997	* Add fetchModule to distinguish rawModule.	2022-07-06 08:42:21 +00:00
zhujinyong	467b958ba0	* If run in container, no need check ok.txt.	2022-06-29 16:35:39 +08:00
wangyidong	549bd70626	* code for bug #24381.	2022-06-28 15:29:11 +08:00
wangyidong	9a586dbbb6	* adjust bug for flow.	2022-06-17 09:11:44 +08:00
zenggang	ea2280da59	* Adjust code	2022-06-14 06:56:01 +00:00
zenggang	cc49cbe439	* Finish task#57156	2022-06-14 06:03:55 +00:00
tanghucheng	72d05c14df	* Fix bug #23228.	2022-06-09 16:40:16 +08:00
wangyidong	f9a14f40d4	* adjust for task #56614.	2022-06-09 13:50:18 +08:00
wangyidong	5147feb289	* adjust for set flow uri.	2022-06-09 11:32:47 +08:00
tanghucheng	841c52b556	* Fix bug #23433.	2022-06-09 09:31:12 +08:00
wangyidong	11e6edcd22	Merge branch 'zdoo18'	2022-06-08 17:06:07 +08:00
daitingting	53b1eabf0e	* Return empty string when the time is empty.	2022-06-06 07:46:12 +00:00
wangyuting2	2c4c1a4779	* Finish task #12469.	2022-06-02 16:10:04 +08:00
lanzongjun	61234b500f	* fix bug workflowdatasource	2022-05-31 16:07:58 +08:00
wangyidong	a899fad671	* check $_SERVER['REQUEST_URI'] var.	2022-05-30 17:06:18 +08:00
liyuchun	8a008bc17a	* Fix bug for cli.	2022-05-26 02:48:59 +00:00
wangyidong	2bbae04ded	* adjust for tid.	2022-05-24 16:57:56 +08:00
wangyidong	b072234b4d	* adjust for tid.	2022-05-24 15:53:57 +08:00
wangyidong	967d24dd06	Merge branch 'sprint/189_package'	2022-05-24 10:32:09 +08:00
zhujinyong	632c0a569c	* Fix array type.	2022-05-24 09:15:44 +08:00
wangyidong	a8531b8e58	* fix bug.	2022-05-20 10:40:45 +08:00
wangyidong	e94adb7e51	* adjust for get installed version.	2022-05-20 08:33:01 +08:00
daitingting	cd6698cc9b	* Add relations params for buildActionMenu.	2022-05-18 07:38:45 +00:00
wangyidong	98df6e3ffb	* adjust code for tid.	2022-05-18 13:09:40 +08:00
wangyidong	d6cf08b9d7	Merge branch 'tid'	2022-05-18 10:20:48 +08:00
lanzongjun	6e0e9d2348	* fix bug #22570	2022-05-18 08:43:08 +08:00
lanzongjun	10eebbd136	* fix bug #22570	2022-05-17 17:13:17 +08:00
tanghucheng	d3dc4ebe43	* Fix bug.	2022-05-17 06:00:26 +00:00
王怡栋	93e5d9e108	Merge branch 'sprint/wangyuting_workflow' into 'master' ... * Fix print extend fields bug. See merge request easycorp/zentaopms!3362	2022-05-12 07:59:55 +00:00
wangyidong	450a61cf12	* fix bug #22415.	2022-05-12 15:52:24 +08:00
wangyuting2	58c08b95a6	* Fix print extend fields bug.	2022-05-12 14:10:10 +08:00
wangyuting2	d4ed89e64a	* Finish task #53548.	2022-05-11 15:05:13 +08:00
daitingting	0fba3427af	* Build operate menu for productplan module.	2022-05-11 01:39:53 +00:00
王怡栋	d9d331c38e	Merge branch 'master' into 'sprint/wangyuting_workflow' ... # Conflicts: # framework/control.class.php	2022-05-10 08:46:32 +00:00
wangyuting2	bcf64c0c54	* Optimize code.	2022-05-10 16:41:36 +08:00
wangyuting2	248683c67d	* Merge code.	2022-05-10 16:36:06 +08:00
wangyuting2	fe3c882c5e	* Adjust buildin workflow menu.	2022-05-10 16:32:04 +08:00