zack
|
22cd3c95e4
|
REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失.同步master
|
6 years ago |
Wim.Zhai
|
48be862b06
|
Merge pull request #617 in DESIGN/design from ~WIM.ZHAI/xdesign:10.0 to 10.0
* commit '4e6b583ab19590c6795f5bb76cab368377e15a37':
CHART-3399 dialog.pack()说要写在子组件里
单元格设置面板的预览单元格那个checkbox的值没有正确的被set到CellGUIAttr,导致值没有被write到模板。
|
6 years ago |
Wim.Zhai
|
4e6b583ab1
|
Merge pull request #1 in ~WIM.ZHAI/xdesign from release/10.0 to 10.0
* commit '7000fbb3c60bec1aa2f6baa2116014655c3b873b':
CHART-3399 dialog.pack()说要写在子组件里
单元格设置面板的预览单元格那个checkbox的值没有正确的被set到CellGUIAttr,导致值没有被write到模板。
|
6 years ago |
Wim.Zhai
|
7000fbb3c6
|
CHART-3399 dialog.pack()说要写在子组件里
|
6 years ago |
Alex.Sung
|
e2fffcd812
|
Merge pull request #611 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-12593 10.0预览单元格内容复选框失效
* commit '795c9d1e0a04a574ab8eb7ec809f44ae236afccb':
单元格设置面板的预览单元格那个checkbox的值没有正确的被set到CellGUIAttr,导致值没有被write到模板。
|
6 years ago |
alex.sung
|
795c9d1e0a
|
单元格设置面板的预览单元格那个checkbox的值没有正确的被set到CellGUIAttr,导致值没有被write到模板。
|
6 years ago |
Qinghui.Liu
|
b12289a818
|
Merge pull request #606 in DESIGN/design from ~QINGHUI.LIU/design:10.0 to 10.0
* commit 'dd18fd728ab26b9af5b71275b5b55d78c0fc9e7f':
改命名
更换数组
CHART-3206 & CHART-3374 9to10
删除多余内容
兼容所有版本的坐标轴刻度
|
6 years ago |
Qinghui.Liu
|
dd18fd728a
|
Merge pull request #1 in ~QINGHUI.LIU/design from release/10.0 to 10.0
* commit '578e70adc60c6d23c6ea620adb18c5ba6d011838':
改命名
更换数组
CHART-3206 & CHART-3374 9to10
删除多余内容
兼容所有版本的坐标轴刻度
|
6 years ago |
Qinghui.Liu
|
578e70adc6
|
Merge pull request #603 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '2dba45028720e3ad57fc42b9e4900370134cd45a':
改命名
更换数组
删除多余内容
兼容所有版本的坐标轴刻度
|
6 years ago |
qinghuiliu
|
2dba450287
|
改命名
|
6 years ago |
qinghuiliu
|
8058d1142a
|
更换数组
|
6 years ago |
zheng
|
d7ef9009f0
|
Merge pull request #604 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit 'd6670650e54cbee6e6b2b3f523d20340b506037f':
CHART-3206 & CHART-3374 9to10
|
6 years ago |
Wim.Zhai
|
d6670650e5
|
CHART-3206 & CHART-3374 9to10
|
6 years ago |
qinghuiliu
|
081d76d68d
|
删除多余内容
|
6 years ago |
qinghuiliu
|
994d6b994f
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
qinghuiliu
|
f38df1c8b6
|
兼容所有版本的坐标轴刻度
|
6 years ago |
Wim.Zhai
|
8dd8806e0e
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit '5a3f3db913385d1a2c4ce1b8c51814c329717bbe':
无JIRA任务 代码耦合
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12697 mac在jni在部分系统下报签名失败
REPORT-12161 & REPORT-10599
无JIRA任务 websocket端口可以支持设置多个可选端口,让单机多节点集群可用
|
6 years ago |
neil
|
177011668d
|
Merge pull request #602 in DESIGN/design from ~NEIL/design:10.0 to 10.0
* commit '83a3a1401698e5cc3a2386f232863a9955255fb0':
无JIRA任务 代码耦合
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12697 mac在jni在部分系统下报签名失败
REPORT-12161 & REPORT-10599
无JIRA任务 websocket端口可以支持设置多个可选端口,让单机多节点集群可用
REPORT-12324 服务器》服务器数据集中新增数数据集预览后日志中出现报错
|
6 years ago |
neil
|
83a3a14016
|
Merge pull request #3 in ~NEIL/design from release/10.0 to 10.0
* commit '5a3f3db913385d1a2c4ce1b8c51814c329717bbe':
无JIRA任务 代码耦合
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12697 mac在jni在部分系统下报签名失败
REPORT-12161 & REPORT-10599
无JIRA任务 websocket端口可以支持设置多个可选端口,让单机多节点集群可用
REPORT-12324 服务器》服务器数据集中新增数数据集预览后日志中出现报错
|
6 years ago |
richie
|
5a3f3db913
|
Merge pull request #601 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '3c40011366f54e8e4844cab5e3f409fc90abc43a':
无JIRA任务 代码耦合
|
6 years ago |
richie
|
3c40011366
|
无JIRA任务 代码耦合
|
6 years ago |
neil
|
71e1eaf7cd
|
Merge pull request #599 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '8a9923d02a7e9d30111531b0b47027b706039536':
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12721 HistoryTemplateListPane插件兼容
|
6 years ago |
yaoh.wu
|
8a9923d02a
|
REPORT-12721 HistoryTemplateListPane插件兼容
|
6 years ago |
yaoh.wu
|
4c2586a6c2
|
REPORT-12721 HistoryTemplateListPane插件兼容
|
6 years ago |
vito
|
f5b65e0807
|
Merge pull request #597 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'c47226b9a82f2b61af918e0a386ee111821abf31':
REPORT-12697 mac在jni在部分系统下报签名失败
|
6 years ago |
vito
|
c47226b9a8
|
Merge branches 'release/10.0', 'release/10.0' and 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~vito/c-design into release/10.0
|
6 years ago |
vito
|
916fcba1a6
|
REPORT-12697 mac在jni在部分系统下报签名失败
|
6 years ago |
Mata.Li
|
e46a3d8e69
|
Merge pull request #596 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '3ed6d0f441f3f030026ad6582daa682679cb9d05':
REPORT-12161 & REPORT-10599
|
6 years ago |
Mata.Li
|
3ed6d0f441
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
5355d7dda4
|
REPORT-12161 & REPORT-10599
|
6 years ago |
richie
|
fc7a18ef9d
|
Merge pull request #594 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit 'f086badbf6a0d839f5cf141d80c724b044265ffb':
无JIRA任务 websocket端口可以支持设置多个可选端口,让单机多节点集群可用
|
6 years ago |
richie
|
f086badbf6
|
无JIRA任务 websocket端口可以支持设置多个可选端口,让单机多节点集群可用
|
6 years ago |
Wim.Zhai
|
631cc991ba
|
from git pull
|
6 years ago |
yaoh.wu
|
29cb7911d9
|
Merge pull request #585 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '6ba1286c96ff988303656aa3daa9d9eb8e7968dc':
REPORT-12324 服务器》服务器数据集中新增数数据集预览后日志中出现报错
|
6 years ago |
yaoh.wu
|
6ba1286c96
|
REPORT-12324 服务器》服务器数据集中新增数数据集预览后日志中出现报错
|
6 years ago |
Wim.Zhai
|
7ccf6fb3b9
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit '2ba4528a40a338c567d024f75b42e752e9feb6fb':
超级链接对话框打开设置优化 回退
REPORT-11831
update
CHART-3275 安装插件 图表类型不重启更新
REPORT-11831
ff
REPORT-11520 超级链接对话框打开设置优化
对话框打开超链支持标题和位置
无JIRA任务 findbugs问题
|
6 years ago |
neil
|
f6f6a6a016
|
Merge pull request #582 in DESIGN/design from ~NEIL/design:10.0 to 10.0
* commit '2c3c08724965f70b66ce47dd314b4d3715aae26c': (41 commits)
ct
冲突
超级链接对话框打开设置优化 回退
REPORT-11831
update
CHART-3275 安装插件 图表类型不重启更新
REPORT-11831
ff
REPORT-11520 超级链接对话框打开设置优化
对话框打开超链支持标题和位置
CHART-2665 & CHART-2886 堆积和坐标轴update返回一个新创建的conditionattr CHART-1882直接改报错即可 不用记住conditionattr
CHART-2665 & CHART-2886 堆积和坐标轴update返回一个新创建的conditionattr CHART-1882直接改报错即可 不用记住conditionattr
规范
REPORT-11886 远程设计目录树刷新卡顿
REPORT-11016 10.0版本mac上点击最大化会卡死
REPORT-11993 普通用户远程设计数据连接权限设置无效
无JIRA任务 findbugs问题
无JIRA任务 findbugs问题
REPORT-11880 SimilarSearchManeger拼错了....
change to protected method
...
|
6 years ago |
neil
|
2c3c087249
|
ct
|
6 years ago |
neil
|
2bb2d4e0c9
|
Merge pull request #4 in ~NEIL/design from release/10.0 to 10.0
* commit '1622209ed5178b22fcfed527398dde6096845d37': (40 commits)
冲突
超级链接对话框打开设置优化 回退
REPORT-11831
update
CHART-3275 安装插件 图表类型不重启更新
REPORT-11831
ff
REPORT-11520 超级链接对话框打开设置优化
对话框打开超链支持标题和位置
CHART-2665 & CHART-2886 堆积和坐标轴update返回一个新创建的conditionattr CHART-1882直接改报错即可 不用记住conditionattr
CHART-2665 & CHART-2886 堆积和坐标轴update返回一个新创建的conditionattr CHART-1882直接改报错即可 不用记住conditionattr
规范
REPORT-11886 远程设计目录树刷新卡顿
REPORT-11016 10.0版本mac上点击最大化会卡死
REPORT-11993 普通用户远程设计数据连接权限设置无效
无JIRA任务 findbugs问题
无JIRA任务 findbugs问题
REPORT-11880 SimilarSearchManeger拼错了....
change to protected method
CHART-3208 继承&创建含默认值“自动”的下拉选项
...
|
6 years ago |
neil
|
1622209ed5
|
冲突
|
6 years ago |
yaoh.wu
|
2ba4528a40
|
Merge pull request #580 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '2c4cc795e392c5c9adb2ea41443df6be441edf6c':
超级链接对话框打开设置优化 回退
|
6 years ago |
yaoh.wu
|
2c4cc795e3
|
超级链接对话框打开设置优化 回退
|
6 years ago |
neil
|
bbdaa21b51
|
Merge pull request #579 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'dcfdf0b200c029858c0fedfa19fabf9607b90cb2':
REPORT-11831
|
6 years ago |
Mata.Li
|
dcfdf0b200
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
5b6d88e90c
|
REPORT-11831
|
6 years ago |
Mata.Li
|
c130420c5b
|
Merge pull request #572 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '187b0240952d0a8230e96f550e79ad57de0ecd10':
REPORT-11831
无JIRA任务 findbugs问题
|
6 years ago |
zheng
|
4061e06f04
|
Merge pull request #573 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'ef1340db0e992817d33c35afe812089e561a41ce':
update
CHART-3275 安装插件 图表类型不重启更新
|
6 years ago |
zheng
|
ef1340db0e
|
update
|
6 years ago |
zheng
|
bf684d0795
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
zheng
|
8a00f5f321
|
CHART-3275 安装插件 图表类型不重启更新
|
6 years ago |