Commit Graph
8961 Commits
Author SHA1 Message Date
wangyidong 2f71effc52 * adjust for upgrade. 2016-12-08 13:27:15 +08:00
wangyidong 18280dc2e9 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-07 17:24:53 +08:00
wangyidong 41341bb9f5 * adjust for safe. 2016-12-07 17:22:28 +08:00
tengfei b7bb3cbf11 Merge branch 'master' of github.com:easysoft/zentaopms
*man-hour
2016-12-07 09:32:22 +08:00
wangyidong ede1a0b798 * adjust priv. 2016-12-07 09:07:48 +08:00
tengfei bd2b7162ab *man-hour edit 2016-12-07 08:26:11 +08:00
wangyidong 51e662fcb9 * add changelog. zentaopms_8.4.stable_20161206 2016-12-06 17:02:24 +08:00
wangyidong f66345f83e * change my.min.js to my.full.js when debug. 2016-12-06 16:30:11 +08:00
wangyidong 5766579932 * change for upgrade. 2016-12-06 16:20:07 +08:00
wangyidong 05be061ce0 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-06 16:06:58 +08:00
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 21eba69df9 * adjust for select with pinyin. 2016-12-06 14:22:18 +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
wangyidong 2f679cee93 * adjust for pinyin. 2016-12-06 10:33:09 +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 bbd2052dc7 * finish task #2752. 2016-12-02 09:47:55 +08:00
wangyidong fffb794313 Merge branch 'master' of github.com:easysoft/zentaopms 2016-12-02 09:21:02 +08:00
wangyidong 95780d863e + add upgrade and install tmp file. 2016-12-02 09:12:59 +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