 Catouse
|
c6f29e2242
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 13:44:42 +08:00 |
|
|
Catouse
|
12f865ad71
|
* improve batchcreate form UI.
|
2018-05-08 13:44:35 +08:00 |
|
|
daitingting
|
9ef57f3cfe
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 13:24:50 +08:00 |
|
|
daitingting
|
b1c8712db3
|
* Adjust title for search.
|
2018-05-08 13:24:26 +08:00 |
|
|
chenfeiCF
|
061f8819c9
|
* Adjust fourth menu for some views of user module.
|
2018-05-08 13:22:07 +08:00 |
|
|
Catouse
|
e5f168d1ea
|
* improve UI.
|
2018-05-08 11:44:47 +08:00 |
|
|
daitingting
|
328e622028
|
* Add pager for alllibs page.
|
2018-05-08 11:16:53 +08:00 |
|
|
daitingting
|
04259632cd
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 11:06:08 +08:00 |
|
|
daitingting
|
63246110ac
|
* Adjust codes.
|
2018-05-08 11:05:54 +08:00 |
|
|
Catouse
|
a992b48ee4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 10:58:26 +08:00 |
|
|
Catouse
|
eee114b4d6
|
* update zui files.
|
2018-05-08 10:58:19 +08:00 |
|
|
daitingting
|
3110b8c5fb
|
* Adjust codes.
|
2018-05-08 10:52:13 +08:00 |
|
|
daitingting
|
30df486fea
|
* Adjust icon.
|
2018-05-08 10:43:19 +08:00 |
|
|
daitingting
|
29dc19bf16
|
* Adjust icon.
|
2018-05-08 10:37:05 +08:00 |
|
|
daitingting
|
2799d50d7f
|
* Add pager for doc.
|
2018-05-08 10:18:38 +08:00 |
|
|
chenfeiCF
|
decff416f9
|
* Adjust some view file of user module.
|
2018-05-07 19:06:52 +08:00 |
|
|
daitingting
|
c4eb4ee453
|
* Merge it.
|
2018-05-07 17:33:12 +08:00 |
|
|
daitingting
|
ea560955d9
|
* Merge it.
|
2018-05-07 17:30:05 +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 |
|
|
滔哥
|
f6289cc53c
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-07 17:08:09 +08:00 |
|
|
滔哥
|
edb2689262
|
* Format code.
|
2018-05-07 16:54:52 +08:00 |
|
|
wangyidong
|
ec493368ee
|
Merge branch 'master' of git://github.com/easysoft/zentaopms
|
2018-05-07 16:50:15 +08:00 |
|
|
wangyidong
|
56489075b0
|
Merge branch 'zentaopms_9.8'
|
2018-05-07 16:48:59 +08:00 |
|
|
滔哥
|
427afd5674
|
* Task#3921
|
2018-05-07 15:07:31 +08:00 |
|
|
滔哥
|
27466d9cd8
|
* Task#3921
|
2018-05-07 15:04:28 +08:00 |
|
|
liugang
|
414282d005
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-07 11:55:18 +08:00 |
|
|
liugang
|
70dcc23aca
|
* Refact testtask page of project.
|
2018-05-07 11:54:54 +08:00 |
|
|
chenfeiCF
|
433b28e7c1
|
* Adjust user todo and story view file.
|
2018-05-07 09:23:42 +08:00 |
|
|
wangyidong
|
83a6c78c3b
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-04 15:14:03 +08:00 |
|
|
wangyidong
|
55c68b611d
|
* finish task #3936.
|
2018-05-04 15:13:22 +08:00 |
|
|
daitingting
|
52adf369e9
|
* Finish search function.
|
2018-05-04 09:15:25 +08:00 |
|
|
daitingting
|
706b0ea0e1
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-03 17:01:35 +08:00 |
|
|
daitingting
|
1e7406d4a3
|
* Rewrite edit page of doc.
|
2018-05-03 17:01:14 +08:00 |
|
|
chenfeiCF
|
5506bcee01
|
* Finish task #3879, #3880.
|
2018-05-03 16:50:18 +08:00 |
|
|
daitingting
|
89b4ed727c
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-03 16:45:11 +08:00 |
|
|
daitingting
|
8d5ef6e722
|
* Rewrite create page for doc.
|
2018-05-03 16:44:50 +08:00 |
|
|
wangyidong
|
86b84dd5a2
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-03 16:12:07 +08:00 |
|
|
wangyidong
|
e6bef8b542
|
* adjust for task #3947.
|
2018-05-03 16:05:44 +08:00 |
|
|
daitingting
|
5c7406e5c0
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-03 16:00:14 +08:00 |
|
|
daitingting
|
a06796c25b
|
* Replace effort block to burn block.
* Check priviledge.
|
2018-05-03 15:59:30 +08:00 |
|
|
wangyidong
|
660e499d74
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-03 15:17:11 +08:00 |
|
|
wangyidong
|
4a297ee140
|
* finish task #3953.
|
2018-05-03 15:16:27 +08:00 |
|
|
daitingting
|
fdfa1bbd22
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-03 14:58:34 +08:00 |
|
|
daitingting
|
46e8569973
|
* Rewrite view page of project.
|
2018-05-03 14:58:03 +08:00 |
|
|
dajiao007
|
9271d69db6
|
modify translation of flowchart
|
2018-05-03 14:28:06 +08:00 |
|
|
chenfeiCF
|
66443f3eeb
|
* Finish task #3872, #3909.
|
2018-05-03 14:25:17 +08:00 |
|
|
wangyidong
|
c375ed05d0
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-03 09:54:01 +08:00 |
|
|
wangyidong
|
539c1986f9
|
* adjust for other module page.
|
2018-05-03 09:53:30 +08:00 |
|
|
liugang
|
7b5698f911
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-02 18:06:31 +08:00 |
|