Commit Graph

88 Commits

Author SHA1 Message Date
chenfeiCF
a539be0c32 * adjust task #2731. 2016-12-04 13:35:40 +08:00
chenfeiCF
db7859a808 * finish task #2707. 2016-11-18 16:51:55 +08:00
chenfeiCF
3b87eda744 * finish task #2780. 2016-11-14 17:05:40 +08:00
chenfeiCF
cbd90fdd22 * finish task #2787. 2016-11-14 15:38:28 +08:00
wangyidong
48ada5974b * finish task #2416. 2015-11-26 13:11:01 +08:00
wangyidong
a01925a0f2 * finish task #2419. 2015-11-24 10:18:48 +08:00
chenfeiCF
2f28d73c47 * finish task #2400. 2015-11-13 10:54:14 +08:00
wangyidong
6e95c09e6c * finish task #2409. 2015-11-12 13:48:42 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
b65a72e141 * change code and add notice. 2015-11-03 16:05:40 +08:00
wangyidong
7c7117d233 * adjust productplan for branch. 2015-10-30 16:05:19 +08:00
wangyidong
e58fe08c46 * adjust search config for branch. 2015-10-30 09:13:43 +08:00
wangyidong
578d47a409 * finish task #2342. 2015-10-22 17:18:34 +08:00
wangyidong
9ad38472fc * finish task #2336,2337,2338,2339. 2015-10-20 10:11:46 +08:00
wangyidong
6e0f8ff5fc * finish task #2370. 2015-10-14 13:55:06 +08:00
wangyidong
e21f1727bd * finish task #2283. 2015-09-02 17:25:46 +08:00
wangyidong
ae4cd7ef86 * fix for link bug. 2015-05-25 13:43:37 +08:00
wangyidong
927851d74f * adjust for link story and bug for release build and productplan. 2015-05-20 16:13:24 +08:00
wangyidong
6a2a9be1e5 * fix bug #699. 2015-05-18 14:09:10 +08:00
wangyidong
a9df6f4f27 * finish task #2256. 2015-05-13 14:16:35 +08:00
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