 zed
|
7fb8fd82bc
|
DEC-12256 【冒烟】全新工程启动报错
|
5 years ago |
|
zed
|
1b0f322d29
|
fix
|
5 years ago |
|
zed
|
17fe45e9f2
|
DEC-12256 【冒烟】全新工程启动报错
|
5 years ago |
Kara
|
55b6cec719
|
Merge pull request #383 in CORE/base-third from ~ABBY/base-third:persist/10.0 to persist/10.0
* commit 'e5910a4f6fe92030a93589ea832297238e0df9b2':
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-25774 使用和报表一样的方法进行计算字符宽度
REPORT-25774 提升权限，供外部调用
|
5 years ago |
 abby
|
e5910a4f6f
|
解决冲突
|
5 years ago |
ju.ju
|
21cb37d4e9
|
Merge pull request #382 in CORE/base-third from release/10.0 to feature/10.0
* commit 'ecfd40e0badbf1be52010aa6593d480ad8d7649b':
无jira任务 打包遗漏resources
|
5 years ago |
 Elijah
|
ecfd40e0ba
|
Merge pull request #381 in CORE/base-third from ~ELIJAH/base-third:release/10.0 to release/10.0
* commit '6db771c94436e01e61d783a34454eaa6b5279c42':
无jira任务 打包遗漏resources
|
5 years ago |
Elijah
|
6db771c944
|
无jira任务 打包遗漏resources
|
5 years ago |
 Harrison
|
b1675bcf87
|
Merge pull request #380 in CORE/base-third from release/10.0 to feature/10.0
* commit 'a15a3dadb10e048a54c6db25c464c12d1cfe4f97':
REPORT-25774 使用和报表一样的方法进行计算字符宽度
REPORT-25774 提升权限，供外部调用
|
5 years ago |
 zhouping
|
a15a3dadb1
|
Merge pull request #379 in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'b3a1cdb301794d75ccfe3976f263dc13883dc32f': (56 commits)
CHART-12731 资源文件遗漏
无JIRA任务 build failed
无JIRA任务 build failed
DEC-12143 & REPORT-27040 & REPORT-27055 & REPORT-26964 升级httpclient的版本
REPORT-27037 alphafine快捷键不生效，无法使用
DEC-12126 javax.el改为依赖jar JDK11版本
DEC-11977 JNA资源文件路径修改
DEC-12126 javax.el改为依赖jar
DEC-11975 【冒烟】jdk1.7适配测试，测试邮箱发送失败
无jira任务 third包修改
无jira任务 third包修改
无jira任务 third包修改
KERNEL-1298 打包
KERNEL-1298 调试
KERNEL-1298 调试
KERNEL-1298 调试
KERNEL-1298 FineThird支持JDK11
KERNEL-1298 FineThird支持JDK11
KERNEL-1298 build failed
KERNEL-1298 FineThird支持JDK11
...
|
5 years ago |
zhouping
|
b3a1cdb301
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zhouping/base-third into release/10.0
|
5 years ago |
|
zhouping
|
4efd881379
|
Merge pull request #377 in CORE/base-third from ~ZHOUPING/base-third:feature/10.0 to feature/10.0
* commit 'cdeabee58a1c611b3ef42b5b966ece16e18fb502': (59 commits)
CHART-12731 资源文件遗漏
无JIRA任务 build failed
无JIRA任务 build failed
DEC-12143 & REPORT-27040 & REPORT-27055 & REPORT-26964 升级httpclient的版本
REPORT-27037 alphafine快捷键不生效，无法使用
DEC-12126 javax.el改为依赖jar JDK11版本
DEC-11977 JNA资源文件路径修改
DEC-12126 javax.el改为依赖jar
DEC-11975 【冒烟】jdk1.7适配测试，测试邮箱发送失败
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
无jira任务 third包修改
无jira任务 third包修改
无jira任务 third包修改
KERNEL-1298 打包
KERNEL-1298 调试
KERNEL-1298 调试
KERNEL-1298 调试
KERNEL-1298 FineThird支持JDK11
KERNEL-1298 FineThird支持JDK11
...
|
5 years ago |
|
zhouping
|
cdeabee58a
|
Merge pull request #376 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit '14bfafca72652eb4eed2bff70479779ac40218a1':
CHART-12731 资源文件遗漏
|
5 years ago |
|
zhouping
|
14bfafca72
|
CHART-12731 资源文件遗漏
|
5 years ago |
 Cloud.Liu
|
e7929b669f
|
Merge pull request #375 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit 'e1aafe8c9440c95d181da2c91fe6193e6463e02b':
无JIRA任务 build failed
|
5 years ago |
|
zhouping
|
e1aafe8c94
|
无JIRA任务 build failed
|
5 years ago |
|
zhouping
|
340191e392
|
Merge pull request #374 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit 'f0dab164ebf469cc8ea8c896b6db84aacb4d602d':
无JIRA任务 build failed
|
5 years ago |
|
zhouping
|
f0dab164eb
|
Merge branch 'research/10.0' of ssh://code.fineres.com:7999/~zhouping/base-third into research/10.0
|
5 years ago |
|
zhouping
|
11c8c7c08a
|
无JIRA任务 build failed
|
5 years ago |
|
zhouping
|
4a8ea5d8e6
|
Merge pull request #373 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit '1b227993889944376208044eb50610b66945b6f9':
DEC-12143 & REPORT-27040 & REPORT-27055 & REPORT-26964 升级httpclient的版本
|
5 years ago |
|
zhouping
|
1b22799388
|
DEC-12143 & REPORT-27040 & REPORT-27055 & REPORT-26964 升级httpclient的版本
|
5 years ago |
|
Kara
|
a38b1fbe54
|
Merge pull request #372 in CORE/base-third from ~ABBY/base-third:final/10.0 to final/10.0
* commit 'aab5a32e60c8a64f6a87c7470ad041e7a8917bf7':
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-25774 使用和报表一样的方法进行计算字符宽度
REPORT-25774 提升权限，供外部调用
|
5 years ago |
|
Abby
|
aab5a32e60
|
Merge pull request #2 in ~ABBY/base-third from release/10.0 to final/10.0
* commit 'de69574ee158f801acad527e8dcc0b8104b5c5b0':
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-25774 使用和报表一样的方法进行计算字符宽度
REPORT-25774 提升权限，供外部调用
|
5 years ago |
|
zhouping
|
1ddec90177
|
Merge pull request #371 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit '94c85f7d3405a94db058f75fc53727902a501465':
REPORT-27037 alphafine快捷键不生效，无法使用
|
5 years ago |
|
zhouping
|
94c85f7d34
|
REPORT-27037 alphafine快捷键不生效，无法使用
|
5 years ago |
|
Cloud.Liu
|
1f5ff1db1c
|
Merge pull request #370 in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit 'a8037a2431ccc0f141f50ae3a91ab5f965eae1d3':
DEC-12126 javax.el改为依赖jar JDK11版本
|
5 years ago |
|
Cloud.Liu
|
a8037a2431
|
DEC-12126 javax.el改为依赖jar JDK11版本
|
5 years ago |
|
Cloud.Liu
|
2678b5cbe0
|
Merge pull request #369 in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '8c2332011d3049fb42ecdd6d59a296a886d654b3':
DEC-11977 JNA资源文件路径修改
|
5 years ago |
|
Cloud.Liu
|
8c2332011d
|
DEC-11977 JNA资源文件路径修改
|
5 years ago |
|
Cloud.Liu
|
bdcd4e0b26
|
Merge pull request #368 in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit 'e8fbfd3c5a9a3ca09f49a4db71d921ed0e9650ff':
DEC-12126 javax.el改为依赖jar
|
5 years ago |
|
Cloud.Liu
|
e8fbfd3c5a
|
DEC-12126 javax.el改为依赖jar
|
5 years ago |
|
Harrison
|
de69574ee1
|
Merge pull request #367 in CORE/base-third from ~HARRISON/base-third:release/10.0 to release/10.0
* commit 'b3653294952d5bc0b26c3f1125f3c3e7ee2f3c88':
REPORT-25774 使用和报表一样的方法进行计算字符宽度
REPORT-25774 提升权限，供外部调用
|
5 years ago |
|
Harrison
|
b365329495
|
Merge branch 'bugfix/10.0' of https://code.fineres.com/scm/~harrison/base-third into release/10.0
Conflicts:
fine-itext/src/com/fr/third/v2/lowagie/text/pdf/PdfFont.java
|
5 years ago |
|
zhouping
|
71adfdef2f
|
Merge pull request #365 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit '7c4e9304668bfb1fb395286e273bae127e00b44c':
DEC-11975 【冒烟】jdk1.7适配测试，测试邮箱发送失败
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-25504 <table> 标签中的内容不按照列宽进行换行，行高逻辑错误
REPORT-25477 HTML解析color 错误（16进制有一些写错了）
REPORT-25253 Html无法解析小于号
REPORT-24915 REPORT-24809 PDF导出粗体字体过粗;html显示 数据导出pdf没有加粗
“REPORT-23134 调用doURLPrint打印\n会被转化成空格 by Bruce.Deng
无 jira 任务， 处理分支信息。
无 jira 任务，release 合并 final ， 解决冲突
REPORT-23453 html切割时，丢失<br> 标签
无JIRA任务 打包
代码质量
无JIRA任务 inux下缺失了系统供应商信息的文件会导致栈溢出
无 jira 任务，BUGFIX 恢复分支信息
|
5 years ago |
|
zhouping
|
7c4e930466
|
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zhouping/base-third into research/10.0
# Conflicts:
# build.third_step1.gradle
# build.third_step2.gradle
# build.third_step3.gradle
# build.third_step4.gradle
# build.third_step5.gradle
# build.third_step6.gradle
# fine-third-default/src/com/fr/third/javax/xml/stream/XMLEntityReaderImpl.java
|
5 years ago |
|
zhouping
|
769d5c353b
|
DEC-11975 【冒烟】jdk1.7适配测试，测试邮箱发送失败
|
5 years ago |
|
ju.ju
|
917c17c9a1
|
Merge pull request #364 in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0
* commit '7255663d3b2d93d62c9482e7eda7555c11358bec':
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
|
5 years ago |
Hugh.C
|
7255663d3b
|
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
|
5 years ago |
|
Hugh.C
|
d44872dca6
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into release/10.0
|
5 years ago |
|
Hugh.C
|
e68d073599
|
REPORT-14598 pdf HTML导出换行与浏览器不一致问题
|
5 years ago |
daniel
|
9ac682e669
|
Merge pull request #363 in CORE/base-third from ~BRYANT/base-third:research/10.0 to research/10.0
* commit 'fede27559e856ebd0e73a676d7959f61469506f0':
无jira任务 third包修改
|
5 years ago |
Bryant
|
fede27559e
|
Merge remote-tracking branch 'origin/research/10.0' into research/10.0
|
5 years ago |
|
Bryant
|
11ddba8026
|
无jira任务 third包修改
|
5 years ago |
|
zhouping
|
2909054e4c
|
Merge pull request #362 in CORE/base-third from ~BRYANT/base-third:research/10.0 to research/10.0
* commit '367d89e5b9acbfae6a60fd67642a50eb29a8c6c0':
无jira任务 third包修改
无jira任务 third包修改
|
5 years ago |
|
Bryant
|
367d89e5b9
|
无jira任务 third包修改
|
5 years ago |
|
Bryant
|
1086e27bd9
|
无jira任务 third包修改
|
5 years ago |
|
Kara
|
1f54cd8760
|
Merge pull request #361 in CORE/base-third from ~ABBY/base-third:persist/10.0 to persist/10.0
* commit 'a8e56e2d60157537bd3309dc808b876486e3d308':
REPORT-25504 <table> 标签中的内容不按照列宽进行换行，行高逻辑错误
REPORT-25477 HTML解析color 错误（16进制有一些写错了）
REPORT-25253 Html无法解析小于号
REPORT-24915 REPORT-24809 PDF导出粗体字体过粗;html显示 数据导出pdf没有加粗
“REPORT-23134 调用doURLPrint打印\n会被转化成空格 by Bruce.Deng
|
5 years ago |
|
Abby
|
a8e56e2d60
|
Merge pull request #1 in ~ABBY/base-third from final/10.0 to persist/10.0
* commit '1085caf1b6b21527c0dd0b66d348e16544d327e1':
REPORT-25504 <table> 标签中的内容不按照列宽进行换行，行高逻辑错误
REPORT-25477 HTML解析color 错误（16进制有一些写错了）
REPORT-25253 Html无法解析小于号
REPORT-24915 REPORT-24809 PDF导出粗体字体过粗;html显示 数据导出pdf没有加粗
“REPORT-23134 调用doURLPrint打印\n会被转化成空格 by Bruce.Deng
|
5 years ago |
|
zhouping
|
20beb772a3
|
Merge pull request #360 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0
* commit '2ee2cca6aaa2a4d049ef2bb8ceb9d13e8ed82de0':
KERNEL-1298 打包
|
5 years ago |
|
zhouping
|
2ee2cca6aa
|
KERNEL-1298 打包
|
5 years ago |
