superman
|
cda9d1249a
|
Merge pull request #1048 in BA/design from ~HUGH/design:release to release
* commit '58c327744504e75056e53400e722d6de02ac8e39':
SLN-280 打印导出背景分离,漏删一行代码,导致导出按钮没显示出来。
|
7 years ago |
hugh
|
58c3277445
|
SLN-280 打印导出背景分离,漏删一行代码,导致导出按钮没显示出来。
|
7 years ago |
superman
|
ffe74e34c2
|
Merge pull request #1041 in BA/design from ~SYOKI/design:release to release
* commit '80d9f3e59a80fe74e11198122c66003efc9a5d37':
【国际化修改】显示bug(REPORT-3216)相关key的翻译
面板灰化
|
7 years ago |
syoki
|
80d9f3e59a
|
【国际化修改】显示bug(REPORT-3216)相关key的翻译
|
7 years ago |
syoki
|
fa45c7fdf8
|
Merge branch 'release' of http://syoki@www.finedevelop.com:2015/scm/~syoki/design.git into release
|
7 years ago |
superman
|
37bccad76f
|
Merge pull request #1027 in BA/design from ~EASON/design_release:master to master
* commit '581ca6572547a9e31c81f343e594c9d600173996':
代码合并丢失
|
7 years ago |
eason-skx
|
581ca65725
|
代码合并丢失
|
7 years ago |
superman
|
962d7d50c9
|
Merge pull request #1025 in BA/design from ~PAUL/design:master to master
* commit '549facc7f46b8396e382f80e04f50cd9670b954f':
BI-6684 License读取暂时还原,设计到递归,处理比较麻烦,放9.0中处理
pmd
pmd
面板接口
合并代码:将图表dev中修改合并到release
REPORT-3216 日文版的一些翻译和显示问题20170708
BI-6684 License读取类加密做准备
增加license
SLN-280 规范国际化
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
修改拼写错误
1
REPORT-2825 按钮出现多个, design模块忘了patch了.
REPORT-3272 表单无法保存问题.
删import
|
7 years ago |
superman
|
e00f4d7dc0
|
Merge pull request #1026 in BA/design from ~EASON/design_release:release to release
* commit '52a404508f62a84e272cac753f6c7ec603e90ba2':
面板灰化
|
7 years ago |
eason-skx
|
52a404508f
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~eason/design_release into release
|
7 years ago |
eason-skx
|
60cb686fac
|
面板灰化
|
7 years ago |
paul
|
549facc7f4
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer.properties
# designer_base/src/com/fr/design/locale/designer_en_US.properties
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_ko_KR.properties
# designer_base/src/com/fr/design/locale/designer_zh_CN.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
# designer_base/src/com/fr/start/BaseDesigner.java
# designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java
|
7 years ago |
superman
|
da5aeffea5
|
Merge pull request #1023 in BA/design from ~NEIL/design:release to dev
* commit '5afea688089dc08e761d0bdc01e050a721a7b131': (25 commits)
1
1
1
BI-6684 License读取暂时还原,设计到递归,处理比较麻烦,放9.0中处理
pmd
pmd
面板接口
合并代码:将图表dev中修改合并到release
REPORT-3216 日文版的一些翻译和显示问题20170708
BI-6684 License读取类加密做准备
增加license
SLN-280 规范国际化
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
修改拼写错误
1
REPORT-2825 按钮出现多个, design模块忘了patch了.
REPORT-3272 表单无法保存问题.
无JIRA任务, build failed
REPORT-3184 设计器安装后默认工作目录的名字
【日语国际化修改】
...
|
7 years ago |
superman
|
69220f0aac
|
Merge pull request #42 in PF/design from ~DANIEL/finereport_design:dev to dev
* commit '0144fe22e0522f091b65c52621d71cfd03c65c6a':
打包
revert
build change
jdk
diamond
roll back
接口更新
|
7 years ago |
daniel
|
0144fe22e0
|
打包
|
7 years ago |
daniel
|
92c856e1c0
|
revert
|
7 years ago |
daniel
|
24cd9cf3a5
|
build change
|
7 years ago |
neil
|
5afea68808
|
1
|
7 years ago |
neil
|
ebe9703343
|
1
|
7 years ago |
neil
|
d344e92e8b
|
1
|
7 years ago |
superman
|
c3885e6278
|
Merge pull request #1022 in BA/design from ~NEIL/design:dev to dev
* commit '94a59be635ad7592e3a31f0724ade9345c47c834':
REPORT-3406 win10内存不足时找不到系统浏览器
|
7 years ago |
superman
|
694b2d03f6
|
Merge pull request #1024 in BA/design from ~RICHIE/design:release to release
* commit '1347e32ec7eea878cb53ada500c47ffa8ac3fcbc':
BI-6684 License读取暂时还原,设计到递归,处理比较麻烦,放9.0中处理
|
7 years ago |
richie
|
1347e32ec7
|
BI-6684 License读取暂时还原,设计到递归,处理比较麻烦,放9.0中处理
|
7 years ago |
neil
|
94a59be635
|
REPORT-3406 win10内存不足时找不到系统浏览器
|
7 years ago |
superman
|
8357ee3f09
|
Merge pull request #1020 in BA/design from ~EASON/design_release:release to release
* commit '116b0e7c0ace5fbb1a4c0cb2122e1037404e5503':
pmd
pmd
面板接口
删import
|
7 years ago |
eason-skx
|
116b0e7c0a
|
pmd
|
7 years ago |
eason-skx
|
c438614dbb
|
pmd
|
7 years ago |
eason-skx
|
4e827e5f24
|
面板接口
|
7 years ago |
eason
|
c01a229767
|
Merging in latest from upstream (BA/design:refs/heads/release)
* commit '9339b4dd52247db11378284be7e0def8300d274e': (29 commits)
合并代码:将图表dev中修改合并到release
REPORT-3216 日文版的一些翻译和显示问题20170708
BI-6684 License读取类加密做准备
增加license
SLN-280 规范国际化
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
修改拼写错误
1
REPORT-2825 按钮出现多个, design模块忘了patch了.
REPORT-3272 表单无法保存问题.
无JIRA任务, build failed
REPORT-3184 设计器安装后默认工作目录的名字
【日语国际化修改】
gis地图切换经纬度后,经纬度面板不现实bug
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
【国际化修改】修改了一处翻译。。。。
无JIRA任务, dev国际化->release
【国际化修改】 根据代理商意见修改翻译 syoki
修改pmd错误(国际化命名)
修改pmd错误(国际化命名)
...
|
7 years ago |
superman
|
9339b4dd52
|
Merge pull request #1018 in BA/design from ~MANGO/design:release to release
* commit '2369145cbfeff4cf9830093c92e2b7190e5c785e':
合并代码:将图表dev中修改合并到release
|
7 years ago |
mengao
|
2369145cbf
|
合并代码:将图表dev中修改合并到release
|
7 years ago |
daniel
|
826e4009f0
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
7 years ago |
superman
|
88d009d447
|
Merge pull request #1013 in BA/design from ~PLOUGH/design:release to release
* commit '5004bd19eebf0d1b9433d9a98062470aa8ba7c0b':
REPORT-3216 日文版的一些翻译和显示问题20170708
|
7 years ago |
plough
|
5004bd19ee
|
REPORT-3216 日文版的一些翻译和显示问题20170708
|
7 years ago |
superman
|
8ba9343645
|
Merge pull request #1011 in BA/design from CHART/design:dev to dev
* commit 'c4d276fce91eca87251c67199af00d77a82b1e50':
修改换行符
修改下接口返回类型
还原代码
地图远程设计的时候在写文件的时候更新mapAttr
代码修改
安装平台内打开插件,图表超链中添加相应的按钮
修改老图表那边数据处理逻辑的一些问题 修改多分类轴bug 添加多分类时监控刷新的处理
去掉没用到的引用
修改返回类型
将Table中的返回类型ArrayList<UIComboBox>改为List<UIComboBox>。
多分类轴整体代码,第一次提交
fix
修改pmd错误
修复pmd错误
修改pmd问题
修复bug:条件显示里设置条件内容为数据列,把对应的数据集删掉后,点击设置的条件属性,页面打不开
pmd
删除标签位置
|
7 years ago |
superman
|
c4d276fce9
|
Merge pull request #11 in CHART/design from ~MANGO/m_design:dev to dev
* commit '65762d17f7e06eff0bcc4243c4dbd81ab3ff3260':
修改换行符
修改下接口返回类型
还原代码
地图远程设计的时候在写文件的时候更新mapAttr
|
7 years ago |
richie
|
bfc231c6c8
|
Merge pull request #1009 in BA/design from ~RICHIE/design:release to release
* commit 'ed461daa1646e72771974d8dffd5d22bb2faae57':
BI-6684 License读取类加密做准备
|
7 years ago |
mengao
|
65762d17f7
|
修改换行符
|
7 years ago |
mengao
|
3afae53347
|
修改下接口返回类型
|
7 years ago |
mengao
|
7963ee5913
|
还原代码
|
7 years ago |
mengao
|
869e5c633e
|
地图远程设计的时候在写文件的时候更新mapAttr
|
7 years ago |
richie
|
ed461daa16
|
BI-6684 License读取类加密做准备
|
7 years ago |
richie
|
bcd4a7dedc
|
增加license
|
7 years ago |
richie
|
b189fa26ab
|
增加license
|
7 years ago |
richie
|
117ea3b117
|
增加license
|
7 years ago |
superman
|
d055c82383
|
Merge pull request #1008 in BA/design from ~HUGH/design:release to release
* commit '06fff3dde04dffca511112a63fbe493e13fc9655':
SLN-280 规范国际化
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
|
7 years ago |
hugh
|
06fff3dde0
|
SLN-280 规范国际化
|
7 years ago |
hugh
|
8fa56b1367
|
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
|
7 years ago |
superman
|
7bc62b7d5b
|
Merge pull request #9 in CHART/design from ~MANGO/m_design:dev to dev
* commit '59696f6e66523c09915a9d9071f5a92a9021d0de':
代码修改
安装平台内打开插件,图表超链中添加相应的按钮
|
7 years ago |
mengao
|
59696f6e66
|
代码修改
|
7 years ago |