zed
5df00b7c92
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
zed
17e4170f97
KERNEL-3899 集群下定时调度任务支持特定节点运行定时任务
5 years ago
lidongy
26d393b73d
Pull request #432 : DEC-13199 socket序列化时区设置
...
Merge in CORE/base-third from ~LIDONGY/base-third:release/10.0 to release/10.0
* commit '89c2c8e7ed4ce21e25e9fab7eeebd833b9c82910':
111
DEC-13199 websocket序列化时区设置
5 years ago
lidongy
89c2c8e7ed
111
5 years ago
lidongy
77fd915ee1
DEC-13199 websocket序列化时区设置
5 years ago
Harrison
1785fc363e
Pull request #431 : 无 jira 任务, bugfix 合并 release
...
Merge in CORE/base-third from bugfix/10.0 to release/10.0
* commit 'f4d66414ae53802ea80752d2a940de0f68bcedb0':
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
5 years ago
Hugh.C
8fb526df35
Pull request #430 : REPORT-31053 PDF导出,<br>标签丢失
...
Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'f8adc802e3e9b1f755d09b913744571296173205':
REPORT-31053 PDF导出,<br>标签丢失
5 years ago
Hugh.C
f8adc802e3
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0
5 years ago
Hugh.C
17c98f54ce
REPORT-31053 PDF导出,<br>标签丢失
5 years ago
Hugh.C
cd683cb405
Merge pull request #428 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
...
* commit '6554afe92b2a73ea215074b4f8d6c04920492ee0':
REPORT-30379 test补充注释
REPORT-30379 在third中加一个 third(不在打包范围内,需要自己添加junit依赖才能跑)
REPORT-30379 bouncycastle存在安全问题,fine-itext、fine-itext-old 适配高版本
5 years ago
Hugh.C
6554afe92b
REPORT-30379 test补充注释
5 years ago
Hugh.C
6cd8151373
REPORT-30379 在third中加一个 third(不在打包范围内,需要自己添加junit依赖才能跑)
5 years ago
Hugh.C
72d6364e04
REPORT-30379 bouncycastle存在安全问题,fine-itext、fine-itext-old 适配高版本
5 years ago
Kara
cb01eacba0
Merge pull request #427 in CORE/base-third from ~ABBY/base-third:persist/10.0 to persist/10.0
...
* commit '56df67b0ff15eebff943d34fc994ec333d08a6d5':
REPORT-29490 安全漏洞by zack
REPORT-29784 third删减引起定时调度失败
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
DEC-12783 【迭代】迁移db2数据库后,多语言插件添加key失败
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
5 years ago
Abby
56df67b0ff
Merge pull request #1 in ~ABBY/base-third from final/10.0 to persist/10.0
...
* commit '26a882c24e6674f9c792e8b9316f53ba08fb5295':
REPORT-29490 安全漏洞by zack
REPORT-29784 third删减引起定时调度失败
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
DEC-12783 【迭代】迁移db2数据库后,多语言插件添加key失败
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
5 years ago
Bruce.Deng
f4d66414ae
Merge pull request #426 in CORE/base-third from ~BRUCE.DENG/base-third:bugfix/10.0 to bugfix/10.0
...
* commit '470ca7784dc80df5a2d23769ca8c0922ab1f001a':
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
5 years ago
Bruce.Deng
470ca7784d
REPORT-29182 & REPORT-29600 weblogic部署导出excel报错
5 years ago
Hugh.C
1919a818d6
Merge pull request #423 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
...
* commit '9679c6d97b6823ac9caa4ba11914a430e4b71c7b':
REPORT-27284 <table>标签导出pdf,含加粗字体时,边框颜色异常
5 years ago
Feng
4ccebbbfa9
Merge pull request #425 in CORE/base-third from ~FENG/base-third:release/10.0 to release/10.0
...
* commit 'a28e8da37d086d70aa98183a97f0e2c008b0d2d9':
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
Feng
a28e8da37d
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
Feng
4548a81355
KERNEL-3881 状态服务器+集群锁相关代码解耦,脱离依赖redis
5 years ago
Hugh.C
9679c6d97b
REPORT-27284 <table>标签导出pdf,含加粗字体时,边框颜色异常
5 years ago
Kara
26a882c24e
Merge pull request #422 in CORE/base-third from ~ABBY/base-third:final/10.0 to final/10.0
...
* commit '0e908f95140466ba382a47e60df282767bde1330':
REPORT-29490 安全漏洞by zack
REPORT-29784 third删减引起定时调度失败
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
DEC-12783 【迭代】迁移db2数据库后,多语言插件添加key失败
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
5 years ago
Abby
0e908f9514
Merge pull request #1 in ~ABBY/base-third from release/10.0 to final/10.0
...
* commit '31d59dc77fa16bf78abe2e80339a7be17c0c24ac':
REPORT-29490 安全漏洞by zack
REPORT-29784 third删减引起定时调度失败
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
DEC-12783 【迭代】迁移db2数据库后,多语言插件添加key失败
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
5 years ago
zhouping
31d59dc77f
Merge pull request #421 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
...
* commit '3f2a0354419260518fac13e1e99318b88d47db3e':
REPORT-29490 安全漏洞by zack
5 years ago
zhouping
3f2a035441
REPORT-29490 安全漏洞by zack
5 years ago
Cloud.Liu
9fd4bdeb1b
Merge pull request #420 in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
...
* commit '4a326534d91e9975084f8ab6647b3313e23e4167':
REPORT-29784 third删减引起定时调度失败
5 years ago
Cloud.Liu
4a326534d9
REPORT-29784 third删减引起定时调度失败
5 years ago
Hugh.C
73cae62203
Merge pull request #419 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
...
* commit '5a5eef56e05c7a86f25e0944b976351ddf0cc79e':
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
5 years ago
Hugh.C
5a5eef56e0
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0
5 years ago
Hugh.C
35dde4f353
REPORT-27284 table解析导出PDF后 单元格背景、边框与预览不一致
5 years ago
Harrison
df03ebc3d6
Merge pull request #418 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
...
* commit '340a9f16b73db447ac011c39092ccf7384447d5f':
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
REPORT-27588 jackson-databind安全漏洞
5 years ago
Harrison
340a9f16b7
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~harrison/base-third into release/10.0
...
# Conflicts:
# fine-deprecated-utils/src/edu/emory/mathcs/backport/java/util/Arrays.java
5 years ago
Lucian.Chen
a1051907c7
Merge pull request #416 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '0d7f40b474e886b80253b8eb9b4d7dbf07a72359': (84 commits)
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
REPORT-28245 HTML解析,图片和文字在同一行时压线
REPORT-28589 html解析最后一行不应该全是空格
REPORT-27578 资源文件遗漏
CHART-12952 从third中移除ij相关的类
REPORT-28149 hibernate检测事务管理框架 类名未加com.fr.third前缀
REPORT-28245 review 改进
REPORT-28245 图片与文本在同一行时绘制高度和位置不对
REPORT-28245 <img>标签不属于块级元素
MOBILE-25879 兼容移动端,加老quartz代码
REPORT-27640 调整兼容入参
REPORT-27948 改进
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27640 删除的内容做下老简道云插件的兼容
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27582 设计器-日志没有生成压缩文件
REPORT-27578 【10.0回归】模版导出svg 0kb
DEC-12348 外置数据库导入数据失败
...
5 years ago
zhouping
f54060a9c0
Merge pull request #415 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
...
* commit '59405ef6d8b8698a457bb5c9ac7e4c9bf5d9ee03':
无JIRA任务 pom优化
5 years ago
zhouping
59405ef6d8
无JIRA任务 pom优化
5 years ago
zed
48841fd724
Merge pull request #414 in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
...
* commit 'd693abd1a7aca3e112911855fecd9e2acf54e610':
DEC-12783 【迭代】迁移db2数据库后,多语言插件添加key失败
5 years ago
zed
d693abd1a7
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
5 years ago
zed
3f7d8a4f16
DEC-12783 【迭代】迁移db2数据库后,多语言插件添加key失败
5 years ago
Hugh.C
bb383f6a4e
Merge pull request #410 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
...
* commit 'f9abf02648b76d2d128860033685d9c4f7a033b5':
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
5 years ago
zhouping
f443c4c979
Merge pull request #412 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
...
* commit '75a2528004f1e80c427014508c6d645bdb93f66f':
rt 打包
暂时兼容旧版本新引擎插件
5 years ago
Kara
f5d0dfc53f
Merge pull request #413 in CORE/base-third from ~ABBY/base-third:persist/10.0 to persist/10.0
...
* commit '6e77dbded3fba956489dbbf47b1e1398fe90baca': (81 commits)
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
REPORT-28245 HTML解析,图片和文字在同一行时压线
REPORT-28589 html解析最后一行不应该全是空格
REPORT-27578 资源文件遗漏
CHART-12952 从third中移除ij相关的类
REPORT-28149 hibernate检测事务管理框架 类名未加com.fr.third前缀
REPORT-28245 review 改进
REPORT-28245 图片与文本在同一行时绘制高度和位置不对
REPORT-28245 <img>标签不属于块级元素
MOBILE-25879 兼容移动端,加老quartz代码
REPORT-27640 调整兼容入参
REPORT-27948 改进
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27640 删除的内容做下老简道云插件的兼容
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27582 设计器-日志没有生成压缩文件
REPORT-27578 【10.0回归】模版导出svg 0kb
DEC-12348 外置数据库导入数据失败
...
5 years ago
Abby
6e77dbded3
Merge pull request #1 in ~ABBY/base-third from final/10.0 to persist/10.0
...
* commit '0d7f40b474e886b80253b8eb9b4d7dbf07a72359': (81 commits)
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
REPORT-29126 导出pdf,字体加粗效果没有了
暂时兼容旧版本新引擎插件
REPORT-28245 HTML解析,图片和文字在同一行时压线
REPORT-28589 html解析最后一行不应该全是空格
REPORT-27578 资源文件遗漏
CHART-12952 从third中移除ij相关的类
REPORT-28149 hibernate检测事务管理框架 类名未加com.fr.third前缀
REPORT-28245 review 改进
REPORT-28245 图片与文本在同一行时绘制高度和位置不对
REPORT-28245 <img>标签不属于块级元素
MOBILE-25879 兼容移动端,加老quartz代码
REPORT-27640 调整兼容入参
REPORT-27948 改进
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27640 删除的内容做下老简道云插件的兼容
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27582 设计器-日志没有生成压缩文件
REPORT-27578 【10.0回归】模版导出svg 0kb
DEC-12348 外置数据库导入数据失败
...
5 years ago
zhouping
75a2528004
rt 打包
5 years ago
zhouping
84f3d5f4b0
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into feature/10.0
...
# Conflicts:
# build.third_step1-jdk11.gradle
# build.third_step1.gradle
5 years ago
Hugh.C
f9abf02648
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
5 years ago
Kara
0d7f40b474
Merge pull request #411 in CORE/base-third from ~HUGH.C/base-third:final/10.0 to final/10.0
...
* commit '133a8b5ff6376a0cb6e2cbca10dbef874fc1a5ab':
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
5 years ago
Hugh.C
133a8b5ff6
Merge branch 'final/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into final/10.0
5 years ago
Hugh.C
f08da31e9c
REPORT-29126 导出pdf,字体加粗效果没有了(漏提)
5 years ago
Kara
1beb65be18
Merge pull request #409 in CORE/base-third from ~HUGH.C/base-third:final/10.0 to final/10.0
...
* commit 'dd4dfd1e158892fd00d2cbdee98ec91aeb2fe3e3':
REPORT-29126 导出pdf,字体加粗效果没有了
5 years ago