Commit Graph

259 Commits

Author SHA1 Message Date
chenfeiCF
eb20cc4741 * fix the bug: not load search model when calling setSearchParams method. 2016-03-13 11:54:47 +08:00
chenfeiCF
0190934f07 * add empty mode for getPairs method of project model. 2016-03-13 10:56:16 +08:00
chenfeiCF
ab8f86396f * adjust buildSearchForm method: put setSearchParams method in model. 2016-03-13 07:43:03 +08:00
chenfeiCF
140a15b0be * change the dao property name for task #2458. 2016-03-09 16:50:36 +08:00
chenfeiCF
2f9ac5d436 * refactor task method for project module. 2016-03-02 17:35:05 +08:00
Catouse
9141bb13d7 * fix style of tree menu. 2016-02-22 15:03:44 +08:00
chenfeiCF
d9ddbd0450 * finish task #2458. 2016-02-19 13:49:25 +08:00
chenfeiCF
f4ea06eddf * finish task #2392. 2015-11-13 08:02:54 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
5d7126f5ca * finish task #2335. 2015-11-02 15:30:43 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
e1d907628c * finish task #2346 2347 2348. 2015-10-28 14:33:06 +08:00
wangyidong
b979a5da38 * finish task #2352. 2015-10-27 09:34:05 +08:00
wangyidong
5029ba6b23 * finish task #2344. 2015-10-26 13:12:00 +08:00
wangyidong
66af5e5183 * finish task #2344. 2015-10-26 09:35:22 +08:00
wangyidong
9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00
wangyidong
df8478386a * adjust for import bug. 2015-09-17 14:45:08 +08:00
wangyidong
84d7e49211 * finish task #2278. 2015-09-07 14:10:37 +08:00
wangyidong
bf21838118 * finish task #2285. 2015-09-02 13:13:58 +08:00
wangyidong
0df81600ae * finish task #2296. 2015-08-28 15:55:31 +08:00
wangyidong
91b76c85d8 * finish task #2313. 2015-08-28 10:54:37 +08:00
wangyidong
c4c6b1bc2d * fix bug #723. 2015-07-29 13:44:20 +08:00
wangyidong
ded3e99d37 * finish task #2267. 2015-05-13 16:44:44 +08:00
Catouse
70e1004102 * change burn report UI. 2015-05-11 17:05:14 +08:00
wangyidong
e2260064d8 * change for order. 2015-05-08 15:44:14 +08:00
wangyidong
163fb178f1 * finish task #2237. 2015-05-08 13:12:15 +08:00
wangyidong
cd1a74d560 Merge branch 'master' of github.com:easysoft/zentaopms 2015-05-08 09:50:06 +08:00
wangyidong
36a4c32720 * finish task #2241,2245. 2015-05-08 09:47:39 +08:00
Catouse
cd464d2a0f * finish task #2243:change search drop menu UI. 2015-05-07 15:27:21 +08:00
wangyidong
e5bb896f5a * fix a bug. 2015-04-27 09:36:40 +08:00
wangyidong
614580a026 * fix a bug for #690. 2015-04-14 10:36:00 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
a175b9bae8 * finish task #2188. 2015-01-28 10:09:56 +08:00
wangyidong
2d83179de0 * finish task #2193. 2015-01-27 17:16:43 +08:00
xia0ta0
b6c6ff304b * code for task#658. 2014-12-12 09:32:06 +08:00
xia0ta0
571770ea9b * code for task#2171. 2014-12-10 17:36:45 +08:00
wangyidong
b25a13a281 * fix a bug for ignore deleted project. 2014-12-01 02:31:09 +00:00
wangyidong
d1aed6cc98 * fix a bug #652. 2014-11-27 06:46:49 +00:00
chujilu
00627dc835 * activate Bug when importbug if bug postponed. 2014-08-22 15:24:29 +08:00
wangyidong
ffd8af5907 * add pause task when import task. 2014-08-21 09:19:02 +00:00
wangyidong
212b8fdd02 * finish task #2068. 2014-08-19 03:29:46 +00:00
wangyidong
de50683bc3 * finish task #2050. 2014-08-18 09:02:04 +00:00
wangyidong
fd0f8e02f2 * finish task #1202. 2014-08-13 09:03:41 +00:00
wangyidong
01023e5fb2 * finish task #1793. 2014-08-12 08:14:52 +00:00
wangyidong
229d23bf0f * finish task #1962. 2014-07-28 02:19:10 +00:00
wangyidong
b1c8b7953a * finish task #1904. 2014-06-19 06:26:31 +00:00
xia0ta0
2bc26e6bf5 * code for task#1896. 2014-06-18 13:36:12 +08:00
wyd621
e3d60141b9 * fix errors. 2014-04-02 00:47:07 +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
wyd621
82c7ada6a0 * change note. 2014-03-24 03:36:59 +00:00