Commit Graph
14334 Commits
Author SHA1 Message Date
wangyidong d3fa148cb3 * close modal in xuanxuan. 2018-12-19 13:44:31 +08:00
wangyidong 06e898ea57 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-19 13:19:51 +08:00
wangyidong 48593cf917 * change zentao integrated package. 2018-12-19 13:18:56 +08:00
chenfeiCF e525c1c731 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-19 11:22:02 +08:00
chenfeiCF f768c24ffd * Adjust for task #5162. 2018-12-19 11:21:44 +08:00
Yagami abca247e8a * Fix lang root. 2018-12-19 11:20:44 +08:00
Yagami e0e412504a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-19 11:17:44 +08:00
Yagami 400a6b9313 * Fix common config bug. 2018-12-19 11:17:17 +08:00
chenfeiCF 4ac74dddf9 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-19 11:13:15 +08:00
chenfeiCF 252ad1ef8e * Adjust for task #5162. 2018-12-19 11:12:28 +08:00
Yagami f5dbf291cb Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-19 11:11:10 +08:00
Yagami 20f7e52241 * Fix download xxd bugs. 2018-12-19 11:10:45 +08:00
wangyidong 9844466a49 * adjust construct for pclzip. 2018-12-19 10:41:53 +08:00
wangyidong 619a830262 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-18 17:21:57 +08:00
wangyidong ad609850ab * code for task #5156,5147. 2018-12-18 17:20:57 +08:00
reneeteng 8543a1458b Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-18 16:57:14 +08:00
reneeteng 9795502bae * COST lang change. 2018-12-18 16:56:15 +08:00
chenfeiCF 7eab5eefa8 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-18 14:32:49 +08:00
chenfeiCF 37c96cbfa6 * Code for task #5156. 2018-12-18 14:32:10 +08:00
Yagami b8b0a777f8 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-18 14:17:29 +08:00
Yagami da8ab3422b * Add common lang. 2018-12-18 14:17:09 +08:00
chenfeiCF d055231fde Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-18 14:16:52 +08:00
chenfeiCF 5b611cd068 * Code for task #5156. 2018-12-18 14:15:14 +08:00
Catouse 893d43841b Merge branches 'master' and 'master' of https://github.com/easysoft/zentaopms 2018-12-18 14:08:16 +08:00
Catouse d347e5c4a8 * fix position of highlight item in chosen menu. 2018-12-18 14:08:09 +08:00
Yagami 85b1d94fc7 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-18 13:55:26 +08:00
Yagami 841aa291f1 * Fix bug,story create view. 2018-12-18 13:55:08 +08:00
wangyidong c118412647 Merge branch 'master' of github.com:easysoft/zentaopms 2018-12-18 13:51:34 +08:00
wangyidong bd7ed14146 * delete useless file when upgrade. 2018-12-18 13:50:56 +08:00
Yagami 859dd51596 * Fix bug and story js file. 2018-12-18 13:39:09 +08:00
Yagami da327c30ae * Finish bug, story view css. 2018-12-18 13:35:48 +08:00
Yagami 5e749b2171 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-12-18 13:08:20 +08:00
Yagami 857b71ffec * Fix xuanxuan card header width. 2018-12-18 13:07:37 +08:00
wangyidong e6bd9c4ae9 * adjust for doc and testcase view page in card. 2018-12-18 13:03:50 +08:00
Yagami bcf24e9f50 * Finish xuanxuan bug view. 2018-12-18 11:15:10 +08:00
Yagami 25ffec7ee2 * Finish xuanxuan bug view. 2018-12-18 10:24:49 +08:00
wangyidong 7c74014d00 * adjust for get css and js in xhtml. 2018-12-17 17:17:34 +08:00
wangyidong cb3a387e15 * fix for getJS and getCSS in xhtml. 2018-12-17 16:58:14 +08:00
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