Catouse 5c613b10e4 Merge branch 'master' of https://github.com/easysoft/zentaopms ...

Conflicts:
	module/productplan/css/view.css
	module/project/view/grouptask.html.php

2016-11-23 14:03:54 +08:00

..

css

* add task progress to datatable and adjust task view page of create method.

2016-11-22 10:38:33 +08:00

js

* finish task #2747.

2016-11-21 16:26:06 +08:00

lang

* finish task #2747.

2016-11-21 16:26:06 +08:00

view

Merge branch 'master' of https://github.com/easysoft/zentaopms

2016-11-23 14:03:54 +08:00

config.php

* add task progress to datatable and adjust task view page of create method.

2016-11-22 10:38:33 +08:00

control.php

* finish task #2776.

2016-11-21 12:03:44 +08:00

model.php

Merge branch 'master' of https://github.com/easysoft/zentaopms

2016-11-23 14:03:54 +08:00