Elijah
1ce966913b
Pull request #785 : DEC-14578 feat: 引入com.alibaba:transmittable-thread-local
...
Merge in CORE/base-third from ~ELIJAH/base-third:qufenxi to qufenxi
* commit '8cad028623d000a2f393fe03995c903d2947f74d':
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
Elijah
8cad028623
DEC-14578 打包脚本
4 years ago
Elijah
41fa48ec77
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
superman
2a6623f48e
Merge pull request #601 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'cca6337af74188fdebac84651e46817ed088ed57':
4 years ago
superman
cca6337af7
Merge pull request #551 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '2a3f2705a02c58fa3e9dbf21ed8bdbcc61e70797':
4 years ago
superman
2a3f2705a0
Merge pull request #550 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '9446dd28ebbde671fb5fdcbd91ef30aecc6c8f8b':
无jira任务,persist合final
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
REPORT-32986 html大写标签不生效
4 years ago
Kara
9446dd28eb
Pull request #499 : 无jira任务, release/10.0 合 final/10.0
...
Merge in CORE/base-third from release/10.0 to final/10.0
* commit '3230c231fdcfe002e38aca8eb5543b9febedc69a':
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
REPORT-32986 html大写标签不生效
4 years ago
ju.ju
3230c231fd
Pull request #488 : 无jira任务, final/10.0 合 release/10.0
...
Merge in CORE/base-third from final/10.0 to release/10.0
* commit '9a9390fc5c7c7eb2a8bdc92d4a969f1cf26f308a':
无jira任务,persist合final
build.third_step0.gradle edited online with Bitbucket
build.third_step0.gradle edited online with Bitbucket
更新apache工具类
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
fix
fix
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
无jira任务,打包失败
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
build
build
build
4 years ago
Kara
9a9390fc5c
Pull request #487 : 无jira任务,persist合final
...
Merge in CORE/base-third from ~LUCIAN.CHEN/base-third:final/10.0 to final/10.0
* commit 'c2391b8bf1cb9d87b5cb8b8b6e213b7c240da453':
无jira任务,persist合final
build.third_step0.gradle edited online with Bitbucket
build.third_step0.gradle edited online with Bitbucket
更新apache工具类
CORE-135 插件禁用再启用后Jackson实例化的java对象仍然用的插件卸载前的classLoader
fix
fix
MOBILE-17909&MOBILE-17908 10.0微信》定时调度有微信任务时卸载微信插件,报错
fix
fix
DEC-4839 druid没有写默认的ms连接前校验语句,hibernate也没加,最后导致出错
无jira任务,打包失败
REPORT-10262 html大文本精确分页
REPORT-11516 富文本在内容前添加空格导出word和预览不一致
build
build
build
4 years ago
lucian
c2391b8bf1
无jira任务,persist合final
4 years ago
Hugh.C
fc9f34d537
Pull request #484 : REPORT-34320 块标签前紧跟着的块标签含文本且文本尾部不是空格时会多出空白行
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '8ad896e4e95e63af5aaec171424b809a7a939f78':
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
4 years ago
Hugh.C
8ad896e4e9
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
4 years ago
Hugh.C
fb9a7ffede
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
4 years ago
Lucian.Chen
671e2d43ed
Pull request #483 : 无jira任务,bugfix 合并 release
...
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit '5addbc58596742d3b3c9ef8fbbf1b322b40dee78':
REPORT-32986 html大写标签不生效
4 years ago
Hugh.C
f81bae5a39
Pull request #482 : REPORT-33863 html图片宽度大于实际盒子宽度时,图片后的文字丢失
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '9fbe5da1501b4972fc667dbdef7a74ec69675fce':
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
4 years ago
Hugh.C
9fbe5da150
REPORT-33863 html图片变成了图片后文字的背景图;html图片宽度大于实际盒子宽度时,图片后的文字丢失
4 years ago
Hugh.C
d2fa409323
Pull request #481 : REPORT-32796 h1-h6标签,默认字体加粗不生效,字号也不对,默认margin值不生效
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'f8282f06ec28328ff1c63d6bf8ac16258259db2a':
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
4 years ago
Hugh.C
f8282f06ec
REPORT-32796 h1-h6标签,默认字体加粗不生效,默认margin值不生效
4 years ago
Hugh.C
5addbc5859
Pull request #480 : REPORT-32986 html大写标签不生效
...
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '342e21e446739524173f1619c3f15264217e06fe':
REPORT-32986 html大写标签不生效
4 years ago
Hugh.C
342e21e446
REPORT-32986 html大写标签不生效
4 years ago
Lucian.Chen
c895bad2a0
Pull request #479 : 无jira任务,Final合bugfix
...
Merge in CORE/base-third from final/10.0 to bugfix/10.0
* commit '05517f718ab7fe3e10199399f2a27a8e9f45f01e': (59 commits)
REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
REPORT-33029 无插件PDF导出-HTML解析:块元素(如:div、p)支持align、text-align属性
无jira任务,编译失败
REPORT-33491 无插件PDF导出-HTML解析:支持<th>标签加粗样式
KERNEL-4410 集群定时任务,支持切换执行节点
无 jira 任务, bugfix -> release 解决冲突, 更新目录结构。
REPORT-33025 加点注解
REPORT-33025 无插件PDF导出-HTML解析:支持<a>标签超链
REPORT-32592 html 以<a>、<br> or <hr> 标签开头时,丢失line-height属性
REPORT-33028 review 改进
REPORT-33028 无插件PDF导出-HTML解析:块元素支持margin、padding 属性
REPORT-33032 无插件PDF导出-HTML解析:font-size 支持单位 %,text-decoration 支持line-through值
REPORT-33027 无插件PDF导出-HTML解析:支持<s> 、<strike>、<del>标签
DEC-13555 迁移到oracle定时调度执行报错
无JIRA任务 删除资源模块
REPORT-28764 third包新增资源模块
...
4 years ago
Kara
36b18aebbc
Pull request #478 : 无jira任务 发布 final-persist
...
Merge in CORE/base-third from ~ABBY/base-third:final/10.0 to persist/10.0
* commit '77fcbd61607584212dba19cd6695189a814e3488': (42 commits)
REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
REPORT-33029 无插件PDF导出-HTML解析:块元素(如:div、p)支持align、text-align属性
无jira任务,编译失败
REPORT-33491 无插件PDF导出-HTML解析:支持<th>标签加粗样式
KERNEL-4410 集群定时任务,支持切换执行节点
无 jira 任务, bugfix -> release 解决冲突, 更新目录结构。
REPORT-33025 加点注解
REPORT-33025 无插件PDF导出-HTML解析:支持<a>标签超链
REPORT-32592 html 以<a>、<br> or <hr> 标签开头时,丢失line-height属性
REPORT-33028 review 改进
REPORT-33028 无插件PDF导出-HTML解析:块元素支持margin、padding 属性
REPORT-33032 无插件PDF导出-HTML解析:font-size 支持单位 %,text-decoration 支持line-through值
REPORT-33027 无插件PDF导出-HTML解析:支持<s> 、<strike>、<del>标签
DEC-13555 迁移到oracle定时调度执行报错
无JIRA任务 删除资源模块
REPORT-28764 third包新增资源模块
...
4 years ago
abby
77fcbd6160
final-persist解决冲突
4 years ago
Kara
05517f718a
Pull request #476 : 无jira任务 发布 release-final
...
Merge in CORE/base-third from ~ABBY/base-third:release/10.0 to final/10.0
* commit '9327ecb32a67764df6cba7356b070918d647b784': (42 commits)
REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
REPORT-33029 无插件PDF导出-HTML解析:块元素(如:div、p)支持align、text-align属性
无jira任务,编译失败
REPORT-33491 无插件PDF导出-HTML解析:支持<th>标签加粗样式
KERNEL-4410 集群定时任务,支持切换执行节点
无 jira 任务, bugfix -> release 解决冲突, 更新目录结构。
REPORT-33025 加点注解
REPORT-33025 无插件PDF导出-HTML解析:支持<a>标签超链
REPORT-32592 html 以<a>、<br> or <hr> 标签开头时,丢失line-height属性
REPORT-33028 review 改进
REPORT-33028 无插件PDF导出-HTML解析:块元素支持margin、padding 属性
REPORT-33032 无插件PDF导出-HTML解析:font-size 支持单位 %,text-decoration 支持line-through值
REPORT-33027 无插件PDF导出-HTML解析:支持<s> 、<strike>、<del>标签
DEC-13555 迁移到oracle定时调度执行报错
无JIRA任务 删除资源模块
REPORT-28764 third包新增资源模块
...
4 years ago
Hugh.C
9327ecb32a
Pull request #475 : REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '4ce376fd5aea0d964d57ecd7effd40a2653e6666':
REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
4 years ago
Hugh.C
4ce376fd5a
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
4 years ago
Hugh.C
dca9933bfe
REPORT-33908 HTML高度计算异常(br标签中的line-height属性应该生效)
4 years ago
ju.ju
2c80f006e3
Pull request #474 : REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '65bf0880d34c416257cd49a4b1bf2be209d3ba83':
REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
4 years ago
Hugh.C
65bf0880d3
REPORT-33908 HTML高度计算异常(br、hr 标签中的line-height属性不应该生效)
4 years ago
Hugh.C
2834df65cd
Pull request #473 : REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '9af2eff20f661c86a2db9ccf417b1b5789dbfc2a':
REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
4 years ago
Hugh.C
9af2eff20f
REPORT-33819? a标签设置text-decoration,前台没有下划线但是导出有
4 years ago
Hugh.C
d10ffdc352
Pull request #472 : REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '9c1af33023d080ffa7c0135674af924bded32642':
REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
4 years ago
Hugh.C
9c1af33023
REPORT-33780 font-weight等属性与<b>等标签之间的优先级存在问题
4 years ago
Hugh.C
16205f58aa
Pull request #470 : REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '559a1e3a587b7cc51fe512bf008d92d96e0d3afc':
REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
4 years ago
Hugh.C
559a1e3a58
REPORT-33691 tr\td\th设置单元格对齐方式,预览生效,导出不生效
4 years ago
Hugh.C
6f3959afd8
Pull request #467 : REPORT-33491 REPORT-33029 无插件PDF导出-HTML解析:支持<th>标签加粗样式 ; 块元素(如:div、p)支持align、text-align属性
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'd213b85dd5558559fdba23d55b3c56dcac54cf32':
REPORT-33029 无插件PDF导出-HTML解析:块元素(如:div、p)支持align、text-align属性
REPORT-33491 无插件PDF导出-HTML解析:支持<th>标签加粗样式
5 years ago
Hugh.C
d213b85dd5
REPORT-33029 无插件PDF导出-HTML解析:块元素(如:div、p)支持align、text-align属性
5 years ago
zed
827a712957
Pull request #468 : 无jira任务,编译失败
...
Merge in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit 'd66aac146ff713066362a360df94738c77867354':
无jira任务,编译失败
5 years ago
zed
d66aac146f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
zed
0bcaa00710
无jira任务,编译失败
5 years ago
zed
a0a888230c
Pull request #466 : KERNEL-4410 集群定时任务,支持切换执行节点
...
Merge in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit '137133d895fd71e2f9465d06c796b474017c1b0a':
KERNEL-4410 集群定时任务,支持切换执行节点
5 years ago
Hugh.C
308b807c79
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
5 years ago
Hugh.C
ed07433555
REPORT-33491 无插件PDF导出-HTML解析:支持<th>标签加粗样式
5 years ago
zed
137133d895
KERNEL-4410 集群定时任务,支持切换执行节点
5 years ago
Harrison
26cf39def4
Pull request #465 : REPORT-31492word导出中Html无法解析小于号
...
Merge in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit 'aae332b0fa5e530d02e2bacfbaab688aeaab36fd':
无 jira 任务, bugfix -> release 解决冲突, 更新目录结构。
REPORT-31492 word导出中Html无法解析小于号(漏提)
REPORT-31492 word导出中Html无法解析小于号
5 years ago
Harrison
aae332b0fa
无 jira 任务, bugfix -> release 解决冲突, 更新目录结构。
5 years ago
Harrison
137f6be183
Merge branch 'bugfix/10.0' of http://code.fineres.com/scm/~harrison/base-third into release/10.0
...
# Conflicts:
# fine-itext-old/src/com/fr/third/com/lowagie/text/html/simpleparser/HTMLWorker.java
# fine-itext-old/src/com/fr/third/com/lowagie/text/xml/simpleparser/SimpleXMLParser.java
5 years ago
ju.ju
3b0ca68d87
Pull request #463 : REPORT-33025 无插件PDF导出-HTML解析:支持<a>标签超链
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '8bbe7fceb667ea7b524b296f412b7e39bbf42150':
REPORT-33025 加点注解
REPORT-33025 无插件PDF导出-HTML解析:支持<a>标签超链
5 years ago
Hugh.C
8bbe7fceb6
REPORT-33025 加点注解
5 years ago
Hugh.C
1556abaf25
REPORT-33025 无插件PDF导出-HTML解析:支持<a>标签超链
5 years ago