wangyidong
|
712d9c87d2
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-05 13:31:23 +08:00 |
|
chenfeiCF
|
4f0d8e7409
|
* Finish task #4508.
|
2018-07-05 13:20:14 +08:00 |
|
wangyidong
|
a7fd56792b
|
* finish task #4633.
|
2018-07-05 13:19:01 +08:00 |
|
wangyidong
|
e0529846e3
|
* finish task #4585.
|
2018-07-04 10:08:49 +08:00 |
|
wangyidong
|
ef8ffca2e8
|
* finish task #4574.
|
2018-07-03 16:29:58 +08:00 |
|
liugang
|
2e71b11723
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-03 09:02:14 +08:00 |
|
liugang
|
0810c5eea0
|
* Display doc libs by list.
|
2018-07-03 09:01:46 +08:00 |
|
daitingting
|
2efaf689f5
|
* Hidden product or project by different flow.
|
2018-07-02 16:22:25 +08:00 |
|
滔哥
|
ff3af11733
|
* Finish task#4241.
|
2018-05-29 10:38:05 +08:00 |
|
滔哥
|
dfecfa9d5c
|
* Finish task#4240.
|
2018-05-29 09:57:17 +08:00 |
|
滔哥
|
1e398d5bbc
|
* Finish task#4240.
|
2018-05-29 09:55:37 +08:00 |
|
滔哥
|
1e76a357a2
|
* Finish task#4237.
|
2018-05-28 10:08:03 +08:00 |
|
chenfeiCF
|
f5f0e79ecb
|
* Finish task #4286, #4287, #4288, #4289, #4290.
|
2018-05-22 15:05:16 +08:00 |
|
wangyidong
|
d256a684c0
|
* adjust for doc.
|
2018-05-18 14:39:29 +08:00 |
|
wangyidong
|
6e6c82be2b
|
* adjust for page.
|
2018-05-17 14:43:35 +08:00 |
|
Catouse
|
e522af53b4
|
* remove btn-gray.
|
2018-05-15 15:33:33 +08:00 |
|
daitingting
|
81d2309191
|
* Adjust index file of doc.
|
2018-05-09 18:06:34 +08:00 |
|
daitingting
|
1fd774b083
|
* Rewrite view page of doc.
|
2018-05-08 16:03:34 +08:00 |
|
daitingting
|
2799d50d7f
|
* Add pager for doc.
|
2018-05-08 10:18:38 +08:00 |
|
daitingting
|
511e67f579
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
db/update9.8.1.sql
module/doc/css/common.css
module/doc/view/browse.html.php
|
2018-05-07 17:28:29 +08:00 |
|
daitingting
|
42c6502b0f
|
* Rewrite allLibs, objectLibs and browse pages of doc.
|
2018-05-07 17:27:12 +08:00 |
|
wangyidong
|
56489075b0
|
Merge branch 'zentaopms_9.8'
|
2018-05-07 16:48:59 +08:00 |
|
daitingting
|
52adf369e9
|
* Finish search function.
|
2018-05-04 09:15:25 +08:00 |
|
daitingting
|
8d5ef6e722
|
* Rewrite create page for doc.
|
2018-05-03 16:44:50 +08:00 |
|
daitingting
|
9748528da5
|
* Rewrite pageNav and pageActions of doc.
|
2018-05-02 16:50:17 +08:00 |
|
daitingting
|
091bbea7aa
|
* Rewrite index page of doc.
|
2018-04-28 16:36:56 +08:00 |
|
wangyidong
|
7e77a6d999
|
* fix bug.
|
2018-03-21 13:23:22 +08:00 |
|
daitingting
|
8f9a8248a8
|
* Format codes.
* Put the page function in the end.
|
2018-03-15 09:33:47 +08:00 |
|
滔哥
|
cbf08b828a
|
* Task#3561
|
2017-12-28 18:03:48 +08:00 |
|
wangyidong
|
9b820f143d
|
* fix bug #1246.
|
2017-11-10 13:57:41 +08:00 |
|
wangyidong
|
7dd879c8d6
|
* finish task #3334,3323.
|
2017-11-09 13:46:10 +08:00 |
|
wangyidong
|
49909d01c1
|
* adjust for required.
|
2017-11-06 17:46:57 +08:00 |
|
wangyidong
|
dc046c4ff5
|
* adjust for doc priv.
|
2017-11-06 10:39:28 +08:00 |
|
滔哥
|
e3ea70b43a
|
* change score module
|
2017-10-31 11:13:09 +08:00 |
|
滔哥
|
d9290cbf9b
|
* + score in all model
|
2017-10-27 11:15:28 +08:00 |
|
wangyidong
|
b965b706a8
|
Finish task#3252 管理员可以将自己的菜单配置作为公共的配置,cost:3 left:0
|
2017-10-19 14:31:03 +08:00 |
|
wangyidong
|
50460830e2
|
* adjust for limited user.
|
2017-09-26 11:08:11 +08:00 |
|
pengjiangxiu
|
41a2fc9a8f
|
* Finish task #3210.
|
2017-09-19 13:56:39 +08:00 |
|
wangyidong
|
f60a4c664b
|
* custom show deleted user.
|
2017-09-04 14:46:17 +08:00 |
|
wangyidong
|
bfa5ff7352
|
* finish task #3190.
|
2017-08-21 14:47:41 +08:00 |
|
pengjiangxiu
|
4732bfaebc
|
* Finish task #3184.
|
2017-08-18 13:51:29 +08:00 |
|
wangyidong
|
ef4cbfd1e3
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2017-08-16 13:33:11 +08:00 |
|
wangyidong
|
a25a10d542
|
* finish task #3147 and update HTMLPurifier.
|
2017-08-16 13:32:34 +08:00 |
|
pengjiangxiu
|
0480e28e67
|
* Finish task #3116.
|
2017-08-16 10:03:20 +08:00 |
|
pengjiangxiu
|
dccebc7b9a
|
* Finish task #3119.
|
2017-08-14 09:56:39 +08:00 |
|
pengjiangxiu
|
fdd13c2297
|
* Finish task #3122.
|
2017-08-11 15:40:54 +08:00 |
|
wangyidong
|
da39880a1c
|
* adjust code for zentaobiz and fix bug.
|
2017-08-08 08:21:58 +08:00 |
|
wangyidong
|
d909f2d826
|
* remove diff method.
|
2017-07-20 13:04:53 +08:00 |
|
wangyidong
|
794fb575db
|
* adjust for save file not with extension.
|
2017-06-26 14:47:58 +08:00 |
|
wangyidong
|
c27f1f7d34
|
* merge zentaophp to zentao.
|
2017-06-09 17:05:37 +08:00 |
|