Commit Graph

852 Commits

Author SHA1 Message Date
chenfeiCF
e0b2e258d5 * finish task #2809. 2016-12-20 19:40:08 +08:00
tengfei
41de567793 * adjust for report 2016-12-20 15:34:33 +08:00
tengfei
934efeaa00 *ADJUST LINK->RELATE 2016-12-15 11:32:01 +08:00
tengfei
18e631d928 * adjust for screenshot 2016-12-13 14:28:36 +08:00
tengfei
4bbdd23f4d *chunge error 2016-12-09 10:43:02 +08:00
wangyidong
21e8457d5e * change for resource and en zh-tw lang. 2016-12-06 13:25:25 +08:00
wangyidong
185f540348 * adjust for skip task when batch close. 2016-12-06 11:30:59 +08:00
Catouse
08d5d09613 Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2016-12-05 11:06:10 +08:00
Catouse
ebe9fbe2cb * adjust style of task/create view. 2016-12-05 11:05:19 +08:00
chenfeiCF
2c902cce89 * adjust help info color in report page. 2016-12-05 10:23:20 +08:00
tengfei
7671623442 Merge branch 'master' of github.com:easysoft/zentaopms
* edit
2016-12-02 12:51:11 +08:00
tengfei
feb128a192 *edit 2016-12-02 12:50:14 +08:00
wangyidong
fffb794313 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-02 09:21:02 +08:00
Catouse
ea0e116b46 * adjust task/create view style. 2016-12-01 17:31:36 +08:00
Catouse
fd208b2f39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-12-01 17:28:02 +08:00
Catouse
dc8d9d4002 * code for task #2745. 2016-12-01 17:27:48 +08:00
chenfeiCF
2af603bac7 * adjust task #2681. 2016-12-01 17:07:13 +08:00
chenfeiCF
75589d210d * adjust task #2777. 2016-12-01 16:43:15 +08:00
wangyidong
75c4c563f5 * finish task #2783. 2016-12-01 15:36:25 +08:00
chenfeiCF
74aaed0949 * adjust task #2713. 2016-12-01 14:49:35 +08:00
chenfeiCF
fc7cbe828b * adjust task #2704. 2016-12-01 13:06:10 +08:00
tengfei
c1c7966674 *minor editing 2016-11-30 17:00:58 +08:00
chenfeiCF
bbed2e599c * adjust task #2681. 2016-11-30 15:32:08 +08:00
Catouse
147c76d99f Merge branch 'master' of https://github.com/easysoft/zentaopms 2016-11-30 14:23:03 +08:00
Catouse
462abed288 * show task progress in project task list with pie chart. 2016-11-30 14:22:51 +08:00
tengfei
ae1b3f9080 * Delete useless files. 2016-11-30 10:35:14 +08:00
tengfei
6b8f460ede * bak. 2016-11-30 10:28:54 +08:00
wangyidong
7ef7b45060 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-25 15:42:42 +08:00
wangyidong
7ac6afe616 * finish task #2719,2729. 2016-11-25 15:32:28 +08:00
chenfeiCF
bdac0837e5 * finish task #2714. 2016-11-24 15:35:40 +08:00
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
wangyidong
74071c46e5 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-23 10:59:24 +08:00
wangyidong
decf0f8b67 * finish task #2750. 2016-11-23 10:59:00 +08:00
chenfeiCF
7a9b077972 * finish task #2745. 2016-11-23 09:24:38 +08:00
Catouse
2a3e326962 * fix task pri text with zero value. 2016-11-22 16:17:40 +08:00
chenfeiCF
54419ad74b * add task progress to datatable and adjust task view page of create method. 2016-11-22 10:38:33 +08:00
chenfeiCF
a37904c148 * finish task #2747. 2016-11-21 16:26:06 +08:00
chenfeiCF
c8897865bc * finish task #2743. 2016-11-21 14:51:47 +08:00
wangyidong
30eafa9b80 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-21 12:04:13 +08:00
wangyidong
c4e8cef7f8 * finish task #2776. 2016-11-21 12:03:44 +08:00
chenfeiCF
b32c4eb6de * fix bug when get story tasks. 2016-11-21 10:26:29 +08:00
wangyidong
21c11b9edb * finish task #2783. 2016-11-21 09:57:06 +08:00
chenfeiCF
0bcb1b5cc8 * finish task #2713. 2016-11-17 17:25:16 +08:00
chenfeiCF
befa5a2a80 * finish task #2704. 2016-11-17 14:42:06 +08:00
wangyidong
f605f772c9 Merge branch 'master' of github.com:easysoft/zentaopms 2016-11-15 18:04:19 +08:00
wangyidong
3559b3c03e * finish task #2786. 2016-11-15 18:03:29 +08:00
chenfeiCF
e2d06a1858 * finish task #2778. 2016-11-15 17:35:29 +08:00
Renee
8a3e3c3b0e Update en.php 2016-11-15 14:01:23 +08:00
chenfeiCF
5e25d0396b * finish task #2681. 2016-11-15 09:50:38 +08:00
chenfeiCF
2035c1881b * finish task #2788. 2016-11-14 14:05:10 +08:00