Commit Graph
611 Commits
Author SHA1 Message Date
wangyidong bcaaed2692 * change for doc custom. 2018-10-26 10:48:43 +08:00
wangyidong 0a19fbec29 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-25 09:33:38 +08:00
wangyidong 2cd31f731e * change version and upgrade. 2018-10-25 09:30:44 +08:00
Yagami 78182537b1 * Delete doc search condition. 2018-10-25 09:06:31 +08:00
Catouse e72654b335 * code for task #5039. 2018-10-24 19:59:52 +08:00
Catouse af0e3b1670 * finish task #5039. 2018-10-24 19:48:58 +08:00
Yagami b3540188da Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 15:21:26 +08:00
Yagami c901155dfa Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 15:16:50 +08:00
Yagami e83d8e1be9 * Finish task #5040. 2018-10-24 15:16:34 +08:00
wangyidong 657857571b * fix bug for delete lib. 2018-10-24 15:14:16 +08:00
wangyidong eac9682bd7 * adjust for task #5044. 2018-10-24 14:23:19 +08:00
wangyidong fc480d0a01 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 13:51:02 +08:00
wangyidong b2b5ed0a5e * fix error. 2018-10-24 13:50:42 +08:00
Yagami 346a928562 * Finish task #5043. 2018-10-24 13:29:20 +08:00
Yagami 3b03bc1547 * Delete doc gt lang. 2018-10-24 13:25:26 +08:00
Yagami 91596ab288 * Finish task #5047. 2018-10-24 13:19:42 +08:00
Yagami 8723563496 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-24 13:04:43 +08:00
Yagami 1e95075550 * Finish task #5040. 2018-10-24 13:04:24 +08:00
wangyidong 34bc2fedb0 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-24 11:17:44 +08:00
wangyidong b8a8cfbc6a * finish task #5046,5041. 2018-10-24 11:17:03 +08:00
chenfeiCF 7973e341e4 * Finish task #5048, #5049, #5050, #5054. 2018-10-24 11:06:17 +08:00
wangyidong 673549a895 * change for en lang. 2018-10-24 10:09:00 +08:00
wangyidong 3676747f10 * finish task #5044,5045. 2018-10-24 10:06:20 +08:00
Catouse 5b3b956a8a Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/custom/lang/en.php
#	module/doc/js/browse.js
2018-10-24 09:27:13 +08:00
wangyidong ccfb1b9e4a * add create lib in index page. 2018-10-22 16:12:03 +08:00
wangyidong 93e0cbe6eb * fix error. 2018-10-22 14:34:45 +08:00
Yagami 99038ca227 * Fix project doc display. 2018-10-19 14:18:45 +08:00
chenfeiCF 29ae62225a * Adjust doc side page to apply to zentaobiz. 2018-10-19 13:48:50 +08:00
Yagami 3775f0165e Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-19 13:15:48 +08:00
Yagami 32d073bb74 * Fix drop menu position. 2018-10-19 13:15:24 +08:00
chenfeiCF 290f2fefdf * Adjust doclib drop menu. 2018-10-19 10:05:20 +08:00
chenfeiCF 183eb059ec * Add book side html to apply to zentaobiz. 2018-10-19 09:38:18 +08:00
Yagami 39215211b3 * Fix doc drop menu width. 2018-10-19 09:07:32 +08:00
Yagami 7e98a2cc87 * Fix doc search btn. 2018-10-18 17:18:04 +08:00
Yagami 7c4eb6a7c8 * Fix searchbox display. 2018-10-18 14:59:29 +08:00
Yagami 5c71ee281d * Finish task #5026. 2018-10-18 14:08:30 +08:00
Yagami 55a7d3004a * Fix doc fastmenu. 2018-10-18 10:13:09 +08:00
Yagami 9a22dcfc51 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-18 09:12:42 +08:00
Yagami 6119cf2a52 * Finish task #5033. 2018-10-18 09:12:02 +08:00
chenfeiCF 321d069c96 * Adjust code for book of doc module. 2018-10-17 17:01:10 +08:00
wangyidong fd75297793 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-17 15:16:04 +08:00
wangyidong 84f178f3aa * finish task #5031. 2018-10-17 15:14:31 +08:00
Yagami 727e58fe33 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-17 14:18:10 +08:00
Yagami d9222b25f9 * Fix doc button. 2018-10-17 14:17:39 +08:00
chenfeiCF 24a5fb6f35 * Adjust for type of doc library. 2018-10-17 11:20:49 +08:00
wangyidong cb7e95e654 * code for task #5030. 2018-10-17 09:00:35 +08:00
wangyidong f236b416a2 Merge branch 'master' of github.com:easysoft/zentaopms 2018-10-16 16:42:21 +08:00
wangyidong f74a4b1e36 * finish task #5030,5029. 2018-10-16 16:41:40 +08:00
chenfeiCF 6d90d291cf * Add type field for doc lib. 2018-10-16 13:25:21 +08:00
Yagami 32866fcaf2 * Fix sql. 2018-10-16 10:48:22 +08:00