neil
|
d731b2ab8d
|
Merge pull request #4 in ~NEIL/base-third from feature/10.0 to release/10.0
* commit '9f7b4b9fb5f5aced05af953a45f74a8cdd1e871e':
REPORT-13005 sub标签设置color属性,实际导出没有效果
REPORT-11969 注册增强 1. 修改 el 后缀, 通用 win/linux
REPORT-11969 注册增强
删除无用代码
删除无用代码
REPORT-11624 Excel和Word导出的html解析(third部分)
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
无JIRA任务,third打包分支错误.
无
REPORT-11624 Excel和Word导出的html解析支持
|
6 years ago |
ju
|
9f7b4b9fb5
|
Merge pull request #156 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0
* commit 'f64ff89c6c4468c0564d8aa92dbee148ae1d49a5':
REPORT-13005 sub标签设置color属性,实际导出没有效果
|
6 years ago |
kerry
|
f64ff89c6c
|
REPORT-13005 sub标签设置color属性,实际导出没有效果
|
6 years ago |
Harrison
|
fca7debc79
|
Merge pull request #154 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '7dc60e19f9a1803fc2fcb469d0cc5b48a4819580':
REPORT-11969 注册增强 1. 修改 el 后缀, 通用 win/linux
|
6 years ago |
Harrison
|
7dc60e19f9
|
REPORT-11969 注册增强
1. 修改 el 后缀, 通用 win/linux
|
6 years ago |
Harrison
|
33b1510083
|
Merge pull request #153 in CORE/base-third from ~HARRISON/base-third:feature/10.0 to feature/10.0
* commit '7d2e9d348525ac35856c49040a449f5b1da5a0b3':
REPORT-11969 注册增强
|
6 years ago |
Harrison
|
7d2e9d3485
|
REPORT-11969 注册增强
|
6 years ago |
ju
|
5632460101
|
Merge pull request #151 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0
* commit '0d859e400ec56ca509a14633d6c98f8e37a811d2':
删除无用代码
删除无用代码
REPORT-11624 Excel和Word导出的html解析(third部分)
|
6 years ago |
kerry
|
0d859e400e
|
删除无用代码
|
6 years ago |
kerry
|
71e27eff53
|
删除无用代码
|
6 years ago |
kerry
|
7e5de3f688
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/base-third into feature/10.0
|
6 years ago |
kerry
|
9ed5213d06
|
REPORT-11624 Excel和Word导出的html解析(third部分)
|
6 years ago |
ju
|
389923146f
|
Merge pull request #147 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0
* commit '431024faf40d7c8b96da60c98f3d83df619d36e5':
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
|
6 years ago |
ju
|
c8626a34c5
|
Merge pull request #146 in CORE/base-third from ~JU/base-third:feature/10.0 to feature/10.0
* commit 'e8a128b49813785d182d6581d1345a7d358738a3':
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
|
6 years ago |
ju
|
e8a128b498
|
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
|
6 years ago |
ju
|
431024faf4
|
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
|
6 years ago |
ju
|
50f2af2f39
|
Merge pull request #143 in CORE/base-third from ~JU/base-third:release/10.0 to release/10.0
* commit '1bca05da286dec0b27448b6af1eb36926bbd4385':
fix
|
6 years ago |
ju
|
8d77973cc3
|
Merge pull request #144 in CORE/base-third from ~JU/base-third:feature/10.0 to feature/10.0
* commit 'e3fc7111e348c62cd46e451b0f547de389055d5e':
fix
|
6 years ago |
ju
|
e3fc7111e3
|
fix
|
6 years ago |
ju
|
1bca05da28
|
fix
|
6 years ago |
ju
|
ac5af2507b
|
Merge pull request #138 in CORE/base-third from ~ZED/fine-base-third:feature/10.0 to feature/10.0
* commit 'c066969f5a85cc01cdd400f0e3322b97675136f5':
fix
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
|
6 years ago |
ju
|
eb1dae5da6
|
Merge pull request #139 in CORE/base-third from ~ZED/fine-base-third:release/10.0 to release/10.0
* commit '1d378a4e5ca00e96a95d365c55680fdc46241562':
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
|
6 years ago |
zed
|
1d378a4e5c
|
fix
|
6 years ago |
zed
|
c066969f5a
|
fix
|
6 years ago |
zed
|
186c0e86ff
|
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
|
6 years ago |
zed
|
8042b90644
|
fix
|
6 years ago |
zed
|
d78f153f0e
|
fix
|
6 years ago |
zed
|
7861d09d54
|
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
|
6 years ago |
neil
|
3e77f92178
|
Merge pull request #131 in CORE/base-third from ~NEIL/base-third:feature/10.0 to feature/10.0
* commit 'ed8bc53c867a2a04ebf35a81cbe91c229f0c742e':
无JIRA任务,third打包分支错误.
|
6 years ago |
neil
|
ed8bc53c86
|
无JIRA任务,third打包分支错误.
|
6 years ago |
neil
|
e009c01d96
|
无JIRA任务,third打包分支错误.
|
6 years ago |
ju
|
0d949530a7
|
Merge pull request #130 in CORE/base-third from ~KERRY/base-third:feature/10.0 to feature/10.0
* commit '2120b035a533ffb36f4f87cbcc9b5f5d56d54fa0':
无
REPORT-11624 Excel和Word导出的html解析支持
|
6 years ago |
kerry
|
2120b035a5
|
无
|
6 years ago |
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 |
ju
|
c117be5e40
|
fix
|
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 |
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 |
kerry
|
755e8aa025
|
代码修改
|
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 |
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 |