Harrison
|
2581cb327a
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/base-third into feature/10.0
Conflicts:
build.third_step0.gradle
|
5 years ago |
Kara
|
aa4e8307b8
|
Merge pull request #280 in CORE/base-third from final/10.0 to persist/10.0
* commit 'b12840df3695728b264f9f9b4e6ce73efa69efa5':
REPORT-20433 html片段导出table表格被压缩
|
5 years ago |
eason
|
31a01d3a70
|
Merge pull request #279 in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit '36b0a3169fb6eb26cd694ca3ec24f3c27fd87efc':
CHART-10607 linux下缺失了系统供应商信息的文件会导致栈溢出
|
5 years ago |
白岳
|
36b0a3169f
|
CHART-10607 linux下缺失了系统供应商信息的文件会导致栈溢出
|
5 years ago |
Kara
|
b12840df36
|
Merge pull request #278 in CORE/base-third from release/10.0 to final/10.0
* commit 'd6f6537c35d7267e41ebbb109640bc778b112530':
REPORT-20433 html片段导出table表格被压缩
|
5 years ago |
andrew asa
|
cf5d362679
|
Merge pull request #276 in CORE/base-third from ~ANDREW ASA/base-third:feature/10.0 to feature/10.0
* commit '05381282b8663a548bf5ba2044a02a47f65762da':
KERNEL-1226 去掉core 里面的objenesis,需要依赖到1.7
|
5 years ago |
neil
|
a795f17278
|
Merge pull request #275 in CORE/base-third from ~HUGH.C/base-third:feature/10.0 to feature/10.0
* commit '33ec2b51c4e783618d8e3b5cef1e9a7db24eaf45':
REPORT-20981 删除自己写的多余类
无JIRA任务、jgit gc 需要googlecode、之前没有打包它
|
5 years ago |
andrew.asa
|
05381282b8
|
KERNEL-1226 去掉core 里面的objenesis,需要依赖到1.7
|
5 years ago |
Hugh.C
|
33ec2b51c4
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into feature/10.0
|
5 years ago |
andrew asa
|
a28a01abcb
|
Merge pull request #273 in CORE/base-third from ~ANDREW ASA/base-third:feature/10.0 to feature/10.0
* commit '012ac2708ae94099a07bb7ca6a697afaf64f54e0':
KERNEL-1226 去掉core 里面的objenesis,third包里面已经有 & 升级到支持jdk11
|
5 years ago |
Hugh.C
|
665622b93f
|
REPORT-20981 删除自己写的多余类
|
5 years ago |
Hugh.C
|
6083c1a0ac
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into feature/10.0
|
5 years ago |
Hugh.C
|
a7a77e35c7
|
无JIRA任务、jgit gc 需要googlecode、之前没有打包它
|
5 years ago |
andrew.asa
|
012ac2708a
|
KERNEL-1226 去掉core 里面的objenesis,third包里面已经有 & 升级到支持jdk11
|
5 years ago |
andrew asa
|
2d26201d2f
|
Merge pull request #272 in CORE/base-third from ~ANDREW ASA/base-third:feature/10.0 to feature/10.0
* commit '52b3945886e196f5f8278f8fb1cf26c807118bf3':
REPORT-18730 objenesis内部会根据类名缓存class,插件禁用和卸载后会产生同名class,导致swift初始化对象不匹配,换一下key
|
5 years ago |
andrew.asa
|
52b3945886
|
REPORT-18730 objenesis内部会根据类名缓存class,插件禁用和卸载后会产生同名class,导致swift初始化对象不匹配,换一下key
|
5 years ago |
Harrison
|
d6f6537c35
|
Merge pull request #270 in CORE/base-third from bugfix/10.0 to release/10.0
* commit '0b3a3efd7bc16cc9c4ef5c3206833ebdd80d0141':
REPORT-20433 html片段导出table表格被压缩
DEC-8889 jackson高危漏洞
KERNER-724 j2v8升级
DEC-8173 脏数据导致quartz启动失败
DEC-7569 定时调度模块启动异常
无JIRA任务 打包失败,job未初始化
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
无 jira 任务, final --> persist 回复一下
无 jira 任务, final --> persist 少了一个空行
无 jira 任务, 解决打包冲突 还是有问题, 删掉 gradle
无 jira 任务, 解决打包冲突
升级apache工具类
build.third_step0.gradle edited online with Bitbucket
|
5 years ago |
Kara
|
9451116a3b
|
Merge pull request #269 in CORE/base-third from final/10.0 to persist/10.0
* commit '49e3d226f913d90efe9ea3cdd417da2f40dfb6df':
REPORT-20372 CVE-2017-5644 fix
CUSTBUG-43276 pdf导出后。html显示的图片被裁切了
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常
fix
fix
fix
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
DEC-8889 jackson高危漏洞
DEC-8889 jackson高危漏洞
RoaringBitmap单独抽到third
|
5 years ago |
Harrison
|
0b3a3efd7b
|
Merge pull request #268 in CORE/base-third from final/10.0 to bugfix/10.0
* commit '49e3d226f913d90efe9ea3cdd417da2f40dfb6df':
REPORT-20372 CVE-2017-5644 fix
DEC-8889 jackson高危漏洞
DEC-8889 jackson高危漏洞
RoaringBitmap单独抽到third
KERNER-724 j2v8升级
DEC-8173 脏数据导致quartz启动失败
DEC-7569 定时调度模块启动异常
无JIRA任务 打包失败,job未初始化
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
DEC-7376 定时调度任务表中存在脏数据的时候,不能影响整个scheduler
无 jira 任务, final --> persist 回复一下
无 jira 任务, final --> persist 少了一个空行
无 jira 任务, 解决打包冲突 还是有问题, 删掉 gradle
无 jira 任务, 解决打包冲突
升级apache工具类
build.third_step0.gradle edited online with Bitbucket
|
5 years ago |
Kara
|
49e3d226f9
|
Merge pull request #267 in CORE/base-third from release/10.0 to final/10.0
* commit '86cc8011608dccfc033fc02874f8d9005b4510a1':
REPORT-20372 CVE-2017-5644 fix
CUSTBUG-43276 pdf导出后。html显示的图片被裁切了
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常
fix
fix
fix
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
DEC-8889 jackson高危漏洞
RoaringBitmap单独抽到third
|
5 years ago |
neil
|
eb85664c46
|
Merge pull request #264 in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '6e08998ee75b57c6c0b4250d66d5efa3e2144278':
REPORT-20433 html片段导出table表格被压缩
|
5 years ago |
Hugh.C
|
6e08998ee7
|
Merge branch 'bugfix/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into bugfix/10.0
|
5 years ago |
Hugh.C
|
37ea54e088
|
REPORT-20433 html片段导出table表格被压缩
|
5 years ago |
vito
|
86cc801160
|
Merge pull request #263 in CORE/base-third from ~VITO/base-third:release/10.0 to release/10.0
* commit '1e95220dd8d8d1b0d83bce15dc4a398479ef31b8':
REPORT-20372 CVE-2017-5644 fix
|
5 years ago |
vito
|
1e95220dd8
|
REPORT-20372 CVE-2017-5644 fix
|
5 years ago |
neil
|
368e35484c
|
Merge pull request #262 in CORE/base-third from bugfix/10.0 to release/10.0
* commit '3f0fad6a2a52717f87d47cc468f1ec39437e90cd':
CUSTBUG-43276 pdf导出后。html显示的图片被裁切了
|
5 years ago |
ju.ju
|
3f0fad6a2a
|
Merge pull request #261 in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '8571a7f6953fad344bf549481fd9fbee76ae271c':
CUSTBUG-43276 pdf导出后。html显示的图片被裁切了
|
5 years ago |
Hugh.C
|
8571a7f695
|
Merge branch 'bugfix/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/base-third into bugfix/10.0
|
5 years ago |
Hugh.C
|
5d860c477b
|
CUSTBUG-43276 pdf导出后。html显示的图片被裁切了
|
5 years ago |
Harrison
|
3cccc55882
|
Merge pull request #260 in CORE/base-third from release/10.0 to feature/10.0
* commit '13189f8726d97977f9912a912d7a03d25e9f99ae':
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常
fix
fix
fix
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
DEC-8889 jackson高危漏洞
|
5 years ago |
Harrison
|
13189f8726
|
Merge pull request #258 in CORE/base-third from bugfix/10.0 to release/10.0
* commit '08005033f0b7c6dc36034fdd8642ebbf3ff8123d':
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常,包名修改
REPORT-19507 滚动消息插件,效果不正常
fix
fix
fix
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
|
5 years ago |
Harrison
|
08005033f0
|
Merge pull request #259 in CORE/base-third from ~BRYANT/base-third:bugfix/10.0 to bugfix/10.0
* commit '6bd102f94b9e8013471592585e96ed52da868395':
REPORT-19507 滚动消息插件,效果不正常,包名修改
|
5 years ago |
Bryant
|
6bd102f94b
|
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
|
5 years ago |
Bryant
|
d1f961d83c
|
REPORT-19507
滚动消息插件,效果不正常,包名修改
|
5 years ago |
ju.ju
|
b0459405ac
|
Merge pull request #257 in CORE/base-third from ~BRYANT/base-third:bugfix/10.0 to bugfix/10.0
* commit '83d1735224f3ebc30dd6b4124064590c032389ce':
REPORT-19507 滚动消息插件,效果不正常,包名修改
|
5 years ago |
Bryant
|
83d1735224
|
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
|
5 years ago |
Bryant
|
dfe24c5504
|
REPORT-19507
滚动消息插件,效果不正常,包名修改
|
5 years ago |
ju.ju
|
5e02c3df0a
|
Merge pull request #256 in CORE/base-third from ~BRYANT/base-third:bugfix/10.0 to bugfix/10.0
* commit 'dd780c0f76e8aded48ebfecc7d60bfde497eab46':
REPORT-19507 滚动消息插件,效果不正常
|
5 years ago |
Bryant
|
dd780c0f76
|
REPORT-19507
滚动消息插件,效果不正常
|
5 years ago |
ju.ju
|
bde9b882bf
|
Merge pull request #255 in CORE/base-third from ~JU/base-third:bugfix/10.0 to bugfix/10.0
* commit 'f45884dac4ec223e73bafc44888ab523fc5cf4ae':
fix
fix
fix
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
|
5 years ago |
ju
|
f45884dac4
|
fix
|
5 years ago |
ju
|
31d6643c18
|
fix
|
5 years ago |
ju
|
359f674591
|
fix
|
5 years ago |
ju
|
19e62feefb
|
无JIRA任务 开一个default包,用于针对性的修改原来在3rd.jar中的class(有些太老了完整反编译老出错,也不知道定制了啥,就针对性的修改一个class)
|
5 years ago |
andrew.asa
|
a38d1d6dd1
|
Merge pull request #254 in CORE/base-third from ~ANDREW.ASA/base-third:feature/10.0 to feature/10.0
* commit '145bd139ed1f06c6b41838765df383e9d0f9a273':
KERNEL-753 增加对LDAP的支持,将Spring的LDAP模块编译到third中
|
5 years ago |
andrew.asa
|
145bd139ed
|
KERNEL-753 增加对LDAP的支持,将Spring的LDAP模块编译到third中
|
5 years ago |
Kara
|
70c5d25bd1
|
Merge pull request #253 in CORE/base-third from ~ZED/base-third:final/10.0 to final/10.0
* commit 'f21316e79488ee1c17fe59dad1d0ce76ba651746':
DEC-8889 jackson高危漏洞
|
5 years ago |
zed
|
f4f4f517e9
|
Merge pull request #251 in CORE/base-third from ~ZED/base-third:release/10.0 to release/10.0
* commit '1e321d06edb66a6ccbb631a2d31de92ef6e40ec8':
DEC-8889 jackson高危漏洞
|
5 years ago |
zed
|
7eae55638b
|
Merge pull request #252 in CORE/base-third from ~ZED/base-third:feature/10.0 to feature/10.0
* commit '812651a0e2c36083cfc24fea170209b70fc9a569':
DEC-8889 jackson高危漏洞
|
5 years ago |
zed
|
f21316e794
|
DEC-8889 jackson高危漏洞
|
5 years ago |