Commit Graph
14882 Commits
Author SHA1 Message Date
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
Yagami be952195ce * Fix burn select width. 2019-03-22 13:02:03 +08:00
Yagami 0e0f0af555 * Finish child task. 2019-03-22 11:19:44 +08:00
Yagami 0344580fff * Fix task lang file. 2019-03-22 10:42:00 +08:00
wangyidong a90b924080 * finish task #5371. 2019-03-22 08:54:44 +08:00
wangyidong a761be89b6 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-21 15:57:23 +08:00
wangyidong 82bd6bacd6 * fix for upgrade. 2019-03-21 15:56:43 +08:00
Catouse 796cd9e29a * finish task #5236. 2019-03-21 14:57:34 +08:00
Catouse 7f3a571872 * update zui js. 2019-03-21 14:32:29 +08:00
Catouse e8a14d2a48 * finish task #5315. 2019-03-21 14:32:22 +08:00
Yagami 6aa434a9ca * Fix closeModal js. 2019-03-21 13:43:38 +08:00
Catouse 1523c62182 * update ajaxform component in zui. 2019-03-21 13:36:04 +08:00
wangyidong 92c12f259a * fix bug #2468. 2019-03-21 10:39:40 +08:00
Catouse 8ce54d2408 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-21 10:04:50 +08:00
Catouse 169dfdbd4d * fix chosen UI not work as expected. 2019-03-21 10:04:44 +08:00
Yagami aacbf38b9a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-21 09:54:41 +08:00
Yagami 8c6015a5ea * Finish task #5346. 2019-03-21 09:53:46 +08:00
wangyidong 50c5e99d90 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-21 09:33:12 +08:00
wangyidong 4a5dce8ade * adjust for getServer in chat. 2019-03-21 09:32:17 +08:00
Yagami 6afeb34bcc Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-21 09:28:39 +08:00
Yagami 2fb0cae1e7 * Finish task #5341. 2019-03-21 09:28:11 +08:00
wangyidong aa3e8cd3b0 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-20 17:31:40 +08:00
wangyidong 39dd90a740 * finish task #5359. 2019-03-20 17:31:15 +08:00
chenfei 1f6c2206c3 * Finish task #5335. 2019-03-20 17:20:22 +08:00
chenfei fa5f377d52 * Code for task #5343, #5346. 2019-03-20 15:58:19 +08:00
Yagami 7242802aa4 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-20 15:53:03 +08:00