 wangyidong
|
fc480d0a01
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-10-24 13:51:02 +08:00 |
|
|
wangyidong
|
b2b5ed0a5e
|
* fix error.
|
2018-10-24 13:50:42 +08:00 |
|
|
Yagami
|
346a928562
|
* Finish task #5043.
|
2018-10-24 13:29:20 +08:00 |
|
|
Yagami
|
3b03bc1547
|
* Delete doc gt lang.
|
2018-10-24 13:25:26 +08:00 |
|
|
Yagami
|
9e78e6f8bc
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-24 13:19:58 +08:00 |
|
|
Yagami
|
91596ab288
|
* Finish task #5047.
|
2018-10-24 13:19:42 +08:00 |
|
|
wangyidong
|
12238a6768
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-10-24 13:10:37 +08:00 |
|
|
wangyidong
|
1bfaece647
|
* finish task #5036.
|
2018-10-24 13:10:12 +08:00 |
|
|
Yagami
|
8723563496
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-24 13:04:43 +08:00 |
|
|
Yagami
|
1e95075550
|
* Finish task #5040.
|
2018-10-24 13:04:24 +08:00 |
|
|
滔哥
|
49c61607ef
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-24 11:39:08 +08:00 |
|
|
滔哥
|
7acf9fb3f4
|
* Finished task#5052.
|
2018-10-24 11:37:07 +08:00 |
|
|
chenfeiCF
|
912f125517
|
* Finish task #5000.
|
2018-10-24 11:23:06 +08:00 |
|
|
wangyidong
|
34bc2fedb0
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-10-24 11:17:44 +08:00 |
|
|
wangyidong
|
b8a8cfbc6a
|
* finish task #5046,5041.
|
2018-10-24 11:17:03 +08:00 |
|
|
chenfeiCF
|
7973e341e4
|
* Finish task #5048, #5049, #5050, #5054.
|
2018-10-24 11:06:17 +08:00 |
|
|
滔哥
|
b048e98b49
|
* Fix bug.
|
2018-10-24 10:56:37 +08:00 |
|
|
wangyidong
|
15effe206d
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-10-24 10:09:36 +08:00 |
|
|
wangyidong
|
673549a895
|
* change for en lang.
|
2018-10-24 10:09:00 +08:00 |
|
|
wangyidong
|
3676747f10
|
* finish task #5044,5045.
|
2018-10-24 10:06:20 +08:00 |
|
|
Yagami
|
9495614038
|
* Delete xuanxuan file.
|
2018-10-24 09:52:56 +08:00 |
|
|
Yagami
|
6106c692b9
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-24 09:37:29 +08:00 |
|
|
Yagami
|
5afccb24a5
|
* Finish task #5037.
|
2018-10-24 09:36:57 +08:00 |
|
|
Catouse
|
5b3b956a8a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
# module/custom/lang/en.php
# module/doc/js/browse.js
|
2018-10-24 09:27:13 +08:00 |
|
|
wangyidong
|
8cae97da93
|
* change border for product chosen with branch.
|
2018-10-23 17:02:32 +08:00 |
|
|
wangyidong
|
ca1b697681
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-10-23 16:35:06 +08:00 |
|
|
wangyidong
|
63a1a2601d
|
* fix for block by priv.
|
2018-10-23 16:30:55 +08:00 |
|
|
reneeteng
|
6ec315b2fe
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-23 16:25:06 +08:00 |
|
|
reneeteng
|
1473f6de30
|
* Modify lang.
|
2018-10-23 16:23:17 +08:00 |
|
|
wangyidong
|
d64306aa90
|
* adjust code.
|
2018-10-23 16:18:30 +08:00 |
|
|
wangyidong
|
ccfb1b9e4a
|
* add create lib in index page.
|
2018-10-22 16:12:03 +08:00 |
|
|
wangyidong
|
93e0cbe6eb
|
* fix error.
|
2018-10-22 14:34:45 +08:00 |
|
|
wangyidong
|
e2ed6070d1
|
* fix bug for batch child.
|
2018-10-22 14:32:45 +08:00 |
|
|
wangyidong
|
253415e200
|
* fix bug #2241.
|
2018-10-22 09:35:02 +08:00 |
|
|
wangyidong
|
458d56c283
|
* fix bug #2243.
|
2018-10-22 09:02:37 +08:00 |
|
|
wangyidong
|
eda6dd648b
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-10-19 14:57:59 +08:00 |
|
|
wangyidong
|
cf167ce697
|
* adjust code for task.
|
2018-10-19 14:57:21 +08:00 |
|
|
Yagami
|
99038ca227
|
* Fix project doc display.
|
2018-10-19 14:18:45 +08:00 |
|
|
chenfeiCF
|
29ae62225a
|
* Adjust doc side page to apply to zentaobiz.
|
2018-10-19 13:48:50 +08:00 |
|
|
Yagami
|
3775f0165e
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-19 13:15:48 +08:00 |
|
|
Yagami
|
32d073bb74
|
* Fix drop menu position.
|
2018-10-19 13:15:24 +08:00 |
|
|
reneteng
|
e259b0d337
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-19 10:43:28 +08:00 |
|
|
reneteng
|
00133df918
|
* p change
|
2018-10-19 10:42:58 +08:00 |
|
|
chenfeiCF
|
290f2fefdf
|
* Adjust doclib drop menu.
|
2018-10-19 10:05:20 +08:00 |
|
|
chenfeiCF
|
183eb059ec
|
* Add book side html to apply to zentaobiz.
|
2018-10-19 09:38:18 +08:00 |
|
|
Yagami
|
39215211b3
|
* Fix doc drop menu width.
|
2018-10-19 09:07:32 +08:00 |
|
|
Yagami
|
446b27ff70
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-18 17:18:24 +08:00 |
|
|
Yagami
|
7e98a2cc87
|
* Fix doc search btn.
|
2018-10-18 17:18:04 +08:00 |
|
|
reneteng
|
ec7fdf9290
|
*update
|
2018-10-18 17:16:20 +08:00 |
|
|
Yagami
|
a0aa700f18
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-10-18 15:00:06 +08:00 |
|