vito
|
c8149fecfb
|
无jira任务 设置一个指定目录方式用于调试
|
5 years ago |
Wim.Zhai
|
4e6bf8becd
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '34951296336cf60b2e156bc19dbe3fa0e034405f':
无jira任务,sonar问题修复
无jira任务,sonar问题修复
|
5 years ago |
Wim.Zhai
|
9218230e79
|
CHART-10961 线型样式面板迭代 加组件&事件
|
5 years ago |
Lucian
|
b6306175c6
|
无JIRA任务,sonar问题修复
|
5 years ago |
Hugh.C
|
7ea70d0a8f
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design into feature/10.0
|
5 years ago |
Hugh.C
|
5b772ce849
|
REPORT-20329 sonar问题修复
|
5 years ago |
jinbokai
|
95ba244443
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
# Conflicts:
# designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java
|
5 years ago |
jinbokai
|
1236223619
|
REPORT-20328 sonar问题修复
|
5 years ago |
Bruce.Deng
|
3495129633
|
Merge pull request #1270 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '07e47c3a6cee3ae513717211c5a638c8a459a48d':
无jira任务,sonar问题修复
无jira任务,sonar问题修复
|
5 years ago |
Bruce.Deng
|
07e47c3a6c
|
无jira任务,sonar问题修复
|
5 years ago |
Wim.Zhai
|
720b9a7eba
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
vito
|
f3b00ab268
|
Merge pull request #1273 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'ee6768d929124dc29f25c219159382a19dba38e4':
REPORT-22595【10.0.4设计器】开发者鸣谢,放到启动图左侧下方
|
5 years ago |
zack
|
e5d27ba365
|
Merge pull request #1268 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit '3d84de17da0b7a21808568ab046198925d70738a':
REPORT-20318 sonar问题修复
|
5 years ago |
Wim.Zhai
|
310ff924e1
|
CHART-4248 refactor:分类-值仪表盘的数据面板
|
5 years ago |
Kara
|
6898d9a424
|
Merge pull request #1272 in DESIGN/design from ~VITO/c-design:final/10.0 to final/10.0
* commit 'e820e2a456d1c50ad04d9e07309141d3bd86e9fb':
REPORT-22595【10.0.4设计器】开发者鸣谢,放到启动图左侧下方
|
5 years ago |
vito
|
ee6768d929
|
REPORT-22595【10.0.4设计器】开发者鸣谢,放到启动图左侧下方
|
5 years ago |
vito
|
e820e2a456
|
REPORT-22595【10.0.4设计器】开发者鸣谢,放到启动图左侧下方
|
5 years ago |
Wim.Zhai
|
f3de98da44
|
Merge pull request #1269 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '47be036bd639601d8a6299e3b653b65056566a0d':
CHART-4248 refactor 多层饼图数据面板补系列名字段
|
5 years ago |
Hades
|
2a859c6334
|
Merge pull request #1271 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'c68dc8671749787e0ea12a90291e4c0bf1d9a5b7':
fix
REPORT-23246 设计器设置纸张颜色然后合并单元格的颜色会变白色
|
5 years ago |
hades
|
c68dc86717
|
fix
|
5 years ago |
hades
|
e0eb45ed53
|
REPORT-23246 设计器设置纸张颜色然后合并单元格的颜色会变白色
|
5 years ago |
Bruce.Deng
|
9dba941e91
|
无jira任务,sonar问题修复
|
5 years ago |
Wim.Zhai
|
47be036bd6
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
Wim.Zhai
|
e01bd63bdf
|
CHART-4248 refactor 多层饼图数据面板补系列名字段
|
5 years ago |
zack
|
3d84de17da
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~zack/design
|
5 years ago |
zack
|
6de343d39d
|
REPORT-20318 sonar问题修复
|
5 years ago |
Hades
|
d1daf10359
|
Merge pull request #1267 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'b828a9a8a143c27341227b062b6fccd0e016f274':
REPORT-22964 系统参数说明无对应国际化键值
REPORT-22964 系统参数说明无对应国际化键值
|
5 years ago |
Hades
|
b828a9a8a1
|
Merge pull request #5 in ~HADES/design from ~JOE.JIANG/design:REPORT-22964 to release/10.0
* commit '035f9fd99f28e50966749db787b12f5b0f77e9b8':
REPORT-22964 系统参数说明无对应国际化键值
REPORT-22964 系统参数说明无对应国际化键值
|
5 years ago |
richie
|
ef835eb3b9
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
richie
|
49a9e32172
|
无JIRA任务 第三方短信服务器接口
|
5 years ago |
Hades
|
b36f2f4f0c
|
Merge pull request #1266 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '5a78cd4b6f99b8ff30ad89d09444d2094f53b0df':
REPORT-23647 sonar问题修复
|
5 years ago |
zack
|
38949938fb
|
Merge pull request #1265 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '0f1d7aa907bbe1b49dda183b3af90eed6e5e906a':
rt
REPORT-22634 19fdc_决策报表增加预览方式接口
|
5 years ago |
Hades
|
5a78cd4b6f
|
Merge pull request #8 in ~HADES/design from ~JOE.JIANG/design:REPORT-23647 to feature/10.0
* commit '0b6c239eff1fc37e786e5fa494fac13f7fbdaf24':
REPORT-23647 sonar问题修复
|
5 years ago |
zack
|
0f1d7aa907
|
rt
|
5 years ago |
zack
|
ae444f7eed
|
REPORT-22634 19fdc_决策报表增加预览方式接口
|
5 years ago |
Hades
|
fc28305a38
|
Merge pull request #1263 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '820fcc273072d7f72348d7e73fe9284934691322':
fix
REPORT-23246 设计器UI 插入斜线显示不全
|
5 years ago |
Wim.Zhai
|
401a11649c
|
Merge pull request #1264 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '457c6e5e52b200e41898a9d698d6a86a054d227c':
CHART-11151 fix 范围图例面板
|
5 years ago |
Wim.Zhai
|
457c6e5e52
|
CHART-11151 fix 范围图例面板
|
5 years ago |
hades
|
820fcc2730
|
fix
|
5 years ago |
hades
|
d8f9977467
|
REPORT-23246 设计器UI 插入斜线显示不全
|
5 years ago |
neil
|
e4e4eef72c
|
Merge pull request #1262 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0
* commit '94d186b494cef06ddbc53c84986daf5105c8b7df':
无jira任务, 合代码冲突漏删
|
5 years ago |
neil
|
94d186b494
|
无jira任务, 合代码冲突漏删
|
5 years ago |
neil
|
2bd3085d4c
|
Merge pull request #1261 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0
* commit '11b33b9e10a6816cff0d9c43ed24ee2a009d964e': (95 commits)
.
.
.
ct
ct
ct
.
release/10.0
ct
REPORT-19946 Linux设计器
REPORT-19946 Linux设计器
REPORT-23486 修复bug以及更改文件夹
REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空
REPORT-23570 修改国际化名字
REPORT-23570 模版版本管理,gc为负数时应当提示“无可优化文件”
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
...
|
5 years ago |
neil
|
11b33b9e10
|
.
|
5 years ago |
neil
|
5cdc874789
|
.
|
5 years ago |
neil
|
911d8be9df
|
.
|
5 years ago |
neil
|
b37a17db94
|
Merge pull request #22 in ~NEIL/design from release/10.0 to feature/10.0
* commit 'ec7b6606ddf97181fb85d0192cfe802d956369c1': (92 commits)
ct
ct
ct
.
release/10.0
ct
REPORT-19946 Linux设计器
REPORT-19946 Linux设计器
REPORT-23486 修复bug以及更改文件夹
REPORT-23115 远程设计权限配置-版本不匹配时用户角色列表都为空
REPORT-23570 修改国际化名字
REPORT-23570 模版版本管理,gc为负数时应当提示“无可优化文件”
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
REPORT-23486 修复bug以及更改文件夹
...
|
5 years ago |
neil
|
ec7b6606dd
|
ct
|
5 years ago |
neil
|
b3e41463d6
|
ct
|
5 years ago |
neil
|
3c0e846d7f
|
ct
|
5 years ago |