Commit Graph
68 Commits
Author SHA1 Message Date
wangyidong 0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong 9528bba909 * adjust code for task #2151. 2014-12-16 06:41:15 +00:00
wangyidong d015ef75e7 * finish task #2168. 2014-12-04 09:07:18 +00:00
chujilu ff8ec7a72c * finish task 2019 2014-08-15 17:40:56 +08:00
chujilu 56737be238 * add position 2014-08-15 14:14:44 +08:00
wangyidong ea972df479 * finish task #1965. 2014-07-29 09:02:11 +00:00
xia0ta0 6696901714 * code for task#1888. 2014-06-17 15:26:05 +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 e94843f4e2 * changed css names to compatible with zui. 2014-03-26 11:01:19 +08:00
wyd621 1a29d43cb0 * code for task #1812. 2014-03-19 02:22:39 +00:00
xia0ta0 30e562425f * fix bug#520. 2013-10-23 16:33:58 +08:00
wyd621 2d5e90cf8f * fix bug #515. 2013-10-09 03:26:47 +00:00
wyd621 500858eb5e * adjust code and fix bugs. 2013-08-06 16:11:11 +08:00
wyd621 ff28f5e032 Merge branch 'master' of git@github.com:easysoft/zentaopms
Conflicts:

	module/productplan/control.php
2013-08-01 00:29:30 +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 8ffd00eca6 * fix a bug : merge ajaxGetPlans function. 2013-08-01 15:15:52 +08:00
xia0ta0 affd044bb3 * code for task#1657. 2013-08-01 11:07:00 +08:00
xia0ta0 4d19ea6f10 * code for task#1657. 2013-08-01 10:57:12 +08:00
wyd621 4cc4158bdc * finish task #1617. 2013-07-31 16:35:40 +08:00
xia0ta0 e29bad9f08 * code for task#1657. 2013-07-31 15:59:31 +08:00
xia0ta0 67df14b2f1 * code for task#1657. 2013-07-30 15:26:08 +08:00
xia0ta0 01f57a842d + add ajaxGetPlans function. 2013-07-29 17:16:05 +08:00
xia0ta0 cbdff77a27 * code for task#1587. 2013-07-29 16:23:35 +08:00
xia0ta0 09e8e02236 * code for task#1587. 2013-07-29 15:57:15 +08:00
xia0ta0 6258e8e6df Merge branch 'master' of github.com:easysoft/zentaopms 2013-07-29 15:10:50 +08:00
xia0ta0 8734221200 * code for task#1589. 2013-07-29 15:10:06 +08:00
azhi f7c5fdcc41 * add server tablesorter for productplan list.
*  code for task#1609.
2013-07-29 14:07:35 +08:00
xia0ta0 0d1a23a526 * code for task#1589. 2013-07-24 14:16:23 +08:00
wyd621 fd4a36dc8c * finish task #1601. 2013-07-23 15:49:47 +08:00
wyd621 68608781c8 Merge branch 'master' of git@github.com:easysoft/zentaopms 2013-07-22 15:32:29 +08:00
wyd621 d1c69f8217 * finish task #1586. 2013-07-22 15:25:09 +08:00
azhi 6fa5deb13a * finish task#1609. 2013-07-22 14:46:47 +08:00
wyd621 ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
chencongzhi520@gmail.com c31a78e23b * finish task#1251. 2013-04-17 06:45:08 +00:00
chencongzhi520@gmail.com 70b0e9bbd5 * finish task#1134. 2013-02-27 00:41:02 +00:00
wangchunsheng 8135f0b5b3 * change the title assign method. 2013-01-20 09:15:24 +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
wangyidong 67ca479090 * adjust the page link of click save button.
* goto productplan-view instead productplan-browse.
2013-01-09 07:50:38 +00:00
areyou123456 f232fbbde9 * finish the task #869 2012-08-16 07:31:48 +00:00
wangchunsheng bdb9f884e3 * only set image size when view a product plan. 2012-04-30 06:03:54 +00:00
wangchunsheng 65e19fa8a8 * convert to unix format. 2012-02-21 07:22:58 +00:00
shiyangyangwork@yahoo.cn b30c103ecc finish the task #689. 2012-02-09 06:56:35 +00:00
wangyidong bfc014a1cc + add chinese name of company. 2011-06-24 10:11:25 +00:00
wangyidong bb74a892e6 * change Copyright to 2011. 2011-06-23 08:59:18 +00:00
wangchunsheng 3c92c3e676 - delete the unused code. 2011-05-02 09:16:09 +00:00
liukmqd@gmail.com 960a963116 * Make reuse of 'summary' posible; 2011-05-01 08:37:26 +00:00
wangchunsheng 16ae69f562 * revert to version 1396. 2011-02-21 14:35:26 +00:00
wangchunsheng bb0477d8b8 * change copyright time. 2011-02-17 14:31:38 +00:00