kerry
|
452733e0e9
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0
|
6 years ago |
kerry
|
ea82a6fc62
|
REPORT-11624 Excel和Word导出的html解析支持
|
6 years ago |
richie
|
3461fe70dc
|
Merge pull request #129 in CORE/base-third from release/10.0 to feature/10.0
* commit '848445c995da2ba9c3efb70685c77c3d4958905f':
增加启动监听
|
6 years ago |
richie
|
848445c995
|
增加启动监听
|
6 years ago |
neil
|
7db701f4a6
|
Merge pull request #128 in CORE/base-third from release/10.0 to feature/10.0
* commit '20d9bf36bd8b223244dcd58518036b2a7d3528ad':
fix
无jira任务,打包失败
代码修改
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
|
6 years ago |
rinoux
|
20d9bf36bd
|
Merge pull request #127 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0
* commit 'c117be5e40db0dd9eb8faab9c59ecd627205f858':
fix
|
6 years ago |
rinoux
|
668dd48e3d
|
Merge pull request #126 in CORE/base-third from ~JU/base-third:10.0 to 10.0
* commit 'fdd52d35a70aa7c7c02ee8a85da849fe01578d31':
fix
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
|
6 years ago |
ju
|
c117be5e40
|
fix
|
6 years ago |
ju
|
fdd52d35a7
|
fix
|
6 years ago |
ju
|
07e80d35af
|
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
|
6 years ago |
ju
|
6488db1534
|
Merge pull request #123 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '5b87243654a59025b4b29098e5b8b781b019e982':
无jira任务,打包失败
|
6 years ago |
ju
|
fc4d1c7335
|
Merge pull request #124 in CORE/base-third from ~KERRY/base-third:10.0 to 10.0
* commit 'acd6617ad111924dd7c1ac1993701a37d871deab':
无jira任务,打包失败
|
6 years ago |
kerry
|
acd6617ad1
|
无jira任务,打包失败
|
6 years ago |
kerry
|
5b87243654
|
无jira任务,打包失败
|
6 years ago |
neil
|
d43d08e30c
|
Merge pull request #121 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '755e8aa0258cbfa3ad0ad29fbb4138c50d4a80c8':
代码修改
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
|
6 years ago |
neil
|
a699534bb6
|
Merge pull request #122 in CORE/base-third from ~KERRY/base-third:10.0 to 10.0
* commit '7c49b26bbc0a5719e68cae98cb7225204374d59c':
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
|
6 years ago |
kerry
|
755e8aa025
|
代码修改
|
6 years ago |
kerry
|
7c49b26bbc
|
REPORT-10262 html大文本精确分页
|
6 years ago |
kerry
|
708ccfb9c3
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into release/10.0
|
6 years ago |
kerry
|
6a959c0b33
|
REPORT-10262 html大文本精确分页
|
6 years ago |
kerry
|
23ef3961a0
|
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
|
6 years ago |
kerry
|
94a4a69181
|
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
|
6 years ago |
ju
|
3dbb4a730b
|
Merge pull request #120 in CORE/base-third from release/10.0 to 10.0
* commit '9a7903d06433d02356c959969891376f861ff2cb': (30 commits)
REPORT-11437 调整druid源码
REPORT-11437 调整druid源码,支持读取hibernate配置
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
DEC-4430 添加ehcache源码中缺少的类
DEC-4430 ehcache中import的jboss改包名
DEC-4430 ehcache中import的jboss改包名
REPORT-11256 html标签之table元素的导出pdf和图片显示不全
REPORT-10262 html大文本精确分页
代码修改
wu
无
注释一下
BI-29723 druid连接池生产线程阻塞
WU
...
|
6 years ago |
Harrison
|
9a7903d064
|
Merge pull request #118 in CORE/base-third from feature/10.0 to release/10.0
* commit '2433f121ba76feaa17b4ee3e9f4beed50369dfbe':
REPORT-11437 调整druid源码
REPORT-11437 调整druid源码,支持读取hibernate配置
|
6 years ago |
loy
|
2433f121ba
|
Merge pull request #117 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0
* commit '67a16f2f08537a52e831881e6c8e85ab6b532a89':
REPORT-11437 调整druid源码
|
6 years ago |
loy
|
67a16f2f08
|
REPORT-11437 调整druid源码
|
6 years ago |
ju
|
2322887305
|
Merge pull request #116 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0
* commit 'd767e030af8972585eb7104d051224bdda44cd2b':
REPORT-11437 调整druid源码,支持读取hibernate配置
|
6 years ago |
loy
|
d767e030af
|
REPORT-11437 调整druid源码,支持读取hibernate配置
|
6 years ago |
ju
|
06da03effe
|
Merge pull request #115 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0
* commit '63addb8666c88239070a2f2b0e8c60f80e8d2236':
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
RELEASE
|
6 years ago |
ju
|
63addb8666
|
RELEASE
|
6 years ago |
ju
|
42a0d917ff
|
RELEASE
|
6 years ago |
ju
|
c44af1404f
|
RELEASE
|
6 years ago |
ju
|
9199beb2ca
|
RELEASE
|
6 years ago |
ju
|
c28fca3d93
|
RELEASE
|
6 years ago |
ju
|
91c223f7cc
|
RELEASE
|
6 years ago |
ju
|
07b9b8356a
|
RELEASE
|
6 years ago |
ju
|
cd3141bbb9
|
Merge pull request #113 in CORE/base-third from feature/10.0 to release/10.0
* commit '5fa0418bb2098fd7bb9bd44cdc7d879a0196b19d':
DEC-4430 添加ehcache源码中缺少的类
|
6 years ago |
loy
|
5fa0418bb2
|
Merge pull request #111 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0
* commit 'e0f1d20a6e0493f5dbd8dd49018eb0e08b71de1a':
DEC-4430 添加ehcache源码中缺少的类
|
6 years ago |
ju
|
30a3df4444
|
Merge pull request #112 in CORE/base-third from feature/10.0 to release/10.0
* commit '95321692a540578ca4650710779c3b58c576627b':
DEC-4430 ehcache中import的jboss改包名
DEC-4430 ehcache中import的jboss改包名
REPORT-11256 html标签之table元素的导出pdf和图片显示不全
REPORT-10262 html大文本精确分页
代码修改
wu
无
注释一下
BI-29723 druid连接池生产线程阻塞
WU
无jira任务 build codec的源码
无jira任务 加入org.apache.commons.codec的资源文件
无jira任务 加入icu4j的资源文件
无jira任务 加入icu4j源码。
64位
hash
i386
lz4打包
build
访问
|
6 years ago |
loy
|
e0f1d20a6e
|
DEC-4430 添加ehcache源码中缺少的类
|
6 years ago |
neil
|
95321692a5
|
Merge pull request #108 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0
* commit 'd653a6d6427964eab575b6f89265a94359b13728':
REPORT-11256 html标签之table元素的导出pdf和图片显示不全
REPORT-10262 html大文本精确分页
|
6 years ago |
loy
|
bee9897c82
|
Merge pull request #110 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0
* commit 'f741a63bdfa6fd5f5920aa1ec6bc278ec881789c':
DEC-4430 ehcache中import的jboss改包名
|
6 years ago |
loy
|
f741a63bdf
|
DEC-4430 ehcache中import的jboss改包名
|
6 years ago |
loy
|
bdf8af0b82
|
Merge pull request #109 in CORE/base-third from ~LOY/base-third:feature/10.0 to feature/10.0
* commit 'ed243e29e8b4476deb1fb732af31cbbb0e2db768':
DEC-4430 ehcache中import的jboss改包名
|
6 years ago |
loy
|
ed243e29e8
|
DEC-4430 ehcache中import的jboss改包名
|
6 years ago |
kerry
|
d653a6d642
|
REPORT-11256 html标签之table元素的导出pdf和图片显示不全
|
6 years ago |
kerry
|
804ca8cf58
|
REPORT-10262 html大文本精确分页
|
6 years ago |
ju
|
9ae51c5365
|
Merge pull request #107 in CORE/base-third from release/10.0 to 10.0
* commit '5ed670be98567fc29e1c80d113395270d38b839e':
注释
BI-29723 druid连接池生产线程阻塞
BI-29723 druid连接池生产连接线程阻塞
增加tool.xsd
64位
hash
i386
Lz4
修改一下命名
修改一下命名
在所有生产线程退出的地方,都重新创建新的生产线程
fix npe
|
6 years ago |
ju
|
73983c9393
|
Merge pull request #106 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0
* commit '2075bce909584c147b6ce46b812ee38f3d62678f':
代码修改
wu
无
WU
|
6 years ago |
kerry
|
2075bce909
|
代码修改
|
6 years ago |