176 Commits

Include renames

Author	SHA1	Message	Date
wangyidong	ca08397cc6	* fix bug #1037.	2017-03-22 14:34:50 +08:00
wangyidong	dc812fd161	* adjust code.	2017-03-21 15:06:38 +08:00
wangyidong	06a4993ab3	* fix bug.	2017-03-20 16:51:37 +08:00
wangyidong	7905394d88	* change for upgrade.	2017-01-17 13:51:06 +08:00
wangyidong	54962074fc	* finish task #2884,2872.	2017-01-17 09:19:52 +08:00
tengfei	efae75ae7f	* added newly translated content	2017-01-16 17:01:45 +08:00
wangyidong	8af5e74ad4	* copy zh-cn lang to en.	2017-01-16 14:47:43 +08:00
wangyidong	392e2d6aa1	* adjust qq for zentao user.	2017-01-16 13:36:57 +08:00
wangyidong	3c85e54038	* finish task #2872.	2017-01-11 16:42:13 +08:00
chenfeiCF	61db347702	* finish task #2880.	2017-01-10 14:13:31 +08:00
wangyidong	cd25a4216e	* fix for save mail queue.	2017-01-09 09:29:09 +08:00
wangyidong	1d6d3e8cb1	* set company field required.	2017-01-05 11:12:43 +08:00
tengfei	a34e4cc7fa	*translation new items in Admin, Mail	2017-01-03 11:13:43 +08:00
wangyidong	141b5c4df0	* change for en lang and zh-tw lang.	2017-01-03 10:18:33 +08:00
wangyidong	0866c20425	* adjust for send by ztcloud.	2016-12-29 16:20:18 +08:00
chenfeiCF	d77aae1feb	* merge two mails subject as the subject.	2016-12-28 14:49:42 +08:00
wangyidong	cdbf4c6dcf	* adjust for certify.	2016-12-27 15:33:26 +08:00
wangyidong	80a11b9089	* fix bug #952.	2016-12-26 15:40:02 +08:00
tengfei	7252ed181d	*adjust for screenshot	2016-12-22 17:06:23 +08:00
chenfeiCF	a94a63998b	* not merge mails if method is browse of mail module.	2016-12-21 14:46:28 +08:00
chenfeiCF	33408e3b65	Merge branch 'master' of github.com:easysoft/zentaopms	2016-12-20 09:01:45 +08:00
chenfeiCF	507d9a2d8e	* merge mails when async send mails.	2016-12-20 08:58:36 +08:00
wangyidong	22eb0f10cd	* adjust for sendcloud.	2016-12-19 16:34:33 +08:00
wangyidong	86b0a414f5	* change for bind sendcloud.	2016-12-19 09:32:08 +08:00
tengfei	d8ea232ee7	*Adjust for screenshot	2016-12-14 11:32:57 +08:00
wangyidong	21e8457d5e	* change for resource and en zh-tw lang.	2016-12-06 13:25:25 +08:00
wangyidong	185f540348	* adjust for skip task when batch close.	2016-12-06 11:30:59 +08:00
tengfei	ae1b3f9080	* Delete useless files.	2016-11-30 10:35:14 +08:00
tengfei	6b8f460ede	* bak.	2016-11-30 10:28:54 +08:00
tengfei	b7c509aa09	* verification->acceptance	2016-11-30 09:22:47 +08:00
wangyidong	7ef7b45060	Merge branch 'master' of github.com:easysoft/zentaopms	2016-11-25 15:42:42 +08:00
wangyidong	7ac6afe616	* finish task #2719,2729.	2016-11-25 15:32:28 +08:00
Catouse	8951f8d0af	* improve UI of views with table, finish task #2687，task #2749 and task #2762.	2016-11-24 15:47:47 +08:00
wangyidong	c6d79ccd4b	* finish task #2753 and code task #2719.	2016-11-22 15:56:30 +08:00
wangyidong	582e392429	* code for task #2699,2791.	2016-11-18 17:12:09 +08:00
wangyidong	b4fd8e184f	* change for sendcloud async.	2016-11-17 11:35:24 +08:00
wangyidong	78db39b7dc	* change for en lang.	2016-11-07 11:14:35 +08:00
wangyidong	a42672984d	* fix error.	2016-10-31 11:09:39 +08:00
wangyidong	e08432aaf2	* fix bugs.	2016-09-08 17:30:38 +08:00
wangyidong	1c39368eb2	* fix for sync sendcloud user with '-'.	2016-06-08 11:34:04 +08:00
wangyidong	21d6f08818	* finish task #2618.	2016-06-07 15:15:10 +08:00
wangyidong	78ce4d3aeb	* code for task #2616.	2016-06-07 13:59:03 +08:00
wangyidong	b986c959e2	* finish task #2616.	2016-06-07 13:47:04 +08:00
wangyidong	77bbc814ce	* adjust style for sendclouduser page.	2016-05-17 13:47:36 +08:00
wangyidong	b57e0ba64f	* change for zh-tw lang.	2016-03-15 11:06:21 +08:00
wangyidong	0e7c551027	* fix zget function and fix error.	2016-03-15 09:57:03 +08:00
chenfeiCF	0bebfe176a	* delete lang items which have not been used.	2016-03-14 02:44:40 +08:00
wangyidong	4569039d98	* fix style for selectButton.	2016-03-09 17:35:26 +08:00
wangyidong	e23311969d	* change for new framework.	2016-03-01 10:57:53 +08:00
Catouse	8c284f4459	* change alert style in mail/save UI.	2016-02-22 17:21:17 +08:00