 Yagami
|
be110033d6
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-16 13:07:17 +08:00 |
|
|
Yagami
|
0d376d0f52
|
* Fix bug #2288.
|
2018-11-16 13:06:59 +08:00 |
|
|
Catouse
|
8c2c63bb63
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-16 11:28:48 +08:00 |
|
|
Catouse
|
87b17af92c
|
* finish task #5063.
|
2018-11-16 11:28:42 +08:00 |
|
|
wangyidong
|
8c17b6c61b
|
* fix bug #2290.
|
2018-11-16 11:25:16 +08:00 |
|
|
wangyidong
|
22a149dd44
|
* fix bug #2230.
|
2018-11-16 11:18:33 +08:00 |
|
|
wangyidong
|
1a39d023f3
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-11-16 11:02:52 +08:00 |
|
|
wangyidong
|
e1bccfb4c0
|
* fix bug #2257.
|
2018-11-16 11:02:21 +08:00 |
|
|
Catouse
|
17365e9a6d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-16 11:00:50 +08:00 |
|
|
Catouse
|
7154e289b6
|
* adjust style of .article-content element.
|
2018-11-16 11:00:43 +08:00 |
|
|
Catouse
|
d8250402c4
|
* finish task #5074.
|
2018-11-16 11:00:26 +08:00 |
|
|
Yagami
|
93bde020e2
|
* Fix bug #2294.
|
2018-11-16 10:19:09 +08:00 |
|
|
Yagami
|
6d03636c69
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-16 09:48:22 +08:00 |
|
|
Yagami
|
cdbf1487ac
|
* Fix report empty value.
|
2018-11-16 09:47:55 +08:00 |
|
|
Catouse
|
05a48efe90
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-16 09:46:05 +08:00 |
|
|
Catouse
|
0c4c90cfdd
|
* finish task #5094.
|
2018-11-16 09:45:55 +08:00 |
|
|
chenfeiCF
|
6bb2a93ffc
|
* Declare array.
|
2018-11-16 09:35:56 +08:00 |
|
|
chenfeiCF
|
239644b362
|
* Adjust lang item.
|
2018-11-16 09:35:30 +08:00 |
|
|
Yagami
|
f3fe52df6d
|
* Fix bug #2296.
|
2018-11-16 09:14:58 +08:00 |
|
|
wangyidong
|
976e644f9f
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-11-16 08:45:05 +08:00 |
|
|
wangyidong
|
bd38aa3e86
|
* adjust for count method with group by.
|
2018-11-16 08:41:19 +08:00 |
|
|
Catouse
|
f34441056e
|
* finish task #5089.
|
2018-11-15 18:38:53 +08:00 |
|
|
Catouse
|
8e1eb69722
|
* code for task #5103.
|
2018-11-15 18:19:57 +08:00 |
|
|
Catouse
|
daa4c9c7cf
|
* format code.
|
2018-11-15 17:49:06 +08:00 |
|
|
Catouse
|
95e6ca3a60
|
* fix ajaxform error.
|
2018-11-15 17:48:57 +08:00 |
|
|
Catouse
|
4385c74bc8
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 17:26:43 +08:00 |
|
|
Catouse
|
35dff92f83
|
* finish task #5107.
|
2018-11-15 17:26:38 +08:00 |
|
|
wangyidong
|
d9c1232bd8
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-11-15 16:53:02 +08:00 |
|
|
wangyidong
|
1cb6d3b4d0
|
* adjust for check consistency.
|
2018-11-15 16:52:32 +08:00 |
|
|
Yagami
|
630d47d93b
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 16:38:43 +08:00 |
|
|
Catouse
|
514b23c7f4
|
* finish task #5115.
|
2018-11-15 16:34:13 +08:00 |
|
|
Catouse
|
138b2bdafb
|
* fix bug #2035 and finish task #5134.
|
2018-11-15 16:25:55 +08:00 |
|
|
Yagami
|
3e17336831
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 16:25:53 +08:00 |
|
|
Yagami
|
66ac1b9012
|
* Finish task #5116.
|
2018-11-15 16:25:37 +08:00 |
|
|
Catouse
|
66f6f1d761
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 15:40:03 +08:00 |
|
|
Catouse
|
ceed1e4821
|
* finish task #5141.
|
2018-11-15 15:39:42 +08:00 |
|
|
wangyidong
|
3241b0a970
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-11-15 15:39:03 +08:00 |
|
|
wangyidong
|
e8af92a166
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-11-15 15:38:34 +08:00 |
|
|
Yagami
|
d2d421c9fb
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 15:36:48 +08:00 |
|
|
Yagami
|
e481a5496f
|
* Finish task #5116.
|
2018-11-15 15:36:11 +08:00 |
|
|
wangyidong
|
8bef03e8f3
|
* finish task #5057.
|
2018-11-15 15:35:19 +08:00 |
|
|
Catouse
|
8387e49602
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 15:30:25 +08:00 |
|
|
Catouse
|
2cf4be7d7b
|
* finish task #5088.
|
2018-11-15 15:29:48 +08:00 |
|
|
chenfeiCF
|
496964c1b0
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-11-15 15:21:16 +08:00 |
|
|
chenfeiCF
|
cefdbaa5d3
|
* Finish task #5133.
|
2018-11-15 15:20:42 +08:00 |
|
|
Catouse
|
9fc889340f
|
* finish task #5086.
|
2018-11-15 15:19:39 +08:00 |
|
|
Catouse
|
52ecb55c52
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-11-15 14:22:49 +08:00 |
|
|
Catouse
|
aa5031778d
|
* finish task #5060.
|
2018-11-15 14:22:43 +08:00 |
|
|
chenfeiCF
|
1650ba3592
|
* Finish task #5129.
|
2018-11-15 14:10:27 +08:00 |
|
|
chenfeiCF
|
48f425f180
|
* Finish task #5128.
|
2018-11-15 13:43:28 +08:00 |
|