kerry
|
2fb21df0cd
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~kerry/design into 9.0
|
7 years ago |
|
kerry
|
6848398c4e
|
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
hzzz
|
c285851e15
|
9
|
7 years ago |
|
hzzz
|
6e91f1cd5d
|
format
|
7 years ago |
|
hzzz
|
83a0931252
|
format
“
|
7 years ago |
|
hzzz
|
0c6cf2fedf
|
tab pane color
|
7 years ago |
superman
|
99f79a4be0
|
Merge pull request #1028 in BA/design from ~KERRY/design:9.0 to 9.0
* commit '63b72565d5bfe45f57d66d7322a5bc13396bf915':
REPORT-3293 9.0设计器控件设置重画
|
7 years ago |
|
hzzz
|
700790d25a
|
tab pane font color
|
7 years ago |
|
hzzz
|
da6ab7c322
|
grid
|
7 years ago |
|
kerry
|
63b72565d5
|
REPORT-3293 9.0设计器控件设置重画
|
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 |
|
superman
|
22efeb914a
|
Merge pull request #1021 in BA/design from ~HZZZ/design:REPORT-2419-fix to 9.0
* commit '3c7e985f6d7de062759f1567de35b526c88c168e':
REPORT-2419-bug
|
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 |
|
hzzz
|
7070b61df0
|
replat icon
|
7 years ago |
|
neil
|
94a59be635
|
REPORT-3406 win10内存不足时找不到系统浏览器
|
7 years ago |
|
hzzz
|
3c7e985f6d
|
REPORT-2419-bug
|
7 years ago |
|
hzzz
|
45a1f48856
|
4 table data tree tab border
|
7 years ago |
|
hzzz
|
9723848ef4
|
4 table data tree pane border
|
7 years ago |
|
hzzz
|
ebd039a25b
|
Merge branch '9.0' into design
|
7 years ago |
|
hzzz
|
b6f95786ad
|
3 background
|
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 |
|
superman
|
4dd8717c92
|
Merge pull request #1019 in BA/design from ~PLOUGH/design:9.0 to 9.0
* commit 'dcce3eccb1d20acf4204b27c29800b6376af08e0':
REPORT-3163 合作开发9.0设计器=>条件属性=》去掉原来的菜单项入口
REPORT-3163 合作开发9.0设计器=>外框架遗留=》替换tab按钮icon
REPORT-3163 合作开发9.0设计器=>条件属性=》聚合报表部分
REPORT-3163 合作开发9.0设计器=>条件属性=》国际化
REPORT-3163 合作开发9.0设计器=>条件属性=》实时保存，可撤销、重做
REPORT-3163 合作开发9.0设计器=>外框架遗留=》默认隐藏顶部面板
REPORT-3163 合作开发9.0设计器=>条件属性=》表单部分
REPORT-3163 合作开发9.0设计器=>条件属性=》整合框架
|
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 |
|
hzzz
|
77f98f39d1
|
2 background
|
7 years ago |
|
hzzz
|
a6a547d36a
|
1 background
|
7 years ago |
plough
|
dcce3eccb1
|
REPORT-3163 合作开发9.0设计器=>条件属性=》去掉原来的菜单项入口
|
7 years ago |
|
plough
|
5e19697e3e
|
merge
|
7 years ago |
|
plough
|
d5a439c906
|
REPORT-3163 合作开发9.0设计器=>外框架遗留=》替换tab按钮icon
|
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 |
|
superman
|
997b9ac811
|
Merge pull request #1017 in BA/design from ~HZZZ/design:i18n to 9.0
* commit '71b9d7b16cde0f5cd6e5feed2b99366cf6f6cfde':
i18n
i18n
|
7 years ago |
mengao
|
2369145cbf
|
合并代码：将图表dev中修改合并到release
|
7 years ago |
