4187310811
Pull request #687 : 无JIRA任务 release到final
...
Merge in CORE/base-third from release/10.0 to final/10.0
* commit '8dc3de0e4277e1060d3d7cc678edd6c01a7de211':
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
REPORT-34875 跨域CORS漏洞
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
4e1ba85033
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
131bd1bf32
DEC-14434 pref：添加quartz将触发器状态置为ERROR时的日志输出
4 years ago
Niko
8dc3de0e42
Pull request #674 : DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '1f5a857bec5762d0bb42c947f7d9e9256871ca04':
DEC-14382 修改方法名
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
4 years ago
1f5a857bec
DEC-14382 修改方法名
4 years ago
2ec46c0d2a
DEC-14382 修改相关sql以及逻辑优化BI定时任务延迟现象
4 years ago
40ca716c0d
Merge pull request #672 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '5e53287f9ac4a922325753c895db80dec8d8bedc':
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
5e53287f9a
Merge pull request #671 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '54ca67557eada8e7782b21ae118cfd6da54b0d80':
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
Cloud.Liu
54ca67557e
Pull request #668 : KERNEL-5056 WebSocket支持将用户名和token放在Header里
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '13fdb6f2ae5464d04c4b0014619fbd9164eb1f2c':
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
Cloud.Liu
13fdb6f2ae
无JIRA任务 WebSocket支持将用户名和token放在Header里 代码修改
4 years ago
Cloud.Liu
63007db3d5
无JIRA任务 WebSocket支持将用户名和token放在Header里
4 years ago
71a47915f9
Merge pull request #635 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'd6dc991aa6d495d59cb4c331286fc1b8e4490f5f':
REPORT-34875 跨域CORS漏洞
4 years ago
d6dc991aa6
Merge pull request #634 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '206a78c0f62d13f9c394a2bf5029f6cd806018c3':
REPORT-34875 跨域CORS漏洞
4 years ago
206a78c0f6
Merge pull request #631 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'f6795d1cf5bbf149a8cb731a4f9839882232c04c':
4 years ago
zhouping
b178f8905e
Pull request #626 : REPORT-34875 跨域CORS漏洞
...
Merge in CORE/base-third from ~ZHOUPING/base-third:release/10.0 to release/10.0
* commit 'ebad86bac8395eaee80c9d1e15ae9e26c69d562b':
REPORT-34875 跨域CORS漏洞
4 years ago
zhouping
ebad86bac8
REPORT-34875 跨域CORS漏洞
4 years ago
d9befd8c6b
Merge pull request #605 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'f6795d1cf5bbf149a8cb731a4f9839882232c04c':
4 years ago
f6795d1cf5
Merge pull request #604 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '7444cd74f90580ed4a00e33a52e7624a4fcc87b9':
4 years ago
7444cd74f9
Merge pull request #603 in CORE/base-third from final/10.0 to release/10.0
...
* commit '11eb85bfce5a8d34c6608ceba2e6d318169a580b':
4 years ago
11eb85bfce
Merge pull request #602 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '2a6623f48ee186e8bb2300a209cbfde46ee44971':
4 years ago
2a6623f48e
Merge pull request #601 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'cca6337af74188fdebac84651e46817ed088ed57':
4 years ago
e192b7332e
Merge pull request #559 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '43c53d5affda4f7bb1c31fa2c75e73bcaf69c898':
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
43c53d5aff
Merge pull request #558 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '2e87429bbb051f563952757831b644b6f8c266b3':
把bouncycastle1.64修改包名后升级原来的1.60
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
Niko
2e87429bbb
Pull request #555 : DEC-14305 删除1.60中剩余的但是在1.64中不存在的类
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '979f8a1daa4eb91c414a3492c1f2965621f5d4be':
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
979f8a1daa
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
572fe243de
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
Niko
c9ebe22f20
Pull request #541 : DEC-14305 把bouncycastle1.64修改包名后升级原来的1.60
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '4874fad61fdc6927a43aaacf09813ced1712b928':
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
2dc1fdaa95
Merge pull request #554 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '595ec0ab032de1347d4d89d9cfe4a6d596e617b3':
4 years ago
595ec0ab03
Merge pull request #553 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '0426b3a71078166f67fca6c2ae8a9dca3cd33bf2':
4 years ago
0426b3a710
Merge pull request #552 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'cca6337af74188fdebac84651e46817ed088ed57':
4 years ago
cca6337af7
Merge pull request #551 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '2a3f2705a02c58fa3e9dbf21ed8bdbcc61e70797':
4 years ago
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
209e81a796
Merge pull request #545 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '7186c8a71fad9d9d410b6bcbbcbba5955db9df6d':
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
7186c8a71f
Merge pull request #544 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '8250554bd15dcba32e4393d06bb5a6683184fd0c':
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
4874fad61f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
ae757f2bdc
把bouncycastle1.64修改包名后升级原来的1.60
4 years ago
Niko
8250554bd1
Pull request #535 : DEC-14302 删除没有改名的fine-bcprov-old库
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '0087ad7cb2e6400d313a2cf77c4aec8a8bdfe586':
删除gradle文件中和fine-bcprov-old相关的信息
删除没有改名的fine-bcprov-old库
4 years ago
0087ad7cb2
删除gradle文件中和fine-bcprov-old相关的信息
4 years ago
b1c23ed198
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
8017172d5c
删除没有改名的fine-bcprov-old库
4 years ago
f2fec63937
Merge pull request #530 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0d8b18c2c2013beb1d398af65507b8fde3cac854':
4 years ago
b053065bdc
Merge pull request #505 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':
4 years ago
0d8b18c2c2
Merge pull request #504 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':
4 years ago
4aa3a9082c
Merge pull request #503 in CORE/base-third from final/10.0 to release/10.0
...
* commit '9446dd28ebbde671fb5fdcbd91ef30aecc6c8f8b':
4 years ago
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
cf194b0809
Pull request #496 : 无jira任务，合代码出错
...
Merge in CORE/base-third from ~HUGH.C/base-third:feature/10.0 to feature/10.0
* commit 'a36c5ab62f31c3e3261cffd9143ca297060a2242':
无jira任务，合代码出错
4 years ago
a36c5ab62f
无jira任务，合代码出错
4 years ago
e533acbf09
Pull request #491 : 无jira任务， 解决 release/10.0 合 feature/10.0 冲突
...
Merge in CORE/base-third from ~HUGH.C/base-third:feature/10.0 to feature/10.0
* commit '6990e331db3f404af8ae381e675c9eec12dfb922': (50 commits)
无jira任务，persist合final
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图；html图片宽度大于实际盒子宽度时，图片后的文字丢失
REPORT-32796 h1-h6标签，默认字体加粗不生效，默认margin值不生效
REPORT-32986 html大写标签不生效
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 属性
...
4 years ago
6990e331db
无jira任务， 解决 release/10.0 合 feature/10.0 冲突
4 years ago
581000116f
Pull request #489 : 无jira任务， release/10.0 合 bugfix/10.0
...
Merge in CORE/base-third from release/10.0 to bugfix/10.0
* commit '3230c231fdcfe002e38aca8eb5543b9febedc69a':
无jira任务，persist合final
REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行
REPORT-33863 html图片变成了图片后文字的背景图；html图片宽度大于实际盒子宽度时，图片后的文字丢失
REPORT-32796 h1-h6标签，默认字体加粗不生效，默认margin值不生效
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
charile_Lu
Niko
superman
Cloud.Liu
zhouping
Hugh.C
ju.ju