Commit Graph
14907 Commits
Author SHA1 Message Date
wangyidong 24427df0df Merge branch 'master' of github.com:easysoft/zentaopms 2019-04-01 13:59:34 +08:00
wangyidong 4308ae4a70 * fix for update user view. 2019-04-01 13:57:58 +08:00
yfl 6480a6f76a * Modify link icon 2019-04-01 09:43:35 +08:00
yfl e6f4028a0a Finish Task 7705 2019-03-29 17:33:42 +08:00
Yagami 28faf0a1d4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-29 14:05:36 +08:00
Yagami c7c59c30bf * Finish task #7707. 2019-03-29 14:03:53 +08:00
wangyidong f5b587034f * fix bug #1655. 2019-03-29 14:00:56 +08:00
wangyidong 53403f5610 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-29 11:28:44 +08:00
Catouse f2bdb6ae56 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-29 10:40:26 +08:00
Catouse fb90d68eae * update zui. 2019-03-29 10:40:19 +08:00
wangyidong df6db87458 * fix for show client notice. 2019-03-28 16:56:46 +08:00
wangyidong 910dfe2b94 * fix bug #1701. 2019-03-28 16:56:17 +08:00
wangyidong 63e0202313 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-28 11:24:11 +08:00
wangyidong 670fb65ca0 * fix for include defaultvalue. 2019-03-28 11:21:52 +08:00
Yagami 8d06d00235 * Fix project warning. 2019-03-28 11:20:22 +08:00
Yagami 9c311dec62 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-28 10:55:25 +08:00
Yagami bcfbd81bef * Fix taskleft sql. 2019-03-28 10:54:58 +08:00
wangyidong bf97231962 * adjust for task getProjectTaskPairs method. 2019-03-28 10:28:26 +08:00
wangyidong bd0098ef08 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-27 13:52:40 +08:00
wangyidong 055340062f * adjust for print subMenu. 2019-03-27 13:51:04 +08:00
Yagami 44ffa8ebb6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-27 10:59:15 +08:00
Yagami 81da2b6326 * Fix burn select condition. 2019-03-27 10:58:42 +08:00
wangyidong 9f42f0b0d4 * fix bug. 2019-03-27 09:21:30 +08:00
Yagami d1014dd018 * Carry back xuanxuan lang. 2019-03-26 15:50:15 +08:00
Yagami 71f948d377 * Fix testcase confim change. 2019-03-26 15:31:07 +08:00
Yagami 87b804f40f Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-26 15:01:41 +08:00
Yagami 0b0882cba8 * Fix block delete. 2019-03-26 15:01:01 +08:00
wangyidong 395004bc6d * adjust for convert url. 2019-03-26 14:58:52 +08:00
wangyidong 7d78361718 * adjust for field width. 2019-03-26 08:21:39 +08:00
Yagami a16d4f3c67 Merge branch 'master' of https://github.com/easysoft/zentaopms zentaopms_11.4.stable_20190325 2019-03-25 14:02:20 +08:00
Yagami fcf80e8675 * Fix task lang file. 2019-03-25 14:01:56 +08:00
wangyidong 8e14295791 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-25 13:46:30 +08:00
wangyidong 84955d15ab * adjust for testStory. 2019-03-25 13:45:59 +08:00
Yagami c97f30969a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-25 13:40:46 +08:00
Yagami 8563882212 * Fix en task menu. 2019-03-25 13:36:04 +08:00
chenfei fe6d7b1f1e * Adjust code. 2019-03-25 11:18:54 +08:00
chenfei d39a315e79 * Prepare for zentao 11.4 upgrade. 2019-03-22 17:36:42 +08:00
Yagami 54c488ba00 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-22 16:56:54 +08:00
Yagami 4ef4fb4e5d * Fix group lang. 2019-03-22 16:56:31 +08:00
wangyidong 4cec1e3e01 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-22 16:50:31 +08:00
wangyidong d78546eea5 * adjust for task #5357. 2019-03-22 16:49:47 +08:00
Yagami d5f201fd49 * Fix sql. 2019-03-22 16:44:33 +08:00
chenfei e2520978d1 * Adjust edit and delete button in view page of plan, release and build module. 2019-03-22 15:58:04 +08:00
wangyidong 5f6df0bcdb Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-22 15:26:24 +08:00
Yagami 50eea70d01 * Fix project task button. 2019-03-22 15:23:56 +08:00
wangyidong 884b7b9c18 * adjust for 5325. 2019-03-22 15:13:50 +08:00
Yagami fc5a8396a1 * Fix INT zentao button. 2019-03-22 15:02:37 +08:00
Yagami f23fd9e0d4 * Fix user field and add sql. 2019-03-22 14:00:14 +08:00
Yagami 6e932dcb2f * Fix file lang file. 2019-03-22 13:20:40 +08:00
Yagami 955bbf3345 * Fix block lang file. 2019-03-22 13:08:23 +08:00