Commit Graph
14866 Commits
Author SHA1 Message Date
wangyidong d78546eea5 * adjust for task #5357. 2019-03-22 16:49:47 +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
Yagami 7df289c7ee * Fix burn target. 2019-03-20 15:52:40 +08:00
wangyidong 559ff6b3b0 * finish task #5364. 2019-03-20 14:39:55 +08:00
wangyidong 310b4c22a4 * finish task #5334. 2019-03-20 13:47:40 +08:00
wangyidong 1d7b68ac13 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-20 13:33:36 +08:00
wangyidong 7dfdbe841d * finish task #5357. 2019-03-20 13:33:17 +08:00
Yagami d83ab362f5 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-20 13:27:58 +08:00
Yagami 0e41e9db83 * Finish task #5344. 2019-03-20 13:27:37 +08:00
wangyidong c15a094736 * finish task #5371. 2019-03-20 11:29:48 +08:00
wangyidong f11a91e43c Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-20 11:20:17 +08:00
wangyidong ff426c094e * finish task #5362. 2019-03-20 11:19:40 +08:00
Yagami 1be6a10681 * Finish task #5361. 2019-03-20 10:51:21 +08:00
Yagami aec278668a Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-20 10:06:39 +08:00
Yagami 54463d153a * Finish task #5367. 2019-03-20 10:06:24 +08:00
chenfei b66c5ec7fa * Finish task #5330. 2019-03-19 17:23:35 +08:00
Yagami 48bb8fea4e * Finish task #5342. 2019-03-19 16:59:36 +08:00
Yagami e744972592 * Finish task #5340. 2019-03-19 16:25:36 +08:00