daitingting
|
7cf41ee696
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-18 13:23:56 +08:00 |
|
daitingting
|
cbb127c726
|
* Adjust collect style and title.
|
2018-05-18 13:23:29 +08:00 |
|
Catouse
|
5295dbef07
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-18 11:33:08 +08:00 |
|
Catouse
|
69ebbbc0f6
|
* change doc/createLib modal style.
|
2018-05-18 11:33:02 +08:00 |
|
daitingting
|
82ce0b3d84
|
* Add th for actions.
|
2018-05-18 11:27:12 +08:00 |
|
daitingting
|
50e6f8e15f
|
* Add english language.
|
2018-05-18 10:29:20 +08:00 |
|
滔哥
|
82dd51d2af
|
* Task#4158.
|
2018-05-17 19:54:06 +08:00 |
|
daitingting
|
430c205805
|
* Remove split-row when from is not doc.
* Adjust language.
|
2018-05-17 17:05:28 +08:00 |
|
tengfei
|
ba2a44a659
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-17 15:09:59 +08:00 |
|
tengfei
|
44d87c1368
|
* translation changed
|
2018-05-17 15:07:58 +08:00 |
|
wangyidong
|
c5fec18481
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-17 14:43:54 +08:00 |
|
wangyidong
|
6e6c82be2b
|
* adjust for page.
|
2018-05-17 14:43:35 +08:00 |
|
Catouse
|
4432a36f1a
|
* change buttons style.
|
2018-05-17 11:18:19 +08:00 |
|
daitingting
|
0056609d9c
|
* Adjust button style.
|
2018-05-16 17:44:42 +08:00 |
|
Catouse
|
e522af53b4
|
* remove btn-gray.
|
2018-05-15 15:33:33 +08:00 |
|
liugang
|
4ad2bdac02
|
* Refact browse page of bug.
|
2018-05-10 17:43:29 +08:00 |
|
daitingting
|
81d2309191
|
* Adjust index file of doc.
|
2018-05-09 18:06:34 +08:00 |
|
daitingting
|
cad8f8652b
|
* Optimize them.
|
2018-05-09 15:17:34 +08:00 |
|
daitingting
|
33a8e0d535
|
* Merge it.
|
2018-05-09 14:59:06 +08:00 |
|
daitingting
|
b6f0a806f8
|
* Adjust icon.
|
2018-05-09 14:35:51 +08:00 |
|
daitingting
|
da9f9f6a05
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
Conflicts:
module/doc/view/browse.html.php
|
2018-05-09 11:01:40 +08:00 |
|
daitingting
|
80478980dd
|
* Rewrite showfile page of doc.
|
2018-05-09 11:00:55 +08:00 |
|
daitingting
|
446ee935f9
|
* Adjust codes.
|
2018-05-09 09:00:23 +08:00 |
|
wangyidong
|
495822efd4
|
* adjust for doc.
|
2018-05-08 16:45:07 +08:00 |
|
daitingting
|
1fd774b083
|
* Rewrite view page of doc.
|
2018-05-08 16:03:34 +08:00 |
|
daitingting
|
bba8b0ed1d
|
* Add highlight for sidemenu.
|
2018-05-08 14:16:55 +08:00 |
|
daitingting
|
b1c8712db3
|
* Adjust title for search.
|
2018-05-08 13:24:26 +08:00 |
|
daitingting
|
328e622028
|
* Add pager for alllibs page.
|
2018-05-08 11:16:53 +08:00 |
|
daitingting
|
63246110ac
|
* Adjust codes.
|
2018-05-08 11:05:54 +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 |
|
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 |
|
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 |
|
liugang
|
70dcc23aca
|
* Refact testtask page of project.
|
2018-05-07 11:54:54 +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
|
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
|
dd1d9b67ac
|
* Adjust codes.
|
2018-04-28 16:44:35 +08:00 |
|
daitingting
|
00f74c851a
|
* Adjust codes.
|
2018-04-28 16:40:23 +08:00 |
|
daitingting
|
091bbea7aa
|
* Rewrite index page of doc.
|
2018-04-28 16:36:56 +08:00 |
|
JackWuLieHao
|
e5b822276d
|
* Finish bug #1486 #1502
|
2018-04-04 14:35:09 +08:00 |
|