fine-third

Commit Graph

Author	SHA1	Message	Date
superman	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
superman	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
charile_Lu	979f8a1daa	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
charile_Lu	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
superman	2dc1fdaa95	Merge pull request #554 in CORE/base-third from bugfix/10.0 to feature/10.0 * commit '595ec0ab032de1347d4d89d9cfe4a6d596e617b3':	4 years ago
superman	595ec0ab03	Merge pull request #553 in CORE/base-third from release/10.0 to bugfix/10.0 * commit '0426b3a71078166f67fca6c2ae8a9dca3cd33bf2':	4 years ago
superman	0426b3a710	Merge pull request #552 in CORE/base-third from final/10.0 to release/10.0 * commit 'cca6337af74188fdebac84651e46817ed088ed57':	4 years ago
superman	cca6337af7	Merge pull request #551 in CORE/base-third from persist/10.0 to final/10.0 * commit '2a3f2705a02c58fa3e9dbf21ed8bdbcc61e70797':	4 years ago
superman	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
superman	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
superman	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
charile_Lu	4874fad61f	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
charile_Lu	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
charile_Lu	0087ad7cb2	删除gradle文件中和fine-bcprov-old相关的信息	4 years ago
charile_Lu	b1c23ed198	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
charile_Lu	8017172d5c	删除没有改名的fine-bcprov-old库	4 years ago
superman	f2fec63937	Merge pull request #530 in CORE/base-third from bugfix/10.0 to feature/10.0 * commit '0d8b18c2c2013beb1d398af65507b8fde3cac854':	4 years ago
superman	b053065bdc	Merge pull request #505 in CORE/base-third from release/10.0 to feature/10.0 * commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':	4 years ago
superman	0d8b18c2c2	Merge pull request #504 in CORE/base-third from release/10.0 to bugfix/10.0 * commit '4aa3a9082c47dae3183dd7252666ec3dbfbc8643':	4 years ago
superman	4aa3a9082c	Merge pull request #503 in CORE/base-third from final/10.0 to release/10.0 * commit '9446dd28ebbde671fb5fdcbd91ef30aecc6c8f8b':	4 years ago
Kara	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
Hugh.C	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
Hugh.C	a36c5ab62f	无jira任务，合代码出错	4 years ago
Hugh.C	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
Hugh.C	6990e331db	无jira任务，解决 release/10.0 合 feature/10.0 冲突	4 years ago
ju.ju	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
ju.ju	3230c231fd	Pull request #488 : 无jira任务， final/10.0 合 release/10.0 Merge in CORE/base-third from final/10.0 to release/10.0 * commit '9a9390fc5c7c7eb2a8bdc92d4a969f1cf26f308a': 无jira任务，persist合final 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	9a9390fc5c	Pull request #487 : 无jira任务，persist合final Merge in CORE/base-third from ~LUCIAN.CHEN/base-third:final/10.0 to final/10.0 * commit 'c2391b8bf1cb9d87b5cb8b8b6e213b7c240da453': 无jira任务，persist合final 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
lucian	c2391b8bf1	无jira任务，persist合final	4 years ago
Hugh.C	fc9f34d537	Pull request #484 : REPORT-34320 块标签前紧跟着的块标签含文本且文本尾部不是空格时会多出空白行 Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0 * commit '8ad896e4e95e63af5aaec171424b809a7a939f78': REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行	4 years ago
Hugh.C	8ad896e4e9	Merge branch 'release/10.0' of https://code.fineres.com/scm/~hugh.c/base-third into release/10.0	4 years ago
Hugh.C	fb9a7ffede	REPORT-34320 块标签前的块标签含文本且文本尾部不是空格时会多出空白行	4 years ago
Lucian.Chen	671e2d43ed	Pull request #483 : 无jira任务，bugfix 合并 release Merge in CORE/base-third from bugfix/10.0 to release/10.0 * commit '5addbc58596742d3b3c9ef8fbbf1b322b40dee78': REPORT-32986 html大写标签不生效	4 years ago
Hugh.C	f81bae5a39	Pull request #482 : REPORT-33863 html图片宽度大于实际盒子宽度时，图片后的文字丢失 Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0 * commit '9fbe5da1501b4972fc667dbdef7a74ec69675fce': REPORT-33863 html图片变成了图片后文字的背景图；html图片宽度大于实际盒子宽度时，图片后的文字丢失	4 years ago
Hugh.C	9fbe5da150	REPORT-33863 html图片变成了图片后文字的背景图；html图片宽度大于实际盒子宽度时，图片后的文字丢失	4 years ago
Hugh.C	d2fa409323	Pull request #481 : REPORT-32796 h1-h6标签，默认字体加粗不生效，字号也不对，默认margin值不生效 Merge in CORE/base-third from ~HUGH.C/base-third:release/10.0 to release/10.0 * commit 'f8282f06ec28328ff1c63d6bf8ac16258259db2a': REPORT-32796 h1-h6标签，默认字体加粗不生效，默认margin值不生效	4 years ago
Hugh.C	f8282f06ec	REPORT-32796 h1-h6标签，默认字体加粗不生效，默认margin值不生效	4 years ago
Hugh.C	5addbc5859	Pull request #480 : REPORT-32986 html大写标签不生效 Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0 * commit '342e21e446739524173f1619c3f15264217e06fe': REPORT-32986 html大写标签不生效	4 years ago
Hugh.C	342e21e446	REPORT-32986 html大写标签不生效	4 years ago
Lucian.Chen	c895bad2a0	Pull request #479 : 无jira任务，Final合bugfix Merge in CORE/base-third from final/10.0 to bugfix/10.0 * commit '05517f718ab7fe3e10199399f2a27a8e9f45f01e': (59 commits) 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 属性 REPORT-33032 无插件PDF导出-HTML解析：font-size 支持单位 %，text-decoration 支持line-through值 REPORT-33027 无插件PDF导出-HTML解析：支持<s> 、<strike>、<del>标签 DEC-13555 迁移到oracle定时调度执行报错无JIRA任务删除资源模块 REPORT-28764 third包新增资源模块 ...	4 years ago
Kara	36b18aebbc	Pull request #478 : 无jira任务发布 final-persist Merge in CORE/base-third from ~ABBY/base-third:final/10.0 to persist/10.0 * commit '77fcbd61607584212dba19cd6695189a814e3488': (42 commits) 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 属性 REPORT-33032 无插件PDF导出-HTML解析：font-size 支持单位 %，text-decoration 支持line-through值 REPORT-33027 无插件PDF导出-HTML解析：支持<s> 、<strike>、<del>标签 DEC-13555 迁移到oracle定时调度执行报错无JIRA任务删除资源模块 REPORT-28764 third包新增资源模块 ...	4 years ago
abby	77fcbd6160	final-persist解决冲突	4 years ago
Hugh.C	5e7eb4cdac	Pull request #477 : REPORT-34112 HTML解析：table标签支持table-layout 中的fixed 布局 Merge in CORE/base-third from ~HUGH.C/base-third:feature/10.0 to feature/10.0 * commit '71ad6c59cf5b9756de8aa09354d04d0d15f297cd': REPORT-34112 review 改进 REPORT-34112 改进 REPORT-34112 去除无用字段 REPORT-34112 改进 REPORT-34112 HTML解析：table标签支持table-layout 中的fixed 布局	4 years ago
Hugh.C	71ad6c59cf	REPORT-34112 review 改进	4 years ago
Hugh.C	6e890ef1a7	REPORT-34112 改进	4 years ago
Hugh.C	9b86d9aefc	REPORT-34112 去除无用字段	4 years ago
Hugh.C	5adfbcee15	REPORT-34112 改进	4 years ago

1 2 3 4 5 ...

1112 Commits (e192b7332e6d0c4478c9e82e98052fe72112bb62) All Branches Search

1112 Commits (e192b7332e6d0c4478c9e82e98052fe72112bb62)

All Branches