9842 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
pengjiangxiu	547355168d	* Finish task #3195.	2017-08-21 13:29:51 +08:00
wangyidong	0479f33e15	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-21 09:09:44 +08:00
wangyidong	3f431a2110	* finish task #3128.	2017-08-21 09:08:38 +08:00
sgm0422	f294f9b181	* Fix Bug #1195.	2017-08-18 16:26:28 +08:00
sgm0422	4db02b2d4e	* Fix Bug # 1200	2017-08-18 16:20:24 +08:00
pengjiangxiu	772b339664	Merge branch 'master' of https://github.com/easysoft/zentaopms	2017-08-18 15:21:14 +08:00
pengjiangxiu	ef7000ff45	* Adjust code.	2017-08-18 15:20:13 +08:00
wangyidong	653648b3eb	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-18 15:16:14 +08:00
wangyidong	5e267814d0	* finish task #3129.	2017-08-18 15:15:55 +08:00
pengjiangxiu	7f6274c07d	* Finish task #1201.	2017-08-18 15:10:07 +08:00
pengjiangxiu	594310a61a	* Finish task #1197.	2017-08-18 13:57:11 +08:00
pengjiangxiu	4732bfaebc	* Finish task #3184.	2017-08-18 13:51:29 +08:00
wangyidong	223910e142	* finish task #3192.	2017-08-18 13:28:46 +08:00
wangyidong	c06e7bfb03	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-18 13:05:06 +08:00
wangyidong	432d852092	* finish task #3156.	2017-08-18 13:04:45 +08:00
pengjiangxiu	a8c478c4f2	* Finish task #3183.	2017-08-18 11:32:25 +08:00
wangyidong	f090318a7a	* finish task #3135.	2017-08-18 11:05:27 +08:00
wangyidong	1359fddbf1	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-18 11:00:55 +08:00
wangyidong	d2485c8e82	* finish task #3106.	2017-08-18 11:00:38 +08:00
pengjiangxiu	1998bb4215	* Finish task #3137.	2017-08-18 11:00:29 +08:00
wangyidong	abc1180a2a	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-18 11:00:15 +08:00
wangyidong	70a30eb727	* adjust page for editor edit.	2017-08-18 10:59:46 +08:00
wangyidong	257a478940	* fix for show image in file download page.	2017-08-18 10:58:55 +08:00
pengjiangxiu	d4c5c73cf2	* Finish task #3150.	2017-08-18 09:34:33 +08:00
wangyidong	16af1cd290	* finish task #3099.	2017-08-17 16:29:15 +08:00
pengjiangxiu	e28ceee2d9	* Adjust code for tab to space.	2017-08-17 11:26:42 +08:00
pengjiangxiu	9e34e50947	* Finish task #3111.	2017-08-17 10:31:21 +08:00
pengjiangxiu	6c19289354	* Finish task #3126.	2017-08-16 17:18:45 +08:00
wangyidong	8d909478e2	* finish task #3136.	2017-08-16 16:52:45 +08:00
wangyidong	865146cc4c	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-16 16:44:43 +08:00
wangyidong	9a974c6c93	* finish task #3142.	2017-08-16 16:44:19 +08:00
pengjiangxiu	22d2a45563	Merge branch 'master' of https://github.com/easysoft/zentaopms	2017-08-16 16:27:29 +08:00
pengjiangxiu	282d166ac5	* Finish task #3131.	2017-08-16 16:26:46 +08:00
wangyidong	0508eefd70	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-16 16:13:05 +08:00
wangyidong	e3d3d6f573	* finish task #3109.	2017-08-16 16:12:50 +08:00
pengjiangxiu	c6165b16d5	* Finish task #1202.	2017-08-16 15:47:57 +08:00
wangyidong	79b4d4d97c	* finish task #3104.	2017-08-16 15:15:05 +08:00
wangyidong	9c0875d961	* finish task #3143.	2017-08-16 15:00:41 +08:00
wangyidong	84e91fc75a	* finish task #3102.	2017-08-16 14:24:58 +08:00
wangyidong	ef4cbfd1e3	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-16 13:33:11 +08:00
wangyidong	a25a10d542	* finish task #3147 and update HTMLPurifier.	2017-08-16 13:32:34 +08:00
pengjiangxiu	0480e28e67	* Finish task #3116.	2017-08-16 10:03:20 +08:00
wangyidong	d805329387	* finish task #3087.	2017-08-16 09:51:47 +08:00
wangyidong	bd622e3d23	* finish task #3086.	2017-08-16 09:36:51 +08:00
wangyidong	25530314a7	* finish task #3154.	2017-08-15 17:17:15 +08:00
wangyidong	27a57e6ee3	* finish task #3158.	2017-08-15 17:04:15 +08:00
wangyidong	fc3f537836	* finish task #3159.	2017-08-15 16:25:25 +08:00
wangyidong	bbe6de3e62	Merge branch 'master' of github.com:easysoft/zentaopms	2017-08-15 15:54:27 +08:00
wangyidong	68ac8081c6	* finish task #3163.	2017-08-15 15:53:54 +08:00
pengjiangxiu	4d72b7752e	* Finish task #3138.	2017-08-15 13:55:14 +08:00