Commit Graph

117 Commits

Author SHA1 Message Date
wangyidong
8110f8fcb2 * Sync to sendcloud when create,edit and delete user. 2015-09-17 16:23:51 +08:00
wangyidong
9665abb8ed * adjust for mail. 2015-09-17 15:34:25 +08:00
wangyidong
f008c12234 * adjust code for utf8 bom in file. 2015-09-16 10:19:31 +08:00
wangyidong
91890ff23b * finish task #2273. 2015-09-15 14:40:20 +08:00
wangyidong
ace8ade51f * adjust lang for sendcloud. 2015-09-10 17:03:19 +08:00
wangyidong
5c13559737 * fix bug #735. 2015-09-10 16:08:45 +08:00
wangyidong
0bf04601f0 * adjust lang for sso and mail. 2015-09-09 10:03:23 +08:00
wangyidong
530a68da22 * finish task #2272,2271,2270. 2015-09-08 15:30:11 +08:00
wangyidong
0f79a4f998 * finish task #2315. 2015-08-26 14:37:01 +08:00
wangyidong
ecf44af91d * fix bugs. 2015-07-01 10:29:06 +08:00
wangyidong
922348465d * fix bugs. 2015-03-26 16:00:21 +08:00
wangyidong
2fce1a136b * fix a bug and notice. 2015-03-13 13:55:06 +08:00
wangyidong
c4ade54fc3 fix a bug for async mail. 2015-03-13 13:33:30 +08:00
wangyidong
b80b3620ef * change for zh-tw. 2015-03-09 12:02:54 +08:00
wangyidong
e7f90d0f6b * adjust for cron. 2015-03-09 12:02:40 +08:00
wangyidong
a9e6dcc529 * change for group priv. 2015-03-02 14:24:44 +08:00
wangyidong
e3276297c5 * finish task #2208. 2015-02-28 17:26:27 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
03e21e8688 * fix for check tls when test mail. 2015-01-22 10:59:49 +08:00
xia0ta0
f22b980c23 * add ignore for iconv. 2014-11-25 10:40:19 +08:00
wangyidong
a8766c858f * fix a bug. 2014-11-24 08:51:39 +00:00
wangyidong
268435ebe5 * adjust for lang. 2014-11-07 02:35:49 +00:00
wangyidong
31e3daa4c8 * change lang. 2014-11-06 03:07:00 +00:00
wangyidong
9f39bc1e2e * adjust mail. 2014-11-06 03:03:14 +00:00
wangyidong
c0e7f91638 * finish task #2142. 2014-11-05 05:46:58 +00:00
ChuJilu
9395eb7517 * finish task #2108. 2014-11-04 11:56:41 +08:00
wangyidong
d89b6daa5a * finish task #2043,2094,2098. 2014-10-27 02:56:11 +00:00
wangyidong
51f65c74fc * adjust for get image in mail. 2014-10-21 05:20:58 +00:00
chujilu
9ccf0237c9 * trim field when email setting save,
* add project when no task at story view.
2014-08-13 10:53:17 +08:00
wangyidong
85dffb4773 * change version and priv. 2014-08-05 08:27:21 +00:00
wangyidong
c8a1e58aae * adjust lang for no fsocket. 2014-08-05 02:13:41 +00:00
wangyidong
408f5588ab * adjust code for task #1967. 2014-08-04 01:38:14 +00:00
wangyidong
4ae0876ba3 * finish task #1967. 2014-07-29 01:09:28 +00:00
wangyidong
e1d1c354fb * finish task #1971,1961. 2014-07-23 09:36:03 +00:00
xia0ta0
b55044252f * code for task#1906, fix QQMail. 2014-06-23 10:10:49 +08:00
Catouse
60002b6458 * ajusted views. 2014-04-03 18:04:26 +08:00
xia0ta0
a954e09d53 Merge branch 'zui'
Conflicts:
	module/bug/view/activate.html.php
	module/bug/view/assignto.html.php
	module/bug/view/confirmbug.html.php
	module/bug/view/edit.html.php
	module/bug/view/resolve.html.php
	module/build/view/create.html.php
	module/build/view/edit.html.php
	module/common/model.php
	module/common/view/header.lite.html.php
	module/file/view/edit.html.php
	module/my/view/bug.html.php
	module/product/view/browse.html.php
	module/product/view/close.html.php
	module/product/view/edit.html.php
	module/productplan/view/edit.html.php
	module/project/view/activate.html.php
	module/project/view/batchedit.html.php
	module/project/view/burn.html.php
	module/project/view/close.html.php
	module/project/view/edit.html.php
	module/project/view/putoff.html.php
	module/project/view/start.html.php
	module/project/view/story.html.php
	module/project/view/suspend.html.php
	module/project/view/taskheader.html.php
	module/release/view/edit.html.php
	module/search/view/buildform.html.php
	module/story/view/batchclose.html.php
	module/story/view/change.html.php
	module/task/control.php
	module/task/css/batchcreate.css
	module/task/view/activate.html.php
	module/task/view/assignto.html.php
	module/task/view/batchcreate.html.php
	module/task/view/cancel.html.php
	module/task/view/close.html.php
	module/task/view/create.html.php
	module/task/view/edit.html.php
	module/task/view/finish.html.php
	module/task/view/start.html.php
	module/testtask/view/close.html.php
	module/testtask/view/edit.html.php
	module/testtask/view/start.html.php
	www/theme/default/style.css
2014-03-27 16:27:43 +08:00
Catouse
ad3a1c29b8 * ajusted views.
* changed css names.
2014-03-27 14:40:55 +08:00
Catouse
e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
Catouse
c1fd283142 * changed css names. 2014-03-25 11:25:30 +08:00
xia0ta0
0d3c384895 Merge branch 'master' of github.com:easysoft/zentaopms 2014-03-24 14:25:40 +08:00
xia0ta0
9aa6a9e7e9 * change str_replace to nl2br. 2014-03-24 10:55:53 +08:00
wyd621
b66c834b43 * adjust for replace full webpath image to mail module. 2014-03-24 01:59:50 +00:00
wyd621
69106a374d * change for new version. 2013-08-05 10:22:07 +08:00
azhi
ad54b16e64 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-08-01 16:53:10 +08:00
azhi
68682101b5 * finish task#1645. 2013-08-01 16:52:24 +08:00
xia0ta0
73daf4dc85 * code for task#1639. 2013-08-01 14:33:39 +08:00
xia0ta0
6612defc02 * code for task#1629. 2013-08-01 14:14:17 +08:00
wyd621
fb1b8520a3 * fix app->error to app->triggerError. 2013-07-29 14:05:29 +08:00
xia0ta0
2d4a058478 * inLink has been changed to static function. 2013-07-24 15:37:07 +08:00