Commit Graph
319 Commits
Author SHA1 Message Date
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
wangyidong b8a8cfbc6a * finish task #5046,5041. 2018-10-24 11:17:03 +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
chenfeiCF 29ae62225a * Adjust doc side page to apply to zentaobiz. 2018-10-19 13:48:50 +08:00
chenfeiCF 183eb059ec * Add book side html to apply to zentaobiz. 2018-10-19 09:38:18 +08:00
Yagami 7e98a2cc87 * Fix doc search btn. 2018-10-18 17:18:04 +08:00
Yagami 5c71ee281d * Finish task #5026. 2018-10-18 14:08:30 +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 e2e9b6cab8 * Finish task #5028. 2018-10-16 10:27:12 +08:00
Catouse 75b189c2c3 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-15 15:35:31 +08:00
Catouse 819f035bd9 * improve UI of doc views, code for task #5032. 2018-10-15 15:35:25 +08:00
Yagami 44124129dc * Finish task #5034. 2018-10-15 15:24:11 +08:00
Yagami d65f144060 * Doc back button add background-color. 2018-10-15 14:05:16 +08:00
yfl 9263cafb61 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-10-11 10:47:09 +08:00
Yagami 5375f74140 * Finish task #4953. 2018-10-11 09:40:15 +08:00
yfl 5ec4610e30 modify time format 2018-10-10 09:40:52 +08:00
Catouse f8064bb042 * finish task #4950. 2018-09-27 11:27:17 +08:00
wangyidong e0950c3e8b * finish task #4940. 2018-09-26 15:11:54 +08:00
Catouse e45a1e4d34 * finish task #4791. 2018-09-21 16:39:10 +08:00
wangyidong 1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
滔哥 0b83fffbe0 * Finished task#4854 2018-09-19 07:41:28 +08:00
Catouse ff3ff14d4c * improve UI of doc/view. 2018-09-06 18:05:04 +08:00
Yagami 6299694b54 * Finish task #4830. 2018-09-05 09:53:35 +08:00
chenfeiCF 2c24472bae * Finish task #4647. 2018-08-08 14:06:14 +08:00
wangyidong 95454cd35b * finish task #4650 and delete useless file. 2018-08-07 17:27:06 +08:00
wangyidong 0a456353e1 * fix bug #4243. 2018-07-13 18:20:02 +08:00
Catouse ba130809f1 * finish task #4510 and fix bug #1971. 2018-07-09 18:53:05 +08:00
Catouse 07dcbac2fe * add title attributes. 2018-07-09 15:35:56 +08:00