Commit Graph

8968 Commits

Author SHA1 Message Date
liugang
e2018bb1ea Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-27 13:38:51 +08:00
liugang
827b31d89e * Refact link story page and story page of project. 2018-04-27 13:36:09 +08:00
wangyidong
a3d22705dd Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-27 11:30:17 +08:00
wangyidong
5c0d4256d5 * change for task #3936. 2018-04-27 11:29:22 +08:00
daitingting
98c701ea4c * Adjust codes. 2018-04-27 11:22:58 +08:00
daitingting
f7f3638ca7 Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
	module/bug/lang/zh-cn.php
2018-04-27 11:00:34 +08:00
daitingting
0188883601 * Add project statistic block. 2018-04-27 10:58:57 +08:00
wangyidong
a28f947bb3 * finish task #3961. 2018-04-27 10:45:55 +08:00
wangyidong
a1a04aa45e Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-26 17:18:17 +08:00
wangyidong
960e0af5d2 * adjust for show count. 2018-04-26 17:17:47 +08:00
liugang
50336ef762 * Refact bug page of project. 2018-04-26 17:09:02 +08:00
liugang
dc7f7362a2 * Optimize codes. 2018-04-26 16:11:17 +08:00
liugang
2915d16f23 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-26 15:59:46 +08:00
liugang
371b6da8bb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-26 15:59:34 +08:00
wangyidong
ee20437535 * adjust for release link bug and story page. 2018-04-26 15:58:21 +08:00
liugang
9450ca5676 * Refact detail page of productplan and build. 2018-04-26 15:58:03 +08:00
wangyidong
0c0500f5d7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-26 11:28:34 +08:00
wangyidong
b59ac8b1a0 * finish task #3915,3917,3955. 2018-04-26 11:25:40 +08:00
daitingting
e4b46020b9 * Add project overview block. 2018-04-26 11:21:05 +08:00
liugang
eed193f310 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-25 17:46:24 +08:00
liugang
aff4e31c97 * Refact edit build page and build list page.
* Display dropdown list of builds in detail page of build.
2018-04-25 17:45:29 +08:00
daitingting
eafdacf022 * Rewrite view page of task. 2018-04-25 16:23:06 +08:00
daitingting
ae1dafbcdf * Add required for type field. 2018-04-25 16:03:22 +08:00
daitingting
fd1a63eb5b * Add tip when index page has no project. 2018-04-25 14:01:53 +08:00
daitingting
6202123583 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-25 13:19:45 +08:00
daitingting
0d8185d037 * Rewrite create page of task. 2018-04-25 13:19:23 +08:00
wangyidong
1dbb9d4370 Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-25 11:35:21 +08:00
wangyidong
5500b19f97 * finish task #3952. 2018-04-25 11:34:26 +08:00
liugang
c5371ac7e8 * Refact testtask page of project. 2018-04-25 11:08:57 +08:00
wangyidong
3eb0909c4d * adjust for dev page. 2018-04-25 09:40:09 +08:00
wangyidong
0571e818d9 * adjust for cron page. 2018-04-24 16:17:08 +08:00
wangyidong
d6b3c5cc6b Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-24 16:11:56 +08:00
wangyidong
d620047bba * adjust for admin dev page. 2018-04-24 16:11:10 +08:00
daitingting
b58d0fed16 * Adjust codes. 2018-04-24 15:48:11 +08:00
daitingting
8a652ea638 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-24 15:47:12 +08:00
daitingting
6b4a7348de * Rewrite create and edit page of build. 2018-04-24 15:46:45 +08:00
wangyidong
a5ee8fbb23 Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-24 11:13:23 +08:00
wangyidong
6be5af956c * adjust for webhook and message page. 2018-04-24 11:13:01 +08:00
daitingting
9fc1cfb5a2 * Optimize codes. 2018-04-24 10:53:04 +08:00
daitingting
6a3b7a11ee * Adjust it. 2018-04-24 09:39:05 +08:00
daitingting
a9f0a32466 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-23 18:00:49 +08:00
liugang
de78ed5863 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-23 17:48:00 +08:00
liugang
8153dae1bd * Refact manage view page and priv by group page of group. 2018-04-23 17:47:23 +08:00
wangyidong
7719ba82d4 * adjust for mail pager. 2018-04-23 17:35:36 +08:00
daitingting
592f179f34 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-23 17:31:19 +08:00
daitingting
fa6c4fdfb6 * Group roadmap. 2018-04-23 17:30:50 +08:00
wangyidong
95476f2de4 Merge branch 'master' of github.com:easysoft/zentaopms 2018-04-23 16:38:50 +08:00
wangyidong
e993f33007 * adjust for admin page. 2018-04-23 16:37:10 +08:00
daitingting
6731bbe3f0 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-04-23 16:13:13 +08:00
daitingting
800dbdbdee * Adjust codes. 2018-04-23 16:12:56 +08:00