 yaoh.wu
|
c98e64bbfd
|
无任务，构建失败
|
6 years ago |
Kara
|
f62341c989
|
Merge pull request #177 in CORE/base-third from release/10.0 to final/10.0
* commit '580ca893ad6bac55e811dc7b803ec4a436624bb5':
资源文件
增加j2v8
引入J2V8
资源文件
国际化时区问题，引入joda（支持JDK1.6）
REPORT-14108 预览效果不正确
无jira任务，打包报错
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
|
6 years ago |
neil
|
1f62e18657
|
Merge pull request #6 in ~NEIL/base-third from release/10.0 to feature/10.0
* commit '580ca893ad6bac55e811dc7b803ec4a436624bb5':
资源文件
增加j2v8
引入J2V8
资源文件
|
6 years ago |
 richie
|
176dbf700b
|
资源文件
|
6 years ago |
|
richie
|
580ca893ad
|
资源文件
|
6 years ago |
|
richie
|
c13ed30fd4
|
增加j2v8
|
6 years ago |
|
richie
|
171f8e524b
|
增加J2V8
|
6 years ago |
|
richie
|
d9529ff852
|
引入J2V8
|
6 years ago |
|
richie
|
0f01b3fae9
|
资源文件
|
6 years ago |
|
richie
|
078b2c32ec
|
删除测试代码
|
6 years ago |
|
richie
|
65e52b6ab0
|
joda-time
|
6 years ago |
|
richie
|
e53ad12c6c
|
Merge remote-tracking branch 'origin/release/10.0' into feature/10.0
|
6 years ago |
|
richie
|
da1511ab8b
|
国际化时区问题，引入joda（支持JDK1.6）
|
6 years ago |
ju
|
3013f737ca
|
Merge pull request #174 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '645159f9a34097a34281135b698c9a5201ce83ce':
REPORT-14108 预览效果不正确
|
6 years ago |
 kerry
|
645159f9a3
|
REPORT-14108 预览效果不正确
|
6 years ago |
|
ju
|
3877da6add
|
Merge pull request #172 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '3e19c0c692220ac153798cd5194c3c2189110152':
无jira任务，打包报错
|
6 years ago |
|
kerry
|
3e19c0c692
|
无jira任务，打包报错
|
6 years ago |
|
neil
|
67fffadfb8
|
Merge pull request #169 in CORE/base-third from ~NEIL/base-third:feature/10.0 to feature/10.0
* commit 'abc665e96711e0462e07c46b90ff949ea62042d1':
分支信息
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
fenzhi
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件，报错
无JIRA任务，third打包分支错误.
|
6 years ago |
 neil
|
abc665e967
|
分支信息
|
6 years ago |
|
neil
|
18bcc44a15
|
Merge pull request #5 in ~NEIL/base-third from release/10.0 to feature/10.0
* commit '890944ddc4dcf048f2921ced3c63a94c0ff7dca8':
REPORT-13856 单元格设置行间距导出word不生效
升级apache工具类
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
fenzhi
fine-jackson/src/com/fr/third/fasterxml/jackson/databind/type/ClassFactory.java CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件，报错
无JIRA任务，third打包分支错误.
|
6 years ago |
|
ju
|
890944ddc4
|
Merge pull request #167 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit '8e724a05b87b667f143c2c37147f0daef190a3ca':
REPORT-13856 单元格设置行间距导出word不生效
|
6 years ago |
|
kerry
|
8e724a05b8
|
REPORT-13856 单元格设置行间距导出word不生效
|
6 years ago |
|
richie
|
3fd424b07f
|
升级apache工具类
|
6 years ago |
|
richie
|
5b7bb18bfb
|
升级apache工具类
|
6 years ago |
|
richie
|
829dab5c69
|
升级apache工具类
|
6 years ago |
|
Kara
|
3dde8ae969
|
Merge pull request #163 in CORE/base-third from release/10.0 to final/10.0
* commit 'c3827b1fd1b5a468ebd841c62ed905fa4f8e1612':
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
|
6 years ago |
 zhouping
|
c3827b1fd1
|
Merge pull request #162 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'a2752fb2e28faf9b562a07d78180bab9a42a9196':
rt
rt 误删了定制内容
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿 升级jackson 2.7
|
6 years ago |
zhouping
|
a2752fb2e2
|
rt
|
6 years ago |
|
zhouping
|
44e9332685
|
rt 误删了定制内容
|
6 years ago |
|
zhouping
|
01370efc90
|
DEC-5983 【10.0.2】200并发压测中，一堆com.fr.third.fasterxml.jackson.databind.ser.SerializerCache进程block，系统卡顿
升级jackson 2.7
|
6 years ago |
 Harrison
|
8129ee6a68
|
Merge pull request #161 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit 'e025f972ab0fec35fcfc19598b17e79d51e95394':
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败 重编译第三方框架
|
6 years ago |
|
Harrison
|
e025f972ab
|
DEC-5909 【10.0.2平台回归】【注册管理】公有云注册失败
重编译第三方框架
|
6 years ago |
|
richie
|
1131451094
|
Merge pull request #160 in CORE/base-third from ~DANIEL/base-third:final/10.0 to final/10.0
* commit '5c95abb1337dbe47a3866133aa999a5845dc619a':
build.third_step0.gradle edited online with Bitbucket
|
6 years ago |
daniel
|
5c95abb133
|
build.third_step0.gradle edited online with Bitbucket
|
6 years ago |
|
ju
|
43066bac0c
|
Merge pull request #158 in CORE/base-third from ~KERRY/base-third:release/10.0 to release/10.0
* commit 'd4323d8e43b550f9c3625876341785528bbe38a3':
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
|
6 years ago |
|
kerry
|
d4323d8e43
|
REPORT-13464 [10.0.2回归]表单导出排版混乱，背景未导出
|
6 years ago |
|
neil
|
2fa1486158
|
Merge pull request #157 in CORE/base-third from ~NEIL/base-third:release/10.0 to release/10.0
* commit 'c92ae4fa5eefb10831ef5564662647ba4a0c43fb':
fenzhi
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打包分支错误.
无JIRA任务，third打包分支错误.
无
REPORT-11624 Excel和Word导出的html解析支持
|
6 years ago |
|
neil
|
c92ae4fa5e
|
fenzhi
|
6 years ago |
|
neil
|
c300ea27f0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/base-third into release/10.0
|
6 years ago |
|
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 |
