Commit Graph
14843 Commits
Author SHA1 Message Date
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
wangyidong f5f6e96d44 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-19 13:40:47 +08:00
wangyidong 2882633c31 * finish task #5337. 2019-03-19 13:40:07 +08:00
Yagami 1ebbf2150c Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-19 10:25:32 +08:00
Yagami 602e8244de * Finish task #5339. 2019-03-19 10:25:17 +08:00
wangyidong a79b4ec70b Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-19 10:22:36 +08:00
wangyidong f621ab60de * finish task #5336. 2019-03-19 10:22:09 +08:00
Yagami d790b5e942 * Finish task #5329. 2019-03-19 09:37:46 +08:00
Yagami ef572902a6 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-19 09:24:36 +08:00
Yagami 96f8fefdf7 * Finish task #5328. 2019-03-19 09:24:20 +08:00
wangyidong 12e732816e Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-19 08:27:12 +08:00
wangyidong 3e0a57ac7d * adjust dropmenu width when search. 2019-03-19 08:26:43 +08:00
chenfei 5e32a88966 * Finish task #5372. 2019-03-19 08:11:58 +08:00
chenfei 58d5f35e26 * Finish task #5324. 2019-03-19 08:04:39 +08:00
wangyidong b78df3b7a7 * update zentao-integrated package. 2019-03-18 16:56:56 +08:00
wangyidong 3cd2f30ad8 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-18 16:56:38 +08:00
wangyidong e925ae51e9 * finish task #5325. 2019-03-18 16:55:58 +08:00
Yagami dddd4d0c72 * Add showdoc type. 2019-03-18 16:48:05 +08:00
Yagami 7004af89d9 * Finish task #5327. 2019-03-18 15:48:30 +08:00
Yagami 62249b0782 * Finish task #5316. 2019-03-18 11:17:57 +08:00
wangyidong 641c3d5890 * finish task #5358. 2019-03-18 09:51:28 +08:00
wangyidong 7e304d6718 Merge branch 'master' of github.com:easysoft/zentaopms 2019-03-18 09:48:30 +08:00
wangyidong 12cd13270b * adjust for office. 2019-03-18 09:46:41 +08:00
Yagami e741e9e3b2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-03-15 13:28:08 +08:00