16465 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
guanxiying	c1942d154a	* Fix story menu.	2019-11-18 13:18:00 +08:00
guanxiying	bda037db53	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-18 13:09:10 +08:00
guanxiying	58357af226	* Finish task #6549.	2019-11-18 13:06:50 +08:00
Yagami	029c22e0ac	* Finish task #6500.	2019-11-18 11:26:30 +08:00
Yagami	5d2f8443ab	* Finish task #6499.	2019-11-18 11:14:03 +08:00
guanxiying	34b52a6851	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-18 09:48:07 +08:00
Yagami	6b485ddade	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-18 09:47:11 +08:00
Yagami	a418e6f42f	* Finish task #6497.	2019-11-18 09:46:53 +08:00
guanxiying	926212cf06	* Add set concept items.	2019-11-18 09:41:52 +08:00
guanxiying	ed524799c3	* Set story common from db.	2019-11-18 09:41:19 +08:00
guanxiying	fdc60a1da9	* Add story common.	2019-11-18 09:40:19 +08:00
Yagami	4448827fca	* Finish task #6494.	2019-11-15 15:43:59 +08:00
Yagami	504a490a65	* Finish task #6492.	2019-11-15 13:41:25 +08:00
Yagami	6cb659aea3	* Fix bug #2859.	2019-11-15 13:19:49 +08:00
Yagami	aed741992d	* Fix module export.	2019-11-15 11:25:28 +08:00
Yagami	cc2c00797f	* Finish task #6491.	2019-11-15 11:07:00 +08:00
Yagami	043ecb81c7	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-15 09:51:49 +08:00
Yagami	a8f40667f9	* Finish task #6489.	2019-11-15 09:51:25 +08:00
wangyidong	eb1267ebe7	* finish task #6536.	2019-11-15 09:04:48 +08:00
Yagami	64b8d04f77	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-14 16:54:48 +08:00
Yagami	e6486f6c19	* Finish task #6487.	2019-11-14 16:54:31 +08:00
wangyidong	5716ae1c87	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-14 16:39:39 +08:00
wangyidong	1b3b228157	* adjust for build deb.	2019-11-14 16:38:32 +08:00
wangyidong	302e2bd7b2	* fix bug 2856.	2019-11-14 16:37:53 +08:00
Yagami	f540400cff	* Finish task #6486.	2019-11-14 14:54:43 +08:00
Yagami	6295c54071	* Finish task #6485.	2019-11-14 14:36:39 +08:00
Yagami	51e84b63ee	* Finish task #6484.	2019-11-14 14:25:26 +08:00
Yagami	55e0dc16c3	* Finish task #6483.	2019-11-14 13:06:42 +08:00
Yagami	85fa678a6d	* Finish task #6482.	2019-11-14 10:53:14 +08:00
Yagami	8c75ca4b2d	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-14 10:45:10 +08:00
Yagami	6a34209544	* Finish task #6481.	2019-11-14 10:44:43 +08:00
wangyidong	f2742668a5	* add CHANGELOG and other lang. zentaopms_11.6.5_20191113	2019-11-13 10:27:34 +08:00
wangyidong	c8835a5015	* adjust for check referer for api.	2019-11-13 10:08:17 +08:00
wangyidong	95c2e3b810	* finish story #4411.	2019-11-13 09:09:51 +08:00
wangyidong	714065a8bb	* adjust for check require flow field.	2019-11-12 11:29:53 +08:00
wangyidong	6d6f8cd869	* fix bug.	2019-11-11 08:17:41 +08:00
wangyidong	bd4b58d951	* fix bug for install.	2019-11-08 14:26:28 +08:00
wangyidong	793319d21b	* add new version and upgrade.	2019-11-08 09:36:05 +08:00
wangyidong	edb0a60041	* fix bug for alert when save template name.	2019-11-07 15:57:31 +08:00
wangyidong	98a7da512f	* fix bug #2064.	2019-11-07 13:53:30 +08:00
wangyidong	7c02a1f88a	* fix bug #2064.	2019-11-07 13:50:32 +08:00
wangyidong	e181fa91c1	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-07 11:31:52 +08:00
wangyidong	c628ea60ef	* adjust for style.	2019-11-07 11:31:33 +08:00
wangyidong	a5411a8aca	* adjust for dashboard.	2019-11-07 11:30:43 +08:00
wangyidong	630c2a87e7	* get all branch for workflowdatasource.	2019-11-07 11:29:29 +08:00
wangyidong	edac0a4dd7	* adjust for caselib.	2019-11-07 11:29:03 +08:00
Catouse	6de3055964	* add ja language support by update zui.	2019-11-07 11:00:35 +08:00
Catouse	53196a2677	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-05 17:19:11 +08:00
Catouse	81a8539a36	* add ja language data to kindeditor.	2019-11-05 17:18:56 +08:00
Yagami	fc0f30c34c	* Code for cmmi.	2019-11-01 15:25:29 +08:00