Commit Graph

7257 Commits

Author SHA1 Message Date
wangyidong
dd19be807f * replace iconv by mb_convert_encoding. 2016-12-06 16:06:18 +08:00
wangyidong
e2c7e649a4 * fix bug for git. 2016-12-06 14:54:19 +08:00
tengfei
0531694dab *edit new added items 2016-12-06 14:29:35 +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
wangyidong
7451929e65 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-06 10:41:17 +08:00
wangyidong
e10309b1d0 * change for ajax save log for svn and git. 2016-12-06 10:39:19 +08:00
chenfeiCF
384c5feedc * display user list in assignedTo box when fix tfoot. 2016-12-05 16:53:20 +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
dee9734c94 * add english lang item for zdoo. 2016-12-05 10:30:32 +08:00
chenfeiCF
2c902cce89 * adjust help info color in report page. 2016-12-05 10:23:20 +08:00
Catouse
79ebafe91d * fix style for project/managemembers view. 2016-12-05 09:28:18 +08:00
chenfeiCF
4c5f7679ce * fix error in bug batch create. 2016-12-04 20:21:39 +08:00
chenfeiCF
a539be0c32 * adjust task #2731. 2016-12-04 13:35:40 +08:00
chenfeiCF
cb30979d57 * adjust task #2694. 2016-12-02 17:21:56 +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
chenfeiCF
915c55e001 * adjust task #2790. 2016-12-02 12:28:38 +08:00
wangyidong
673f23381b * change en lang. 2016-12-02 10:32:41 +08:00
wangyidong
65940b16b8 * finish task #2703. 2016-12-02 10:30:46 +08:00
tengfei
25b76b8d80 *flowchart->workflow 2016-12-02 10:12:43 +08:00
wangyidong
fffb794313 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-02 09:21:02 +08:00
wangyidong
aa6864612c * adjust for construct. 2016-12-02 09:06:58 +08:00
wangyidong
921ff77303 * adjust isOpenMethod. 2016-12-02 09:06:28 +08:00
wangyidong
d7a914e328 * fix error. 2016-12-02 09:02:38 +08:00
wangyidong
de810eba61 * finish task #2799. 2016-12-02 09:02:11 +08:00
chenfeiCF
d9d00b393f Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 17:35:54 +08:00
chenfeiCF
cb39cc9f08 * adjust task #2784. 2016-12-01 17:33:45 +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
ffa9b017f0 * adjust task #2780. 2016-12-01 17:14:04 +08:00
chenfeiCF
2af603bac7 * adjust task #2681. 2016-12-01 17:07:13 +08:00
chenfeiCF
82b61dc1da * adjust the style of create button group. 2016-12-01 16:59:45 +08:00
chenfeiCF
75589d210d * adjust task #2777. 2016-12-01 16:43:15 +08:00
chenfeiCF
e9e7768706 * adjust task #2727. 2016-12-01 16:18:59 +08:00
wangyidong
f8c8f18746 * finish task #2798. 2016-12-01 15:38:55 +08:00
wangyidong
75c4c563f5 * finish task #2783. 2016-12-01 15:36:25 +08:00
chenfeiCF
dd29125b58 * adjust task #2725. 2016-12-01 15:24:11 +08:00
chenfeiCF
11f494ae07 * adjuct task #2722. 2016-12-01 15:00:53 +08:00
wangyidong
e472df69de * finish task #2776. 2016-12-01 14:58:26 +08:00
chenfeiCF
74aaed0949 * adjust task #2713. 2016-12-01 14:49:35 +08:00
wangyidong
aaf8e64777 * finish task #2750. 2016-12-01 14:37:47 +08:00
wangyidong
e4946b529e * finish task #2736. 2016-12-01 13:44:52 +08:00
wangyidong
a78ff866cb Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 13:39:50 +08:00
wangyidong
0f232e6d8f * finish task #2735. 2016-12-01 13:39:29 +08:00
chenfeiCF
fc7cbe828b * adjust task #2704. 2016-12-01 13:06:10 +08:00
wangyidong
5062e5af5c Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 11:33:39 +08:00
wangyidong
88167e8151 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-01 11:33:03 +08:00