Commit Graph

168 Commits

Author SHA1 Message Date
leiyong
235c393707 * Finish task#8964. 2021-01-15 10:20:03 +08:00
Yagami
006dfcc733 * Fix doc button. 2021-01-07 13:15:46 +08:00
z
b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
holan20180123
4943ce7bbe * Finish task #8387. 2020-11-17 15:25:16 +08:00
holan20180123
583790a08e * Finish task #8194. 2020-11-13 09:08:04 +08:00
holan20180123
a7533f722d * Finish task #8194. 2020-11-12 10:09:16 +08:00
holan20180123
15e8463347 * Finish task #8194. 2020-11-11 11:18:08 +08:00
holan20180123
8b1e4808c2 * Finish task #8194. 2020-11-10 08:49:00 +08:00
hufangzhou
0669bbab5a * Fix bug#3410: the display of the doc title. 2020-11-03 11:30:54 +08:00
hufangzhou
4e9e558ff1 * Fix bug#3410. 2020-09-02 16:40:47 +08:00
Yagami
3ffa7c7846 * Finish task #7727. 2020-09-01 09:32:48 +08:00
sgm0422
09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
zhaohaibo
e9b2a4bc32 add param $this->session->program 2020-05-26 13:37:02 +08:00
wangyidong
28a7743f61 * finish task #6675. 2019-12-18 10:16:41 +08:00
wangyidong
ae935b46b1 * finish task #5965. 2019-07-15 16:29:32 +08:00
wangyidong
4e85182b8f * finish task #5959. 2019-07-10 14:38:38 +08:00
wangyidong
a3b6cfc687 * finish task #5446. 2019-05-30 11:50:21 +08:00
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