Commit Graph

89 Commits

Author SHA1 Message Date
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
wyd621
aae95743f9 * finish task #1571. 2013-07-18 16:48:06 +08:00
wwccss
c20261cb20 * init ext directory again. 2013-07-18 09:17:31 +08:00
wyd621
ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
wangchunsheng
9a205f6de0 * convert the tw language. 2013-05-05 02:34:43 +00:00
wangchunsheng
44fea92190 + add tips. 2013-05-05 02:26:17 +00:00
wangchunsheng
ab4520283d * display the debug info directly.
* add tips.
 * add title and position.
2013-05-05 02:24:36 +00:00
wangchunsheng
63ae1adcfa * use $this->post->turnon instead of $this->config->mail->turnon. 2013-05-05 02:20:30 +00:00
chencongzhi520@gmail.com
52c2beecbe * code for task#1259. 2013-05-05 00:22:53 +00:00
chencongzhi520@gmail.com
78e7a70d10 * finish task#1259. 2013-04-29 09:06:34 +00:00
wangyidong
16056e12ef * zh-cn to zh-tw for lang. 2013-02-28 00:52:05 +00:00
wangchunsheng
61850c11c9 * change the title assign method. 2013-01-20 09:10:57 +00:00
wangchunsheng
8f0d651d9c * convert to unix format. 2013-01-18 01:58:14 +00:00
wangchunsheng
48d43cb5e1 * change copyright time. 2013-01-18 01:18:58 +00:00
zhujinyong
71bfcceb8d + add mailExist function. 2013-01-11 05:32:54 +00:00
wangchunsheng
92cb1c6b70 * rewrite the mail setting logic, save config to database. 2013-01-11 03:12:52 +00:00
zhujinyong
b1cccb035a * code for task#1052. 2013-01-05 01:52:09 +00:00
wangchunsheng
272897c294 * task#982, mail module. 2012-12-12 09:16:41 +00:00
wangchunsheng
0f963343f6 * task#982. 2012-12-12 02:18:16 +00:00
wangchunsheng
9d4feeb031 * change timeout to 3 seconds. 2012-07-20 06:02:42 +00:00
wangchunsheng
b6607176e9 * change edit page's form to dataform. 2012-07-02 06:25:41 +00:00
shiyangyangwork@yahoo.cn
d827ee3da8 * update upgrade. 2012-07-01 03:11:28 +00:00
wangchunsheng
db990d05df * Code for task#818. 2012-06-23 02:33:14 +00:00
wangchunsheng
90b50b3a4b * Refactory the email setting.
* Finish task#818.
2012-06-21 12:25:25 +00:00
wangchunsheng
65e19fa8a8 * convert to unix format. 2012-02-21 07:22:58 +00:00
zhujinyong
5d0c048bab * fix some bugs. 2012-02-20 09:06:53 +00:00
shiyangyangwork@yahoo.cn
b30c103ecc finish the task #689. 2012-02-09 06:56:35 +00:00
shiyangyangwork@yahoo.cn
27b4997d7e fix a bug for dailyreminder($this->app->user->account in mail's model.php is null when send email). 2011-12-23 06:18:55 +00:00
shiyangyangwork@yahoo.cn
2194acafe5 * run cn2tw and fix a bug for batchcreate of task. 2011-12-01 07:17:55 +00:00