vito
|
8479f93578
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit 'd2e810b1b44e65cfdfdd074ce2fc48ce67e67d80':
REPORT-20981 取消按钮不要了
REPORT-20981 模板版本管理减少磁盘占用
REPORT-20981 模板版本管理减少磁盘占用
REPORT-21689 REPORT-20981 水印密度增加个最小值限制,密度设置不能小于100/50;模板版本管理减少磁盘占用
|
5 years ago |
Hugh.C
|
d2e810b1b4
|
Merge pull request #1091 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0
* commit 'a8c1d63c359b0aa575ea4f6802e22783f5fae9cc':
REPORT-20981 取消按钮不要了
REPORT-20981 模板版本管理减少磁盘占用
REPORT-20981 模板版本管理减少磁盘占用
REPORT-21689 REPORT-20981 水印密度增加个最小值限制,密度设置不能小于100/50;模板版本管理减少磁盘占用
|
5 years ago |
vito
|
3c363f339c
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '2f34a914fafbe7a4eb6db58133cb9c08447f2390':
无jira任务,sonar问题修复
REPORT-20329 sonar问题修复
无jira任务,sonar问题修复
sonar问题修复,无jira任务
REPORT-20981 去掉import *
REPORT-20981 模板版本管理减少磁盘占用
REPORT-20328 sonar问题修复
无JIRA任务 sonar问题修复
REPORT-20327 sonar问题修复
无JIRA任务 sonar问题修复
CHART-10225 表单设计器 图表渲染
无JIRA任务,sonar问题修复
sonar修复
REPORT-20323 sonar问题修复
CHART-10465 暂时注释掉新的数据结构
REPORT-20318 sonar问题修复
CHART-10465 框架图数据结构配置兼容
无JIRA任务 feature版本还是走vanchart逻辑
ChartComponent用ChartProvider.toIamge接口渲染图表 && CHART-9062 删除activeGlyph相关代码
|
5 years ago |
Hugh.C
|
a8c1d63c35
|
REPORT-20981 取消按钮不要了
|
5 years ago |
Bryant
|
2f34a914fa
|
Merge pull request #1086 in DESIGN/design from ~BRYANT/design:feature/10.0 to feature/10.0
* commit '7f519a344713ad9175a37511d8c6958a7d40b78b':
无JIRA任务 sonar问题修复
|
5 years ago |
Hugh.C
|
abafae544c
|
REPORT-20981 模板版本管理减少磁盘占用
|
5 years ago |
Hugh.C
|
2312a7d05f
|
REPORT-20981 模板版本管理减少磁盘占用
|
5 years ago |
Hugh.C
|
67e2846e79
|
REPORT-21689 REPORT-20981 水印密度增加个最小值限制,密度设置不能小于100/50;模板版本管理减少磁盘占用
|
5 years ago |
kerry
|
ece325042e
|
Merge pull request #1084 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'afdd96c1a36094e1b073695def74b287ffa79e69':
REPORT-20327 sonar问题修复
|
5 years ago |
Hugh.C
|
43de526ad5
|
Merge pull request #1087 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0
* commit '0b4c7d51fd699c65b76a5a54da5222dd40dc3852':
REPORT-20329 sonar问题修复
REPORT-20981 去掉import *
REPORT-20981 模板版本管理减少磁盘占用
|
5 years ago |
zheng
|
5c445be3d1
|
Merge pull request #1082 in DESIGN/design from ~ZHENG/c-design:compatibleVan to feature/10.0
* commit 'd0867aaef1d78232ee8ee4181cbeb5afe5308afd':
CHART-10225 表单设计器 图表渲染
|
5 years ago |
pengda
|
05b9f0cf9f
|
Merge pull request #1088 in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '2bc163116e4ee8f2a4bb69837718f190e22c853a':
sonar问题修复,无jira任务
|
5 years ago |
Bruce.Deng
|
c0023c1798
|
Merge pull request #1089 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit 'fd4471bd17395b417c1f28c00ba79170a27e594c':
无jira任务,sonar问题修复
无jira任务,sonar问题修复
|
5 years ago |
Jinbokai
|
6fdf5a2f03
|
Merge pull request #1085 in DESIGN/design from ~JINBOKAI/design:feature/10.0 to feature/10.0
* commit '400f588c357e82cd78921dc73d201556cbed8c00':
REPORT-20328 sonar问题修复
|
5 years ago |
Bruce.Deng
|
fd4471bd17
|
无jira任务,sonar问题修复
|
5 years ago |
Hugh.C
|
0b4c7d51fd
|
REPORT-20329 sonar问题修复
|
5 years ago |
Bruce.Deng
|
2f5faf6542
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
Bruce.Deng
|
2c27f88fef
|
无jira任务,sonar问题修复
|
5 years ago |
pengda
|
2bc163116e
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
pengda
|
7a8281c1a9
|
sonar问题修复,无jira任务
|
5 years ago |
Hugh.C
|
fc6b965de5
|
REPORT-20981 去掉import *
|
5 years ago |
Hugh.C
|
08e59519d8
|
REPORT-20981 模板版本管理减少磁盘占用
|
5 years ago |
Bryant
|
7f519a3447
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
jinbokai
|
400f588c35
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
jinbokai
|
7ddfbdaa44
|
REPORT-20328 sonar问题修复
|
5 years ago |
Bryant
|
0533f537a5
|
无JIRA任务 sonar问题修复
|
5 years ago |
Lanlan
|
2763eab3a6
|
Merge pull request #1083 in DESIGN/design from ~LANLAN/design:feature/10.0 to feature/10.0
* commit 'e6b0dd55eabd7003598b520d7a23455c84e82733':
无JIRA任务 sonar问题修复
|
5 years ago |
kerry
|
afdd96c1a3
|
REPORT-20327 sonar问题修复
|
5 years ago |
Lanlan
|
e6b0dd55ea
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~lanlan/design into feature/10.0
|
5 years ago |
Lanlan
|
1bb196feb5
|
无JIRA任务 sonar问题修复
|
5 years ago |
zheng
|
d0867aaef1
|
CHART-10225 表单设计器 图表渲染
|
5 years ago |
Lucian.Chen
|
c2327e38a6
|
Merge pull request #1080 in DESIGN/design from ~LUCIAN.CHEN/design:feature/10.0 to feature/10.0
* commit '8798fe8da4ec7a2d4c8b82fb774e35165f5aed23':
无JIRA任务,sonar问题修复
|
5 years ago |
author
|
8798fe8da4
|
无JIRA任务,sonar问题修复
|
5 years ago |
Alex.Sung
|
e2e1f779fc
|
REPORT-20553 sonar问题修复
* commit '99c44609847307d845e7b688c2f5ec667e24da47':
sonar修复
|
5 years ago |
Maksim
|
fb58c3fb55
|
Merge pull request #1074 in DESIGN/design from ~MAKSIM/design:feature/10.0 to feature/10.0
* commit '7ea83ebbe914f427fd7c02d82e6feaf3a2bbe89d':
REPORT-20323 sonar问题修复
|
5 years ago |
alex.sung
|
99c4460984
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
alex.sung
|
f6e3985d92
|
sonar修复
|
5 years ago |
Maksim
|
7ea83ebbe9
|
REPORT-20323 sonar问题修复
|
5 years ago |
zheng
|
2b1f8b5167
|
Merge pull request #1073 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'ec74b4f9548c3f081d6cc32363e1903f716b5309':
CHART-10465 暂时注释掉新的数据结构
|
5 years ago |
白岳
|
ec74b4f954
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into feature/10.0
|
5 years ago |
白岳
|
4bc8bf542a
|
CHART-10465 暂时注释掉新的数据结构
|
5 years ago |
zack
|
5c3f971dcf
|
Merge pull request #1072 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'b4c5815834a60a239690f6e4a9ee2a645078be22':
REPORT-20318 sonar问题修复
|
5 years ago |
Bjorn
|
6d8d8b5654
|
Merge pull request #1071 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '183f227096600b2de2db777a249dc76c2d6a8545':
CHART-10465 框架图数据结构配置兼容
|
5 years ago |
zack
|
b4c5815834
|
REPORT-20318 sonar问题修复
|
5 years ago |
白岳
|
183f227096
|
CHART-10465 框架图数据结构配置兼容
|
5 years ago |
zheng
|
28c2cd08d8
|
Merge pull request #1068 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '83dba9cc54638d0e4ff4a1201f20901a368a9183':
无JIRA任务 feature版本还是走vanchart逻辑
|
5 years ago |
zheng
|
83dba9cc54
|
无JIRA任务 feature版本还是走vanchart逻辑
|
5 years ago |
zheng
|
9b69a5dd87
|
Merge pull request #1067 in DESIGN/design from ~ZHENG/c-design:refactorChartComponent to feature/10.0
* commit '6ac2d498d2bc4cbc8c4a4793c655b80977a963bf':
ChartComponent用ChartProvider.toIamge接口渲染图表 && CHART-9062 删除activeGlyph相关代码
|
5 years ago |
zheng
|
6ac2d498d2
|
ChartComponent用ChartProvider.toIamge接口渲染图表 && CHART-9062 删除activeGlyph相关代码
|
5 years ago |
vito
|
c72bcbad55
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/design/design into feature/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java
|
5 years ago |