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

Conflicts:
	module/block/view/projectblock.html.php

2016-05-24 14:24:10 +08:00

..

admin.html.php

* improve dashboard UI.

2016-04-14 09:08:32 +08:00

bugblock.html.php

* fix style for block view.

2016-04-26 09:59:15 +08:00

buildblock.html.php

* change for print blok.

2016-04-11 15:48:58 +08:00

caseblock.html.php

* fix style for block view.

2016-04-26 09:59:15 +08:00

dashboard.html.php

* remove unneed code.

2016-05-24 13:19:22 +08:00

dynamic.html.php

* code for task #2529.

2016-04-11 09:29:33 +08:00

flowchart.html.php

* finish task #2526, task #2525.

2016-04-27 08:59:20 +08:00

listblock.html.php

* change for print blok.

2016-04-11 15:48:58 +08:00

main.html.php

* adjust for block and fix bug.

2016-05-06 13:59:37 +08:00

planblock.html.php

* change for print blok.

2016-04-11 15:48:58 +08:00

productblock.html.php

* adjust for block.

2016-04-27 17:32:00 +08:00

projectblock.html.php

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

2016-05-24 14:24:10 +08:00

publicform.html.php

* improve dashboard UI.

2016-04-13 17:42:21 +08:00

releaseblock.html.php

* fix style for block view.

2016-04-26 09:59:15 +08:00

set.html.php

* default block name when add block.

2016-05-11 09:26:03 +08:00

setmodule.html.php

* default block name when add block.

2016-05-11 09:26:03 +08:00

storyblock.html.php

* fix style for block view.

2016-04-26 09:59:15 +08:00

taskblock.html.php

* fix style for block view.

2016-04-26 09:59:15 +08:00

testtaskblock.html.php

* fix style for block view.

2016-04-26 09:59:15 +08:00

todoblock.html.php

* change for print blok.

2016-04-11 15:48:58 +08:00