Kara
|
98295293d0
|
Merge pull request #662 in DESIGN/design from ~QINGHUI.LIU/design:10.0 to 10.0
* commit '2202ea1564806b2a992cf33c6734480575c64b4f':
CHART-3472 还原CHART-3252的master分支
|
6 years ago |
qinghuiliu
|
2202ea1564
|
CHART-3472 还原CHART-3252的master分支
|
6 years ago |
Kara
|
53d8c2282a
|
Merge pull request #646 in DESIGN/design from ~NEIL/design:10.0 to 10.0
* commit 'a8c0718ca3257b8a8cee4f7b2b66fc92eeae2314':
REPORT-12924 排查闪退, 先打印报错, 类似finedb锁了是不需要闪退的.
|
6 years ago |
Kara
|
1a6f50240a
|
Merge pull request #645 in DESIGN/design from ~ZACK/design:10.0 to 10.0
* commit 'b0b89fb5f634e0e22d26a01416c172acb8b5e429':
REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失.同步master
|
6 years ago |
neil
|
a8c0718ca3
|
REPORT-12924 排查闪退, 先打印报错, 类似finedb锁了是不需要闪退的.
|
6 years ago |
zack
|
b0b89fb5f6
|
Merge branch '10.0' of http://cloud.finedevelop.com:2015/scm/~zack/design
|
6 years ago |
zack
|
22cd3c95e4
|
REPORT-13215 10.0设计器启动过程中可能由于报错导致白色蒙层不消失.同步master
|
6 years ago |
neil
|
cc15db45ce
|
Merge pull request #639 in DESIGN/design from ~NEIL/design:10.0 to 10.0
* commit '53fe5fc1773a0ac20a682341a91428869c9a9b69':
REPORT-12635
无JIRA任务 删除过时的接口
REPORT-11623 IOFile移动到报表中
CHART-3252 更换单元格数据布局方式和边框大小
REPORT-12852 10.0模板短信事件在mac下的提示弹框有问题
REPORT-12710
REPORT-12885 设计器鸣谢名单SiteCenter修改不生效
REPORT-12865 文件控件,ie11下图标显示不出来了
CHART-3413 优化改法
CHART-3413 词云-系列 类型转换错误
rt
REPORT-9679 去除国际化影响,后续feature合进来之后统一定义成常量
|
6 years ago |
neil
|
53fe5fc177
|
Merge pull request #7 in ~NEIL/design from release/10.0 to 10.0
* commit 'e9a5a2d793b2a8c88d417dd9a0e11f1dc3d8e447':
REPORT-12635
无JIRA任务 删除过时的接口
REPORT-11623 IOFile移动到报表中
CHART-3252 更换单元格数据布局方式和边框大小
REPORT-12852 10.0模板短信事件在mac下的提示弹框有问题
REPORT-12710
REPORT-12885 设计器鸣谢名单SiteCenter修改不生效
REPORT-12865 文件控件,ie11下图标显示不出来了
CHART-3413 优化改法
CHART-3413 词云-系列 类型转换错误
rt
REPORT-9679 去除国际化影响,后续feature合进来之后统一定义成常量
|
6 years ago |
Mata.Li
|
e9a5a2d793
|
Merge pull request #635 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '75d5efe8ae804540e6e7e1303a6aca2faf864bb7':
REPORT-12635
|
6 years ago |
Mata.Li
|
75d5efe8ae
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
13dabcebc7
|
REPORT-12635
|
6 years ago |
Qinghui.Liu
|
adfca6c286
|
Merge pull request #630 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '09d865f0130f3627c01aed4fcbe2c45d4aab7692':
CHART-3252 更换单元格数据布局方式和边框大小
CHART-3413 优化改法
CHART-3413 词云-系列 类型转换错误
|
6 years ago |
richie
|
bd15cff094
|
Merge pull request #634 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '2327914ea15bbca4b6fdb36e468776edb8159f3e':
无JIRA任务 删除过时的接口
REPORT-11623 IOFile移动到报表中
|
6 years ago |
richie
|
2327914ea1
|
无JIRA任务 删除过时的接口
|
6 years ago |
richie
|
92990bce98
|
REPORT-11623 IOFile移动到报表中
|
6 years ago |
yaoh.wu
|
f2b2bf6123
|
Merge pull request #629 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'b7a1711422b5db2a3e64226f0b418fabb71fd945':
REPORT-12852 10.0模板短信事件在mac下的提示弹框有问题
|
6 years ago |
qinghuiliu
|
09d865f013
|
CHART-3252 更换单元格数据布局方式和边框大小
|
6 years ago |
yaoh.wu
|
b7a1711422
|
REPORT-12852 10.0模板短信事件在mac下的提示弹框有问题
|
6 years ago |
Mata.Li
|
a590928c22
|
Merge pull request #627 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'de653417ab662b0d6863ccd2666b245e6c7e6c66':
REPORT-12710
|
6 years ago |
Mata.Li
|
de653417ab
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
55a372ec03
|
REPORT-12710
|
6 years ago |
neil
|
2c9d4c80c8
|
Merge pull request #623 in DESIGN/design from ~NEIL/design:10.0 to 10.0
* commit '673fa11ca699145c2668b484733d5c937f4b3b94':
REPORT-12928 设计器finedb锁住, 可能是多线程加载问题.
|
6 years ago |
neil
|
673fa11ca6
|
REPORT-12928 设计器finedb锁住, 可能是多线程加载问题.
|
6 years ago |
zack
|
584b79b9ef
|
Merge pull request #619 in DESIGN/design from ~ZACK/design:release/10.0 to release/10.0
* commit '3340efa251188cf404bd83bd1e6d0d828c087ca2':
REPORT-12865 文件控件,ie11下图标显示不出来了
rt
REPORT-9679 去除国际化影响,后续feature合进来之后统一定义成常量
|
6 years ago |
vito
|
096dad0cab
|
Merge pull request #620 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '58107d6830699490ba8bcfb3897166fa0a515276':
REPORT-12885 设计器鸣谢名单SiteCenter修改不生效
|
6 years ago |
vito
|
58107d6830
|
REPORT-12885 设计器鸣谢名单SiteCenter修改不生效
|
6 years ago |
zack
|
3340efa251
|
REPORT-12865 文件控件,ie11下图标显示不出来了
|
6 years ago |
Wim.Zhai
|
38a89c5f15
|
Merge pull request #616 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
* commit '7000fbb3c60bec1aa2f6baa2116014655c3b873b':
CHART-3399 dialog.pack()说要写在子组件里
|
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 |
qinghuiliu
|
f218ecb7d3
|
CHART-3413 优化改法
|
6 years ago |
qinghuiliu
|
567a6f69fa
|
CHART-3413 词云-系列 类型转换错误
|
6 years ago |
zack
|
75f8d27167
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit 'e2fffcd812aedc5e978b0a5b2b23051791a07dd5':
单元格设置面板的预览单元格那个checkbox的值没有正确的被set到CellGUIAttr,导致值没有被write到模板。
改命名
更换数组
CHART-3206 & CHART-3374 9to10
删除多余内容
兼容所有版本的坐标轴刻度
无JIRA任务 代码耦合
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12721 HistoryTemplateListPane插件兼容
REPORT-12697 mac在jni在部分系统下报签名失败
REPORT-12161 & REPORT-10599
|
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 |