16483 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yagami	e91028bbb7	* Finish task #6518.	2019-11-19 09:32:12 +08:00
Yagami	4767fec851	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-19 09:16:23 +08:00
Yagami	4251a59f0d	* Finish task #6512.	2019-11-19 09:15:55 +08:00
wangyidong	1eca1b14c1	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-18 17:13:35 +08:00
guanxiying	c43211716c	* Remove deleted users from team.	2019-11-18 16:56:10 +08:00
wangyidong	323fc07bab	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-18 16:17:56 +08:00
Yagami	b3c2163a26	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-18 16:17:55 +08:00
Yagami	ceebffb6fe	* Finish task #6396.	2019-11-18 16:17:38 +08:00
wangyidong	aa471fff1b	* finish task #6540.	2019-11-18 16:07:46 +08:00
guanxiying	4825707cae	* Fix bug #2779.	2019-11-18 16:00:56 +08:00
Yagami	b8e8e46637	Merge branch 'master' of https://github.com/easysoft/zentaopms	2019-11-18 15:43:22 +08:00
Yagami	800bc78722	* Finish task #6502.	2019-11-18 14:57:23 +08:00
guanxiying	31a001c6c3	* Replace story common.	2019-11-18 14:54:57 +08:00
guanxiying	871a6de666	* Fix ajax request.	2019-11-18 14:42:32 +08:00
guanxiying	ec57032159	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-18 14:21:51 +08:00
guanxiying	be4a224c64	* Fix hour point setting function.	2019-11-18 14:20:55 +08:00
wangyidong	7d26078e3d	Merge branch 'master' of github.com:easysoft/zentaopms	2019-11-18 14:15:10 +08:00
wangyidong	6434e06342	* finish task #6539,6537.	2019-11-18 14:14:03 +08:00
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