neil
|
323b0402c5
|
冲突
|
6 years ago |
neil
|
ac6d19d81b
|
冲突
|
6 years ago |
neil
|
84228992a8
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/design-10 into release/10.0
|
6 years ago |
zack
|
ce69006aa1
|
Merge pull request #472 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'ba0ab2680a5d411fe37f32996e9c893da04a4ab1':
REPORT-11255 切换本地环境的时候自动启动内置服务器
|
6 years ago |
Qinghui.Liu
|
2804a4584d
|
修改数据面板
|
6 years ago |
zack
|
ba0ab2680a
|
REPORT-11255 切换本地环境的时候自动启动内置服务器
|
6 years ago |
ju
|
21b738222f
|
Merge pull request #471 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '8da56daee841b0c187999e3ac8cdbd4f6302973f':
无JIRA任务 设计器端口占用的时候卡主
|
6 years ago |
yaoh.wu
|
30bf0d0a9c
|
Merge pull request #469 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '5d8a420ca5d8ff2bab69688e9d3533124b3a5876':
无JIRA任务,单元测试还没写完,先注释
代码质量
REPORT-11268 关闭模板主动释放文件锁,分布式锁,代码质量
|
6 years ago |
ju
|
8da56daee8
|
无JIRA任务 设计器端口占用的时候卡主
|
6 years ago |
Wim.Zhai
|
e280eb06c5
|
Merge pull request #470 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
数据集数据、左移单元格数据界面文字显示框、数据集数据界面-汇总方式
* commit 'e42e066b5779e8b12fa9939b43652d0ff47e9b4b':
formatter
what happen?
|
6 years ago |
yaoh.wu
|
5d8a420ca5
|
无JIRA任务,单元测试还没写完,先注释
|
6 years ago |
yaoh.wu
|
366810a296
|
代码质量
|
6 years ago |
Wim.Zhai
|
e42e066b57
|
formatter
|
6 years ago |
Wim.Zhai
|
0d72d523e0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
|
6 years ago |
Wim.Zhai
|
ce29ce9ff5
|
what happen?
|
6 years ago |
Mata.Li
|
81575c1edf
|
Merge pull request #468 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '3a6aa0de0a63516c61704e5556111460cd6a5e45':
REPORT-11144
|
6 years ago |
yaoh.wu
|
baf67a033b
|
REPORT-11268 关闭模板主动释放文件锁,分布式锁,代码质量
|
6 years ago |
Mata.Li
|
3a6aa0de0a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
28465552b0
|
REPORT-11144
|
6 years ago |
ju
|
7021f24cad
|
Merge pull request #467 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'ef33237cae7086ad8214466854de4501d4ffc443':
REPORT-11216 10.0远程设计问题解决 先传一波代码 1、拆分了rpc部分和channel部分 2、http channel写完好了 后续处理: 1、netty channel 2、gzip传输 3、图表地图资源太大导致图表卡的问题 4、其他性能优化 5、代码质量调整
|
6 years ago |
ju
|
ef33237cae
|
REPORT-11216 10.0远程设计问题解决
先传一波代码
1、拆分了rpc部分和channel部分
2、http channel写完好了
后续处理:
1、netty channel
2、gzip传输
3、图表地图资源太大导致图表卡的问题
4、其他性能优化
5、代码质量调整
|
6 years ago |
zheng
|
77945d86e3
|
Merge pull request #466 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '26504d4b45e64e8117ce15f7f390180ab274b2ff':
CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
|
6 years ago |
zheng
|
26504d4b45
|
CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
|
6 years ago |
yaoh.wu
|
db21f75849
|
Merge pull request #465 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '21f518ed6c1169c49b8bcd261f2eadfe281f1200':
多人远程
多人远程
bug 处理
无任务,自测bug修复
新建文件夹 交互修订
REPORT-10896 多人远程设计
|
6 years ago |
yaoh.wu
|
21f518ed6c
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/design/design into feature/10.0
|
6 years ago |
yaoh.wu
|
295a93d6b3
|
多人远程
|
6 years ago |
yaoh.wu
|
ff520def37
|
多人远程
|
6 years ago |
ju
|
6002178afb
|
Merge pull request #464 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '6dfb2a24abe3de0050b8da6379d30a7bd26c5915':
REPORT-11204 同一账户多处登录,区分连接的ID fix
|
6 years ago |
ju
|
6dfb2a24ab
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
6 years ago |
ju
|
e61294d492
|
REPORT-11204 同一账户多处登录,区分连接的ID
fix
|
6 years ago |
yaoh.wu
|
db5a340e02
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '8c1e44b368f0934af6f7d5ee0bc7104785efca6c':
REPORT-11204 同一账户多处登录,区分连接的ID
REPORT-10703 支持双面打印=>问题1:双面打印下拉框没有灰化
|
6 years ago |
yaoh.wu
|
bfc608c6b0
|
bug 处理
|
6 years ago |
Harrison
|
af191e73cf
|
Merge pull request #462 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'dfc9a02c1810889d9563fe32e0ce33563da93c52':
REPORT-11201 权限管理中的国际化问题
|
6 years ago |
ju
|
8c1e44b368
|
Merge pull request #463 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'e3318fc7ec2d963518f563506aa9ad6a69fd7f82':
REPORT-11204 同一账户多处登录,区分连接的ID
|
6 years ago |
ju
|
e3318fc7ec
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
6 years ago |
ju
|
39127c9789
|
REPORT-11204 同一账户多处登录,区分连接的ID
|
6 years ago |
Harrison
|
dfc9a02c18
|
REPORT-11201 权限管理中的国际化问题
|
6 years ago |
plough
|
65bce00cdd
|
Merge pull request #461 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit '5e44caac63e3cbbcd31514511c0db569706137f5':
REPORT-10703 支持双面打印=>问题1:双面打印下拉框没有灰化
|
6 years ago |
yaoh.wu
|
8771197040
|
无任务,自测bug修复
|
6 years ago |
yaoh.wu
|
965d420705
|
新建文件夹 交互修订
|
6 years ago |
yaoh.wu
|
8ba6629390
|
REPORT-10896 多人远程设计
|
6 years ago |
plough
|
5e44caac63
|
REPORT-10703 支持双面打印=>问题1:双面打印下拉框没有灰化
|
6 years ago |
Alex.Sung
|
083c96b1ad
|
Merge pull request #458 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
REPORT-10946 离线状态下(断网)alphafine都打不开了
* commit 'c94806219de96cbd19f0f891902c8bd354c3be23':
REPORT-10946 离线状态下(断网)alphafine都打不开了 1、正常断网后,需要联网的各模块提示“链接失败” 2、断网后联网,alphafine可以正常打开 3、和视觉沟通,热门界面的图标外围的圆,不使用swing画了,由视觉重新提供切图。
|
6 years ago |
plough
|
dad8f4e275
|
Merge pull request #457 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '9c694f26fc87fe23fc85d5ecefdc915bcd0ae6a9':
REPORT-11044 frm中选中块时,老是跳转
|
6 years ago |
ju
|
5530131041
|
Merge pull request #459 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'fd7af4ca241001acef3b942cebda94baa15cae82':
无JIRA任务 屏蔽老的collector
|
6 years ago |
ju
|
fd7af4ca24
|
无JIRA任务 屏蔽老的collector
|
6 years ago |
alex.sung
|
c94806219d
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into feature/10.0
|
6 years ago |
alex.sung
|
7f7c48a667
|
REPORT-10946 离线状态下(断网)alphafine都打不开了
1、正常断网后,需要联网的各模块提示“链接失败”
2、断网后联网,alphafine可以正常打开
3、和视觉沟通,热门界面的图标外围的圆,不使用swing画了,由视觉重新提供切图。
|
6 years ago |
plough
|
9c694f26fc
|
REPORT-11044 frm中选中块时,老是跳转
|
6 years ago |
rinoux
|
0cfb6ad541
|
Merge pull request #456 in DESIGN/design from ~RINOUX/design:feature/10.0 to feature/10.0
* commit '381b5d9eed96c0df545b90341c13b7df028b6e6b':
update
无JIRA任务 向不存在的模版路径写入时不需要先新建空文件,否则其它存储实现会导致重命名失败
|
6 years ago |