wangyidong
|
32dcdeb74c
|
* finish task #4054.
|
2018-05-10 15:52:19 +08:00 |
|
wangyidong
|
8e45aed577
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-10 15:33:09 +08:00 |
|
wangyidong
|
d5972b7a23
|
* finish task #3982.
|
2018-05-10 15:32:08 +08:00 |
|
Catouse
|
2662906129
|
* refactor code.
|
2018-05-10 15:14:19 +08:00 |
|
Catouse
|
8e5b1a81b4
|
* change file language.
|
2018-05-10 14:58:44 +08:00 |
|
wangyidong
|
ad4a3c3532
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-10 14:53:26 +08:00 |
|
wangyidong
|
3f2e2b96e7
|
* finish task #3981.
|
2018-05-10 14:52:04 +08:00 |
|
Catouse
|
0a375759a7
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-10 14:50:03 +08:00 |
|
Catouse
|
2fda0ddde3
|
* refactor code.
|
2018-05-10 14:49:38 +08:00 |
|
wangyidong
|
a3bd5c2970
|
* adjust for table style.
|
2018-05-10 14:44:18 +08:00 |
|
wangyidong
|
08da02ba10
|
* finish task #3980.
|
2018-05-10 14:43:18 +08:00 |
|
wangyidong
|
bd6668f25b
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-10 14:41:12 +08:00 |
|
wangyidong
|
3a62ffb622
|
* finish task #4044.
|
2018-05-10 14:40:44 +08:00 |
|
Catouse
|
0343fbca91
|
* make dropdown menu in subNavbar auto open when mouse hover.
|
2018-05-10 14:11:44 +08:00 |
|
Catouse
|
3ec32f4569
|
* hide datatable btn.
|
2018-05-10 13:49:13 +08:00 |
|
wangyidong
|
52799cf5b8
|
* finish task #3978.
|
2018-05-10 11:18:09 +08:00 |
|
wangyidong
|
767a210d02
|
* finish task #3974.
|
2018-05-10 10:03:17 +08:00 |
|
wangyidong
|
d20a923105
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-10 10:00:33 +08:00 |
|
wangyidong
|
aede4506ce
|
* finish task #3973.
|
2018-05-10 10:00:05 +08:00 |
|
daitingting
|
e098acb326
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-09 18:07:01 +08:00 |
|
daitingting
|
81d2309191
|
* Adjust index file of doc.
|
2018-05-09 18:06:34 +08:00 |
|
wangyidong
|
c3e3d3e974
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-09 15:20:15 +08:00 |
|
wangyidong
|
ab4d9a1f2c
|
* fix error and adjust for ux.
|
2018-05-09 15:18:45 +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
|
7807b3fd12
|
* Adjust codes.
|
2018-05-09 14:55:01 +08:00 |
|
daitingting
|
226074e7b2
|
* Adjust codes.
|
2018-05-09 14:54:38 +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 |
|
滔哥
|
5db3cf9041
|
* Format code.
|
2018-05-09 10:04:14 +08:00 |
|
滔哥
|
ed48dbeb81
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-09 10:00:36 +08:00 |
|
滔哥
|
45f1da3824
|
* Task#3944
|
2018-05-09 09:58:48 +08:00 |
|
滔哥
|
325fee5bc7
|
* Task#3944
|
2018-05-09 09:18:59 +08:00 |
|
wangyidong
|
86cd21ccd2
|
* adjust for zentaoux.
|
2018-05-09 09:17:31 +08:00 |
|
daitingting
|
446ee935f9
|
* Adjust codes.
|
2018-05-09 09:00:23 +08:00 |
|
wangyidong
|
9d2ddabcfe
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-05-09 08:59:58 +08:00 |
|
wangyidong
|
4985646652
|
* adjust for btn-icon class.
|
2018-05-09 08:59:25 +08:00 |
|
滔哥
|
946436452d
|
* Task#3944
|
2018-05-09 00:39:26 +08:00 |
|
滔哥
|
36b6e5863d
|
* Task#3942
|
2018-05-08 23:27:12 +08:00 |
|
滔哥
|
7939863a05
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 23:13:16 +08:00 |
|
滔哥
|
a16a48a323
|
* Task#3942
|
2018-05-08 23:12:49 +08:00 |
|
Catouse
|
d67a6ca6b1
|
* improve UI of task list views.
|
2018-05-08 19:25:05 +08:00 |
|
Catouse
|
36e68819e9
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 17:11:30 +08:00 |
|
Catouse
|
8248b4aecb
|
* change views.
|
2018-05-08 17:11:24 +08:00 |
|
wangyidong
|
495822efd4
|
* adjust for doc.
|
2018-05-08 16:45:07 +08:00 |
|
Catouse
|
abec53a54d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-05-08 16:18:28 +08:00 |
|
Catouse
|
c91ca33cb7
|
* change common views.
|
2018-05-08 16:18:20 +08:00 |
|
Catouse
|
f3d0efab57
|
* adjust style of products block.
|
2018-05-08 16:18:11 +08:00 |
|
Catouse
|
67f123fb2e
|
* change todo/batchcreate view.
|
2018-05-08 16:16:11 +08:00 |
|