Commit Graph

151 Commits

Author SHA1 Message Date
Yagami
74c85776b9 * Finish task #5520. 2019-05-29 15:50:43 +08:00
Yagami
289eae8521 * Finish task #5460. 2019-05-28 15:40:33 +08:00
Yagami
a321266757 * Code for task #7807. 2019-04-12 09:40:07 +08:00
wangyidong
c9a7fa9d64 * add office doc. 2019-02-27 09:11:49 +08:00
wangyidong
903b7f0c58 Merge branch 'master' of github.com:easysoft/zentaopms 2019-02-22 14:06:17 +08:00
wangyidong
9ffa540195 * finish task #5285. 2019-02-22 14:05:47 +08:00
Yagami
11393c442e * Finish task #5295. 2019-02-22 13:30:14 +08:00
Yagami
c78b5cac38 * Code for task #5284. 2019-02-21 14:47:17 +08:00
Yagami
b623c536da * Finish task #5284. 2019-02-21 13:49:04 +08:00
Yagami
b7651df91e * Finish task #5268. 2019-02-20 10:52:47 +08:00
wangyidong
0e8e7f4bf6 * fix bug #2008. 2019-01-28 11:18:48 +08:00
wangyidong
71e7c86e3a * fix bug #2318. 2018-12-10 09:44:44 +08:00
chenfeiCF
d6abc51b21 * Finish task #5064. 2018-11-12 10:36:25 +08:00
wangyidong
657857571b * fix bug for delete lib. 2018-10-24 15:14:16 +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
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
chenfeiCF
29ae62225a * Adjust doc side page to apply to zentaobiz. 2018-10-19 13:48:50 +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
chenfeiCF
321d069c96 * Adjust code for book of doc module. 2018-10-17 17:01:10 +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
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
Yagami
e2e9b6cab8 * Finish task #5028. 2018-10-16 10:27:12 +08:00
Catouse
819f035bd9 * improve UI of doc views, code for task #5032. 2018-10-15 15:35:25 +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
滔哥
0b83fffbe0 * Finished task#4854 2018-09-19 07:41:28 +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
wangyidong
96f510cfb6 * fix for doc-browse 2018-06-26 10:50:55 +08:00
daitingting
ee3c030f80 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-06-25 09:58:21 +08:00
daitingting
1b669c7d7e * If feedbackView is true, hide side-col. 2018-06-25 09:57:25 +08:00
liugang
a054614d58 * Finish task #4488 2018-06-21 17:39:31 +08:00
liugang
9151a9aea4 * Finish task #4457 2018-06-12 15:00:13 +08:00
滔哥
a104f067f3 * Finish task#4369. 2018-06-01 16:14:37 +08:00
滔哥
d90e95256b * Finish task#4374. 2018-05-30 11:08:06 +08:00
Catouse
56579a66ce * refactor codes. 2018-05-28 12:03:16 +08:00
滔哥
1e76a357a2 * Finish task#4237. 2018-05-28 10:08:03 +08:00
Catouse
af6d054acc * improve UI of doc module views. 2018-05-24 14:29:36 +08:00
滔哥
32e89f4eea * Finish task#4242 2018-05-24 10:18:02 +08:00
wangyidong
7ab90f9ee7 * fix for page show. 2018-05-18 14:20:04 +08:00
daitingting
cbb127c726 * Adjust collect style and title. 2018-05-18 13:23:29 +08:00
daitingting
82ce0b3d84 * Add th for actions. 2018-05-18 11:27:12 +08:00