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

..

activate.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

assignto.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

batchcreate.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00

batchedit.html.php

* changed css names.

2014-03-26 15:44:57 +08:00

browse.custom.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

browse.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

buildtemplates.html.php

* fix bug #531.

2013-11-01 01:54:15 +00:00

close.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

confirmbug.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

create.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00

customfields.html.php

* changed css names.

2014-03-25 11:25:30 +08:00

edit.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

export.html.php

…

m.activate.html.php

* changed css names to compatible with zui.

2014-03-26 11:01:19 +08:00

m.ajaxgetdetail.html.php

…

m.assignto.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00

m.browse.html.php

…

m.close.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00

m.confirmbug.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00

m.resolve.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00

m.sendmail.html.php

* Reduce redundant.

2013-07-06 08:15:52 +00:00

m.view.html.php

* replace js:locate instead $this->locate.

2013-07-06 09:15:26 +00:00

report.html.php

* changed css names to compatible with zui.

2014-03-26 11:01:19 +08:00

resolve.html.php

Merge branch 'zui'

2014-03-27 16:27:43 +08:00

sendmail.html.php

* adjust for replace full webpath image to mail module.

2014-03-24 01:59:50 +00:00

view.html.php

* ajusted views.

2014-03-27 14:40:55 +08:00