eason-skx
|
581ca65725
|
代码合并丢失
|
8 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
|
8 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
|
8 years ago |
superman
|
694b2d03f6
|
Merge pull request #1024 in BA/design from ~RICHIE/design:release to release
* commit '1347e32ec7eea878cb53ada500c47ffa8ac3fcbc':
BI-6684 License读取暂时还原,设计到递归,处理比较麻烦,放9.0中处理
|
8 years ago |
richie
|
1347e32ec7
|
BI-6684 License读取暂时还原,设计到递归,处理比较麻烦,放9.0中处理
|
8 years ago |
superman
|
8357ee3f09
|
Merge pull request #1020 in BA/design from ~EASON/design_release:release to release
* commit '116b0e7c0ace5fbb1a4c0cb2122e1037404e5503':
pmd
pmd
面板接口
删import
|
8 years ago |
eason-skx
|
116b0e7c0a
|
pmd
|
8 years ago |
eason-skx
|
c438614dbb
|
pmd
|
8 years ago |
eason-skx
|
4e827e5f24
|
面板接口
|
8 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错误(国际化命名)
...
|
8 years ago |
superman
|
9339b4dd52
|
Merge pull request #1018 in BA/design from ~MANGO/design:release to release
* commit '2369145cbfeff4cf9830093c92e2b7190e5c785e':
合并代码:将图表dev中修改合并到release
|
8 years ago |
mengao
|
2369145cbf
|
合并代码:将图表dev中修改合并到release
|
8 years ago |
superman
|
88d009d447
|
Merge pull request #1013 in BA/design from ~PLOUGH/design:release to release
* commit '5004bd19eebf0d1b9433d9a98062470aa8ba7c0b':
REPORT-3216 日文版的一些翻译和显示问题20170708
|
8 years ago |
plough
|
5004bd19ee
|
REPORT-3216 日文版的一些翻译和显示问题20170708
|
8 years ago |
richie
|
bfc231c6c8
|
Merge pull request #1009 in BA/design from ~RICHIE/design:release to release
* commit 'ed461daa1646e72771974d8dffd5d22bb2faae57':
BI-6684 License读取类加密做准备
|
8 years ago |
richie
|
ed461daa16
|
BI-6684 License读取类加密做准备
|
8 years ago |
richie
|
b189fa26ab
|
增加license
|
8 years ago |
richie
|
117ea3b117
|
增加license
|
8 years ago |
superman
|
d055c82383
|
Merge pull request #1008 in BA/design from ~HUGH/design:release to release
* commit '06fff3dde04dffca511112a63fbe493e13fc9655':
SLN-280 规范国际化
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
|
8 years ago |
hugh
|
06fff3dde0
|
SLN-280 规范国际化
|
8 years ago |
hugh
|
8fa56b1367
|
SLN-280 二开需求(将原导出打印纸张背景,分开设置),经产品决定做到产品里面
|
8 years ago |
superman
|
15e63fb0e1
|
Merge pull request #998 in BA/design from ~NEIL/design:master to master
* commit 'cae51e136d9281928fa897dbf26c6408f3a98888':
1
1
REPORT-2825 合代码验收bug
|
8 years ago |
neil
|
cae51e136d
|
1
|
8 years ago |
neil
|
48cfd19b21
|
1
|
8 years ago |
neil
|
d155146179
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
8 years ago |
neil
|
1164a17f0c
|
REPORT-2825 合代码验收bug
|
8 years ago |
superman
|
21b2255e0a
|
Merge pull request #997 in BA/design from ~NEIL/design:master to master
* commit '357d6c82db8c88ffa07d40169ccf8694fcfe33c6':
REPORT-3281 合代码验收问题, 日文加载失败.
|
8 years ago |
neil
|
357d6c82db
|
REPORT-3281 合代码验收问题, 日文加载失败.
|
8 years ago |
richie
|
ac96717cb3
|
修改拼写错误
|
8 years ago |
superman
|
42806c6e5d
|
Merge pull request #995 in BA/design from ~MANGO/design:release to release
* commit 'b72ecb0af5dbf505763876323557b926283b15ed':
修改拼写错误
|
8 years ago |
mengao
|
b72ecb0af5
|
Merge remote-tracking branch 'origin/release' into release
|
8 years ago |
mengao
|
6819c1c00d
|
修改拼写错误
|
8 years ago |
richie
|
cdc5671737
|
拼错了,改进下
|
8 years ago |
richie
|
16cdd1cfb9
|
拼错了,改动
|
8 years ago |
superman
|
1423b7671f
|
Merge pull request #993 in BA/design from ~NEIL/design:release to release
* commit '896fa76e9598a56fe31673d96ca962937b00527f':
1
REPORT-2825 按钮出现多个, design模块忘了patch了.
REPORT-3272 表单无法保存问题.
|
8 years ago |
neil
|
896fa76e95
|
1
|
8 years ago |
neil
|
2f8a2447a6
|
REPORT-2825 按钮出现多个, design模块忘了patch了.
|
8 years ago |
neil
|
eda63515b4
|
REPORT-3272 表单无法保存问题.
|
8 years ago |
superman
|
4ec7614d80
|
Merge pull request #990 in BA/design from ~NEIL/design:master to master
* commit 'faf7195c9b9070f86f2856a6aff95924d48bcfba':
无JIRA任务, 国际化少了一个
|
8 years ago |
neil
|
faf7195c9b
|
无JIRA任务, 国际化少了一个
|
8 years ago |
superman
|
faf541f65b
|
Merge pull request #988 in BA/design from ~PAUL/design:master to master
* commit 'da2eddc9865e898cfd8c0e3d9dffb7b8551bbe25':
无JIRA任务, build failed
REPORT-3184 设计器安装后默认工作目录的名字
【日语国际化修改】
gis地图切换经纬度后,经纬度面板不现实bug
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
修改pmd错误(国际化命名)
修改pmd错误(国际化命名)
修改国际化问题
REPORT-2561 大屏-数字时钟插件,属性表左移
REPORT-2561 大屏-数字时钟插件,属性表左移,调整
REPORT-2561 大屏-数字时钟插件,属性表左移
比较版本号
版本比较: 10.0 > 9.0 1.10 > 1.9 1.1.2 > 1.1.1 1.1.1 > 1.1
删除多余类
去掉多余代码
去掉接口代码中instnceof,用泛型代替。
|
8 years ago |
paul
|
da2eddc986
|
Merge branch 'release'
|
8 years ago |
superman
|
748e1af4ba
|
Merge pull request #984 in BA/design from ~NEIL/design:release to release
* commit 'f86e0ee7b738cd4e851be8058cc9b6ac06c32a19':
无JIRA任务, build failed
|
8 years ago |
neil
|
f86e0ee7b7
|
无JIRA任务, build failed
|
8 years ago |
superman
|
e32fdf1387
|
Merge pull request #982 in BA/design from ~PLOUGH/design:release to release
* commit '62066d4e953d9a125e584007a1ff81ddab9b4adb':
REPORT-3184 设计器安装后默认工作目录的名字
|
8 years ago |
plough
|
62066d4e95
|
REPORT-3184 设计器安装后默认工作目录的名字
|
8 years ago |
superman
|
3f0bd44ab2
|
Merge pull request #980 in BA/design from ~SYOKI/design:release to release
* commit '6b7f98b513d22d571814158b468b53af4689f638':
【日语国际化修改】
|
8 years ago |
syoki
|
6b7f98b513
|
【日语国际化修改】
|
8 years ago |
superman
|
da38cb04bb
|
Merge pull request #977 in BA/design from ~MANGO/design:release to release
* commit '32d5c1bf20a0b3a46fef3a3a6143d03ce04f34e7':
gis地图切换经纬度后,经纬度面板不现实bug
|
8 years ago |
mengao
|
32d5c1bf20
|
gis地图切换经纬度后,经纬度面板不现实bug
|
8 years ago |