Commit Graph

265 Commits

Author SHA1 Message Date
wangyidong
9f9d367606 Merge branch 'master' of github.com:easysoft/zentaopms 2015-08-26 14:55:36 +08:00
wangyidong
b34c1f5c6c * finish task #2320. 2015-08-26 14:54:54 +08:00
Catouse
783e6e90d8 * finish task #2314. 2015-08-26 14:38:16 +08:00
wangyidong
9390e960ee * finish task #3344. 2015-07-17 13:24:48 +08:00
wangyidong
ecf44af91d * fix bugs. 2015-07-01 10:29:06 +08:00
wangyidong
04c534936e * fix a bug. 2015-06-05 14:49:58 +08:00
wangyidong
dc0f5ec51a * change for notice. 2015-05-20 14:45:48 +08:00
wangyidong
55c7228a35 * adjust for project story module. 2015-05-20 11:06:16 +08:00
wangyidong
1c89035b86 * change for update order. 2015-05-20 09:47:21 +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
0aaefcaada * finish task #2253. 2015-05-08 16:24:04 +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
ba83f43b15 * finish task #2242. 2015-05-06 15:42:23 +08:00
wangyidong
c56d8e69c6 * finish task #2206, 2207. 2015-02-28 14:56:35 +08:00
wangyidong
cfc96b690e * fix bug #673. 2015-01-29 09:53:40 +08:00
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
wangyidong
2d83179de0 * finish task #2193. 2015-01-27 17:16:43 +08:00
wangyidong
b99331df56 * finish task #2196. 2015-01-27 15:06:32 +08:00
wangyidong
c5e93987e0 * finish task #2167. 2014-12-15 09:14:00 +00:00
xia0ta0
571770ea9b * code for task#2171. 2014-12-10 17:36:45 +08:00
xia0ta0
2677c5086a * code for task#2173. 2014-12-10 13:37:17 +08:00
wangyidong
bf41cdedb3 * fix a bug. 2014-12-05 01:37:42 +00:00
wangyidong
d015ef75e7 * finish task #2168. 2014-12-04 09:07:18 +00:00
wangyidong
894e932026 * fix a bug. 2014-11-07 06:47:56 +00:00
wangyidong
92e7e933cc * adjust code. 2014-11-07 02:14:17 +00:00
ChuJilu
c1337e49da * finish task #2107. 2014-11-05 17:23:04 +08:00
ChuJilu
18de3e20a0 * finish task 2130. 2014-10-28 13:36:36 +08:00
ChuJilu
1cae54bcaf * finish task 2106. 2014-10-24 16:17:03 +08:00
ChuJilu
067d69fc96 * finish task 2016. 2014-10-24 14:08:27 +08:00
ChuJilu
447af821e7 * finish task 2089. 2014-10-23 16:42:13 +08:00
chujilu
7b61d60845 * finish change task #2062 #2063 2014-08-21 13:53:19 +08:00
chujilu
fb1d75aa3e Merge branch 'master' of https://github.com/easysoft/zentaopms 2014-08-13 21:50:59 +08:00
chujilu
05081f19ba * add postponed bug when task import bug 2014-08-13 21:49:39 +08:00
wangyidong
8501046c11 * finish task #1185. 2014-08-13 05:58:51 +00:00
wangyidong
c49bc171fc * finish task #1393. 2014-07-25 05:53:25 +00:00
xia0ta0
6696901714 * code for task#1888. 2014-06-17 15:26:05 +08:00
wyd621
64b41bb092 * fix a bug for project burn. 2014-04-30 09:28:40 +00:00
Catouse
561f39afe8 * ajusted views.
* fixed iframe modal method in 'my.full.js'.
2014-03-28 11:06:06 +08:00
xia0ta0
285a010037 Merge branch 'master' of github.com:easysoft/zentaopms
Conflicts:
	module/project/view/build.html.php
2014-03-27 16:38:54 +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
99c8a0554e * ajusted views. 2014-03-27 09:12:38 +08:00
wyd621
f9b210c075 * change for burn. 2014-03-25 02:43:02 +00:00
wyd621
82c7ada6a0 * change note. 2014-03-24 03:36:59 +00:00
wyd621
b22a14b5f9 * change lang->date->day => $lang->day for common lang. 2014-03-24 03:20:42 +00:00
wyd621
01d820accb * adjust position for the function of clear. 2014-03-24 01:15:44 +00:00
wyd621
1a29d43cb0 * code for task #1812. 2014-03-19 02:22:39 +00:00
wyd621
d022e464cb * finish task #1804. 2014-03-14 03:27:53 +00:00