Commit Graph

79 Commits

Author SHA1 Message Date
wangyidong
ff210f304d * finish task #2377. 2015-11-10 11:11:48 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
333b0be157 * finish task #2323,2340. 2015-10-22 09:03:37 +08:00
wangyidong
dca976c86a * code for task #2236. 2015-05-06 11:16:28 +08:00
wangyidong
06f1199112 * finish task #2236. 2015-05-05 15:50:34 +08:00
wangyidong
ab3c3a6fbf * fix a bug #689. 2015-04-14 11:07:48 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
60595ffa00 * fix a bug. 2014-08-21 01:43:03 +00:00
xia0ta0
41c3ffae4f Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/search/view/buildform.html.php
2014-08-20 10:54:50 +08:00
wangyidong
7d67d5da39 * finish task #1897. 2014-06-18 08:13:54 +00: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
aa96761a82 * changed css names.
* added method 'setSyncTrigger' in 'my.full.js'.
2014-03-26 15:44:57 +08:00
wyd621
7ce1b3428d * fix a bug for http://www.zentao.net/thread-view-83210.html. 2014-03-18 07:14:27 +00:00
azhi
b74358ede4 * fix bug#469. 2013-08-21 10:43:22 +08:00
xia0ta0
0304d4ae97 * fix a bug : fix getTaskOptionMenu. 2013-08-12 14:47:17 +08:00
xia0ta0
d346820f65 * code for task#1665. 2013-08-02 08:58:02 +08:00
azhi
633d26dc8a * finish task#1068. 2013-08-01 13:31:51 +08:00
wyd621
ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
chencongzhi520@gmail.com
d183a1a25f * code for task#1487. 2013-07-03 08:25:39 +00:00
zhujinyong
20e39052f8 * code for task#1374. 2013-06-17 09:21:38 +00:00
zhujinyong
2f12f4a366 * code for task#1374. 2013-06-17 08:12:58 +00:00
zhujinyong
e00cffaa1f * code for task#1374. 2013-06-17 06:03:36 +00:00
zhujinyong
1e9d7163f5 * fix option menu of edit. 2013-06-13 11:17:14 +00:00
zhujinyong
99e9616476 * code for task#1374. 2013-06-13 05:11:38 +00:00
zhujinyong
c43c3aebcd * code for task#1368. 2013-06-04 05:59:58 +00:00
chencongzhi520@gmail.com
8132507a48 * finish task#1197. 2013-04-28 01:47:02 +00:00
wangyidong
540c9d6618 * fix a bug when module root is 0. 2013-03-02 05:28:19 +00:00
wangchunsheng
6f1d979a7d * fix the warnning error. 2013-01-29 06:20:59 +00:00
wangchunsheng
18e0c28ac9 * change the title assign method. 2013-01-20 09:53:01 +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
e9535c219b * fix a bug for module of doc. 2012-12-27 01:27:35 +00:00
wangchunsheng
3523642713 * change QM to QD. 2012-12-17 07:11:59 +00:00
zhujinyong
94e3c1bbb2 - remove redundant code. 2012-12-12 09:30:52 +00:00
wangchunsheng
0f963343f6 * task#982. 2012-12-12 02:18:16 +00:00
zhujinyong
8ea6eb39ea * code for task#968. 2012-12-11 05:41:33 +00:00
wangyidong
8610f6b0f1 + add webapp module. 2012-11-30 06:06:33 +00:00
chencongzhi520@gmail.com
756a0c2879 * fix bug#358. 2012-10-30 01:48:39 +00:00
areyou123456
f232fbbde9 * finish the task #869 2012-08-16 07:31:48 +00:00
zhujinyong
10883b31bc * adjust menuOrder. 2012-07-01 01:58:06 +00:00
shiyangyangwork@yahoo.cn
94a38a7655 * finish the task #854. 2012-06-29 08:27:11 +00:00
wangchunsheng
629a91c27b * Fix bug#306. 2012-06-22 08:44: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
liukmqd@gmail.com
c0c5f7a784 - delete code for revert 2011-05-02 03:14:00 +00:00
wangyidong
0d0a0871a6 + add for project-task projectID undefind 2011-05-02 02:12:53 +00:00
wangchunsheng
0c742ac232 * adjust the sync product module code. 2011-04-30 05:44:32 +00:00