Commit Graph

12 Commits

Author SHA1 Message Date
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
wangyidong
2082aee081 * adjust for the width of project progess. 2016-05-24 13:47:55 +08:00
Catouse
de490bb1c7 * ajust progress bar style in project block. 2016-05-24 13:18:55 +08:00
wangyidong
619e9220ca * adjust and fix block. 2016-04-15 15:03:35 +08:00
Catouse
c81ef5564d * change blocks UI. 2016-04-14 11:50:13 +08:00
Catouse
27ed67331e * improve dashboard UI. 2016-04-13 17:42:21 +08:00
wangyidong
13f1fd6bf7 * change for print blok. 2016-04-11 15:48:58 +08:00
chenfeiCF
8cd6978375 * finish task #2567. 2016-03-29 10:34:34 +08:00
daitingting
290d1a76bc * Adjust codes. 2015-11-27 15:40:23 +08:00
daitingting
61ecdb6000 * Add more link for blocks. 2015-11-27 15:26:19 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
474e1fe5bd + finish task #2279. 2015-09-07 09:23:21 +08:00