Commit Graph

205 Commits

Author SHA1 Message Date
wangyidong
0571e818d9 * adjust for cron page. 2018-04-24 16:17:08 +08:00
wangyidong
7719ba82d4 * adjust for mail pager. 2018-04-23 17:35:36 +08:00
liugang
e522b82a7e * Add saveSuccess to common lang files. 2018-04-17 15:53:36 +08:00
wangyidong
277dc2c2ec * change for upgrade. 2018-01-16 14:06:16 +08:00
dajiao007
e50e06350f adjust columns width' 2018-01-12 10:56:25 +08:00
wangyidong
0d77963c0a Merge branch 'master' of github.com:easysoft/zentaopms 2018-01-11 11:07:37 +08:00
wangyidong
bd1ea46a9c * finish task #3560. 2018-01-11 11:05:50 +08:00
dajiao007
fa00dc9d9c modify the translate 2018-01-10 19:39:51 +08:00
wangyidong
b10b13b4b8 * finish task #3562. 2018-01-08 15:50:53 +08:00
滔哥
d88201be75 * Format code. 2017-12-29 09:26:05 +08:00
wangyidong
1eeb0ca399 * change for zh-tw. 2017-12-22 10:08:54 +08:00
wangyidong
5dab74c631 * finish task #3480. 2017-12-18 10:34:34 +08:00
tengfei
5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
wangyidong
eb8d31ca6b * unique mail cc list. 2017-11-07 13:09:48 +08:00
滔哥
984f3940c9 change .gitignore 2017-10-20 14:31:55 +08:00
wangyidong
08c473b8ca * fix bug for zentaobiz. 2017-09-08 16:19:32 +08:00
wangyidong
f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
pengjiangxiu
ea306d3f3b * change lang file. 2017-08-24 14:03:58 +08:00
wangyidong
094c960bf4 * finish task #3088. 2017-08-23 14:55:49 +08:00
wangyidong
4f43386af8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-14 10:05:57 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
pengjiangxiu
dccebc7b9a * Finish task #3119. 2017-08-14 09:56:39 +08:00
wangyidong
794fb575db * adjust for save file not with extension. 2017-06-26 14:47:58 +08:00
wangyidong
d18cc65d90 * merge new framework. 2017-06-16 16:52:45 +08:00
wangyidong
de5c536659 * adjust for framework. 2017-06-14 15:23:38 +08:00
wangyidong
c27f1f7d34 * merge zentaophp to zentao. 2017-06-09 17:05:37 +08:00
wangyidong
12c288a4e7 * change for upgrade. 2017-05-16 14:27:53 +08:00
wangyidong
3e72482114 Finish task#3027 后台-计划任务在服务重启后可能无法读取正常的配置也有可能无法运行,cost:2 left:0 2017-05-04 14:42:55 +08:00
daitingting
1f6257ed8d * Adjust language. 2017-04-27 16:54:30 +08:00
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