Kara
|
176d37d879
|
Merge pull request #406 in CORE/base-third from ~ABBY/base-third:final/10.0 to final/10.0
* commit '3e0194f589642e87b1b187c06fabe859f133c6ba': (77 commits)
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 外置数据库导入数据失败
REPORT-27588 jackson-databind安全漏洞
fix
DEC-12256 【冒烟】全新工程启动报错
...
|
5 years ago |
Abby
|
3e0194f589
|
Merge pull request #1 in ~ABBY/base-third from release/10.0 to final/10.0
* commit 'f32949cfc95c78190481d85c571f10a05f37ba4b': (77 commits)
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 外置数据库导入数据失败
REPORT-27588 jackson-databind安全漏洞
fix
DEC-12256 【冒烟】全新工程启动报错
...
|
5 years ago |
zhouping
|
7d0885cd3b
|
Merge pull request #405 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit 'a193f8a4cfa4173931b97d7d4d3e6bd745d57e23':
rt 尝试把jdk11的内容打到jdk8中
KERNEL-3436 base-third代码工程maven目录化
REPORT-28245 HTML解析,图片和文字在同一行时压线
REPORT-28589 html解析最后一行不应该全是空格
|
5 years ago |
zhouping
|
a193f8a4cf
|
rt 尝试把jdk11的内容打到jdk8中
|
5 years ago |
zhouping
|
460c0b2cc8
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into feature/10.0
|
5 years ago |
zhouping
|
54c85e0bc5
|
KERNEL-3436 base-third代码工程maven目录化
|
5 years ago |
zhouping
|
6593c99a5f
|
Merge pull request #3 in ~ZHOUPING/base-third from release/10.0 to feature/10.0
* commit 'f32949cfc95c78190481d85c571f10a05f37ba4b':
REPORT-28245 HTML解析,图片和文字在同一行时压线
REPORT-28589 html解析最后一行不应该全是空格
|
5 years ago |
Hugh.C
|
f32949cfc9
|
Merge pull request #404 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '8f0e3d1cb1b58904e8a1454f0680c6d0fe00138d':
REPORT-28245 HTML解析,图片和文字在同一行时压线
|
5 years ago |
Hugh.C
|
8f0e3d1cb1
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0
|
5 years ago |
Hugh.C
|
f94bea2004
|
REPORT-28245 HTML解析,图片和文字在同一行时压线
|
5 years ago |
Hugh.C
|
8e4541dd06
|
Merge pull request #402 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '5433c4a3668ae7d04c501bdf62e9774c7bd78f38':
REPORT-28589 html解析最后一行不应该全是空格
|
5 years ago |
Hugh.C
|
5433c4a366
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0
|
5 years ago |
Hugh.C
|
3babdf48a2
|
REPORT-28589 html解析最后一行不应该全是空格
|
5 years ago |
zhouping
|
7779091c37
|
Merge pull request #401 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit '26f1a72e04e35c52150bb2dc3b4967f0b1747100':
KERNEL-3436 修改打包脚本
KERNEL-3436 POM依赖
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文字与正常文本重叠
KERNEL-3436 移动包
REPORT-27582 设计器-日志没有生成压缩文件
|
5 years ago |
zhouping
|
26f1a72e04
|
KERNEL-3436 修改打包脚本
|
5 years ago |
zhouping
|
6cde418181
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into feature/10.0
|
5 years ago |
zhouping
|
e5d6710e1c
|
KERNEL-3436 POM依赖
|
5 years ago |
zhouping
|
3e69c79f54
|
Merge pull request #2 in ~ZHOUPING/base-third from release/10.0 to feature/10.0
* commit 'fbe656d1df259267c47b84c5ac813c8c32212793':
REPORT-27578 资源文件遗漏
CHART-12952 从third中移除ij相关的类
REPORT-28149 hibernate检测事务管理框架 类名未加com.fr.third前缀
REPORT-28245 review 改进
REPORT-28245 图片与文本在同一行时绘制高度和位置不对
REPORT-28245 <img>标签不属于块级元素
|
5 years ago |
zhouping
|
fbe656d1df
|
Merge pull request #400 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit '69e79c2b0bf19a839099604c01d0baf9cebcc6b7':
REPORT-27578 资源文件遗漏
|
5 years ago |
zhouping
|
69e79c2b0b
|
REPORT-27578 资源文件遗漏
|
5 years ago |
Bjorn
|
b1c8ac6e4b
|
Merge pull request #399 in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit '5f84fba06ce501680a2328fc5a7010a25e712b75':
CHART-12952 从third中移除ij相关的类
|
5 years ago |
白岳
|
5f84fba06c
|
CHART-12952 从third中移除ij相关的类
|
5 years ago |
ju.ju
|
f241fa8f27
|
Merge pull request #397 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '48c82fc848db6b9b76adcacf31b2610515be30cd':
REPORT-28245 review 改进
REPORT-28245 图片与文本在同一行时绘制高度和位置不对
REPORT-28245 <img>标签不属于块级元素
|
5 years ago |
Cloud.Liu
|
4b387823bb
|
Merge pull request #398 in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '4270e3bf8625ca9ad776939b2c1bd15f92874f7c':
REPORT-28149 hibernate检测事务管理框架 类名未加com.fr.third前缀
|
5 years ago |
Cloud.Liu
|
4270e3bf86
|
REPORT-28149 hibernate检测事务管理框架 类名未加com.fr.third前缀
|
5 years ago |
Hugh.C
|
48c82fc848
|
REPORT-28245 review 改进
|
5 years ago |
Hugh.C
|
d0dba87ddb
|
REPORT-28245 图片与文本在同一行时绘制高度和位置不对
|
5 years ago |
Hugh.C
|
11bd25cc54
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0
|
5 years ago |
Hugh.C
|
1b7727fb69
|
REPORT-28245 <img>标签不属于块级元素
|
5 years ago |
zhouping
|
69080f213f
|
Merge pull request #1 in ~ZHOUPING/base-third from release/10.0 to feature/10.0
* commit '354333dc5edebe30c0e9dbba0c6012b314f9a9e1':
MOBILE-25879 兼容移动端,加老quartz代码
REPORT-27640 调整兼容入参
REPORT-27948 改进
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27640 删除的内容做下老简道云插件的兼容
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27582 设计器-日志没有生成压缩文件
|
5 years ago |
zhouping
|
354333dc5e
|
Merge pull request #396 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit '05dc89676950e6c38935cd806aabebb718cca15c':
MOBILE-25879 兼容移动端,加老quartz代码
REPORT-27640 调整兼容入参
|
5 years ago |
zhouping
|
05dc896769
|
MOBILE-25879 兼容移动端,加老quartz代码
|
5 years ago |
zhouping
|
168bc9e78d
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into release/10.0
|
5 years ago |
zhouping
|
65d3f20e0f
|
REPORT-27640 调整兼容入参
|
5 years ago |
vito
|
360b32c13b
|
Merge pull request #394 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit 'a729047e40e027101c0afd94f37b9dbb9def5f62':
REPORT-27948 改进
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
|
5 years ago |
Hugh.C
|
a729047e40
|
REPORT-27948 改进
|
5 years ago |
zhouping
|
abacb8916f
|
Merge pull request #395 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit '914d9243df8ac8817427e02912ebf4c07c35ded6':
REPORT-27640 删除的内容做下老简道云插件的兼容
|
5 years ago |
Hugh.C
|
9b9b4400d2
|
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
|
5 years ago |
zhouping
|
914d9243df
|
REPORT-27640 删除的内容做下老简道云插件的兼容
|
5 years ago |
Hugh.C
|
55c918e434
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0
|
5 years ago |
Hugh.C
|
28b47137d4
|
REPORT-27948 上标标签sup,导出PDF文字与正常文本重叠
|
5 years ago |
zhouping
|
dccaac14b9
|
KERNEL-3436 移动包
|
5 years ago |
ju.ju
|
636718e704
|
Merge pull request #393 in CORE/base-third from ~JINBOKAI/base-third:release/10.0 to release/10.0
* commit '109c9a7862ad0465aa934172311cc61d1a87f1ad':
REPORT-27582 设计器-日志没有生成压缩文件
|
5 years ago |
bokai
|
109c9a7862
|
REPORT-27582 设计器-日志没有生成压缩文件
|
5 years ago |
zhouping
|
300e90a77c
|
Merge pull request #392 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit '412afe4a8a9fcc501f7786265b60d5a42c64ea09':
REPORT-27578 【10.0回归】模版导出svg 0kb
DEC-12348 外置数据库导入数据失败
REPORT-27588 jackson-databind安全漏洞
fix
DEC-12256 【冒烟】全新工程启动报错
|
5 years ago |
zhouping
|
412afe4a8a
|
Merge pull request #1 in ~ZHOUPING/base-third from release/10.0 to feature/10.0
* commit '55827b4375a15d972f25dced1e216ac6f53c93d5':
REPORT-27578 【10.0回归】模版导出svg 0kb
DEC-12348 外置数据库导入数据失败
REPORT-27588 jackson-databind安全漏洞
fix
DEC-12256 【冒烟】全新工程启动报错
|
5 years ago |
zhouping
|
55827b4375
|
Merge pull request #391 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'f068030caf86c87e4b6a4c359c9a347920562ab0':
REPORT-27578 【10.0回归】模版导出svg 0kb
|
5 years ago |
zhouping
|
f068030caf
|
REPORT-27578 【10.0回归】模版导出svg 0kb
|
5 years ago |
zed
|
c44b7807b5
|
Merge pull request #389 in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit '4e831051b9b005a3bc94069b22f678d371ba6843':
DEC-12348 外置数据库导入数据失败
|
5 years ago |
zed
|
1476ee75b8
|
Merge pull request #390 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0
* commit '94b841b9117c30394f07979ed8d04ad15729562c':
DEC-12348 外置数据库导入数据失败
|
5 years ago |