Commit Graph

246 Commits

Author SHA1 Message Date
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie
21fe8daa0d Fix bug #3338 #3342 2020-08-10 16:22:10 +08:00
Yagami
96c494098a * Fix doc module. 2020-07-31 11:14:32 +08:00
chenfei
4475db6ccc * Finish task #7420. 2020-07-14 11:27:15 +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
chenfei
c7395c8b44 * Merge zentaopms_cmmi to zentaopms_12.0.1 2020-02-17 14:02:00 +08:00
leiyong
7a56b4506d Fix bug #2929,#2932,#2943 2020-02-05 15:54:29 +08:00
wangyidong
e88f364a0a * finish task #6824. 2020-02-05 11:03:46 +08:00
wangyidong
fcc21286d3 * adjust for doc file size. 2020-01-31 08:45:20 +08:00
wangyidong
3e938c780f * fix bug #2905. 2020-01-02 08:52:11 +08:00
wangyidong
19bf49917c * fix bug for show doc. 2019-12-23 14:31:09 +08:00
wangyidong
24dd889cf0 * fix bug #2684. 2019-12-18 14:03:00 +08:00
Yagami
1553a3258c * Finish task #6689. 2019-12-11 17:14:47 +08:00
Yagami
df18cbefb0 * Fix doc order. 2019-12-10 16:36:52 +08:00
wangyidong
ae2c117104 * finish task #6640. 2019-12-05 14:26:30 +08:00
wangyidong
6f205e288b * finish task #6629. 2019-12-04 13:28:51 +08:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
wangyidong
cf3c318d07 * adjust for find questions. 2019-10-16 17:14:40 +08:00
wangyidong
5f5ab186af * finish task #6439. 2019-10-12 16:02:33 +08:00
Yagami
8f10dc718a * Finish task #6391. 2019-10-10 13:56:43 +08:00
wangyidong
6ac14da5d1 * finish task #6297. 2019-09-03 10:15:20 +08:00
wangyidong
296d9ebc11 * code for task #6239. 2019-08-22 13:46:32 +08:00
wangyidong
6b9b77fd4e * finish task #6239. 2019-08-22 13:33:01 +08:00
jinianlan
aa1609117e Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-21 10:27:32 +08:00
jinianlan
f1ef72dfbb * code for task 6244,6242. 2019-08-21 10:25:32 +08:00
wangyidong
f1684ad8e9 * finish task #6241. 2019-08-21 10:15:58 +08:00
wangyidong
68f4606648 * adjust for task #6174. 2019-08-15 11:14:27 +08:00
wangyidong
9b6207141c Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-12 10:39:24 +08:00
wangyidong
72cd70ad88 * finish task #6213. 2019-08-12 10:39:00 +08:00
jinianlan
c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +08:00
wangyidong
7337f28144 * fix bug. 2019-07-22 15:37:52 +08:00
wangyidong
0f82741d36 * fix bug for check project lib priv. 2019-07-16 15:30:30 +08:00
jinianlan
60e7014ef7 * finish task #6020,#6009,#6007,#5949 2019-07-10 13:41:13 +08:00
wangyidong
67f21ea76e * finish task #5626. 2019-06-03 11:52:54 +08:00
wangyidong
bd90f185d8 * fix bug for doc crumb title. 2019-04-26 14:59:07 +08:00
wangyidong
1daead8b6c * code for task #5388. 2019-04-25 08:20:49 +08:00
Yagami
96f8fefdf7 * Finish task #5328. 2019-03-19 09:24:20 +08:00
chenfeiCF
e171290300 * Adjust code. 2019-02-27 17:03:16 +08:00
chenfeiCF
8ec8643dd6 * Adjust doc lib acl. 2019-02-27 10:22:53 +08:00
wangyidong
9ffa540195 * finish task #5285. 2019-02-22 14:05:47 +08:00
Yagami
46cdd5a5f9 * Finish task #5300. 2019-02-22 09:46:57 +08:00
Yagami
c5bf9cf987 * Finish task #5235. 2019-01-25 15:02:34 +08:00
Yagami
fad09a3916 * Finish task #5225. 2019-01-24 09:08:34 +08:00
wangyidong
f4ec5d266e * change new version and upgrade. 2019-01-04 13:25:22 +08:00
wangyidong
3684846de8 * finish task #7209. 2019-01-03 17:38:13 +08:00
Yagami
851bcc28b3 * Finish task #5192. 2018-12-29 14:04:09 +08:00
chenfeiCF
95408a4142 * Adjust code. 2018-11-20 11:14:06 +08:00
Yagami
ecf4ffafe1 * Fix doc getlibs method. 2018-11-19 15:23:21 +08:00
Yagami
635499b551 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-11-13 15:32:56 +08:00