Commit Graph
14646 Commits
Author SHA1 Message Date
wangyidong 48fde44e1f * adjust for display param. 2018-12-17 16:32:55 +08:00
wangyidong 3f7603a483 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-17 15:42:29 +08:00
wangyidong 201e157ffd * adjust for doc and testtask view for xuanxuan. 2018-12-17 15:39:49 +08:00
wangyidong 14bb43df14 * adjust for card. 2018-12-17 15:34:33 +08:00
Yagami 64d1c0b3b9 * Fix xuanxuan config. 2018-12-17 13:38:50 +08:00
Yagami 480883e61a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-17 10:50:30 +08:00
Yagami a0313f93e1 * Finish xuanxuan bug view. 2018-12-17 10:50:12 +08:00
wangyidong 619f3970bb * adjust for get extensions. 2018-12-17 10:41:00 +08:00
chenfeiCF d8fcc19b60 * Show download client title instead of the icon. 2018-12-14 16:24:59 +08:00
chenfeiCF b77b5b0055 * Finish task #5164. 2018-12-14 16:11:11 +08:00
wangyidong c254b9acba * adjust for xuanxuan card. 2018-12-14 15:55:35 +08:00
wangyidong d20dfa0b05 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-14 15:43:57 +08:00
wangyidong ee83d6b495 * adjust for testcase xx view page. 2018-12-14 15:41:01 +08:00
wangyidong dba1cbb7a1 * add for doc/testcase/todo xuanxuan view page. 2018-12-14 15:37:52 +08:00
wangyidong 2eb32fd6ba * fix bug for block. 2018-12-14 15:37:15 +08:00
wangyidong 8f9fea0cd8 * adjust for link xuanxuan. 2018-12-14 15:30:43 +08:00
Yagami f60f5b5bfb * Fix xuanxuan lang file. 2018-12-14 14:50:34 +08:00
Yagami ca19df46c1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-14 14:34:14 +08:00
Yagami 80a896dbc4 * Fix setting xuanxuan method. 2018-12-14 14:33:38 +08:00
wangyidong 6c48f06b07 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-13 17:23:01 +08:00
wangyidong 7a31343c09 * remove display param. 2018-12-13 17:22:31 +08:00
wangyidong 552920fb6f * add zentao-integrated package. 2018-12-13 17:20:10 +08:00
reneeteng a1f0e21fd2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-13 17:03:24 +08:00
reneeteng 6b72b4b62d * Change lang. 2018-12-13 17:01:22 +08:00
wangyidong 3cb9c120fb * adjust for xuanxuan. 2018-12-13 16:28:02 +08:00
Yagami 412e7e5bc3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-13 15:50:08 +08:00
Yagami c6c0e2fd11 * Change common footer to hook. 2018-12-13 15:49:39 +08:00
wangyidong e93eba9bff Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-13 15:31:11 +08:00
wangyidong f214a07e3f * change for xx sso zentao. 2018-12-13 15:29:47 +08:00
Yagami b04606130d Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-13 09:58:04 +08:00
Yagami fe128e1c95 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-13 09:26:40 +08:00
wangyidong 0e2e1f57ed * finish task #2340. 2018-12-13 09:25:54 +08:00
Yagami 369a40c242 * Finish task #5160. 2018-12-13 09:24:53 +08:00
wangyidong 79b442d71a * adjust for task #5152. 2018-12-12 17:55:24 +08:00
Yagami 699e5458d0 * Finish task #5149. 2018-12-12 17:12:43 +08:00
Yagami 83465688f8 * Finish task #5148. 2018-12-12 16:56:08 +08:00
wangyidong 55d9d0fb6f Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-12 16:40:38 +08:00
wangyidong 87209adcb7 * finish task #5152. 2018-12-12 16:39:34 +08:00
Yagami 5307a1fd6c * Finish task #5150. 2018-12-12 15:20:52 +08:00
Yagami 8208a1ea42 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-12 10:58:05 +08:00
Yagami 9f48f58bb0 * Fix xuanxuan bug. 2018-12-12 10:57:54 +08:00
wangyidong 89409fe3ef * change for supper xhtml. 2018-12-11 16:38:03 +08:00
wangyidong dfe6066d78 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-11 08:55:20 +08:00
chenfeiCF d0637a83c3 * Finish task #5162. 2018-12-10 15:04:05 +08:00
wangyidong 672b811fe0 * fix bug #2320. 2018-12-10 10:25:11 +08:00
wangyidong a46b37266c * fix bug #2247. 2018-12-10 10:01:53 +08:00
wangyidong 641e48d2d6 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-10 09:45:38 +08:00
wangyidong 71e7c86e3a * fix bug #2318. 2018-12-10 09:44:44 +08:00
Yagami 1974dc2c17 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-10 09:15:16 +08:00
Yagami e08e8fa353 * Fix downloadxxd view. 2018-12-10 09:14:57 +08:00