superman
|
a3a3a1d66c
|
Merge pull request #1131 in BA/design from ~NEIL/design:master to master
* commit 'bf350565668f18e8221f75e9d4058e6ebfb6761e':
无JIRA任务, 国际化冲突修正.
|
7 years ago |
neil
|
bf35056566
|
无JIRA任务, 国际化冲突修正.
|
7 years ago |
neil
|
c9be85de41
|
Merge pull request #1130 in BA/design from ~NEIL/design:release/8.0 to master
* commit '96269140176b56a0401819f547254c4260f96356': (50 commits)
1
1
1
Sonar
sonarCube2
sonarCube
PFC-982 修复工具栏权限颗粒度设置时卡死的问题
bugfix
pmd
pmd
pmd
pmd
PFC-607 插件安装删除更新不重启支持 移植9.0的加密方式
pmd
pmd
添加Env版本区间判断
fix
pmd
插件EnvVersion检测
插件EnvVersion检测
...
|
7 years ago |
neil
|
9626914017
|
1
|
7 years ago |
neil
|
9570cd5645
|
1
|
7 years ago |
neil
|
661a47614e
|
1
|
7 years ago |
superman
|
2b68fba750
|
Merge pull request #1113 in BA/design from ~RINOUX/design_ba:release/8.0 to release/8.0
* commit '13ec375751cbb52608067b0b85279c1df59f0129':
Sonar
sonarCube2
sonarCube
PFC-982 修复工具栏权限颗粒度设置时卡死的问题
|
7 years ago |
rinoux
|
13ec375751
|
Sonar
|
7 years ago |
rinoux
|
4713174ac1
|
sonarCube2
|
7 years ago |
rinoux
|
0846a98d07
|
sonarCube
|
7 years ago |
rinoux
|
01fcdf0740
|
PFC-982 修复工具栏权限颗粒度设置时卡死的问题
|
7 years ago |
superman
|
39591b35a5
|
Merge pull request #1091 in BA/design from ~JU/ba-release-design:release/8.0 to release/8.0
* commit '61fa2cdf10c1e1f136ed0fe40e8eb8218351d3b3':
bugfix
|
7 years ago |
juhaoyu
|
61fa2cdf10
|
Merge remote-tracking branch 'origin/release/8.0' into release/8.0
|
7 years ago |
juhaoyu
|
016f5c2af1
|
bugfix
|
7 years ago |
neil
|
7425898f8b
|
Merge pull request #1088 in BA/design from ~JU/ba-release-design:release/8.0 to release/8.0
* commit 'c9e30586ecf68c7ae092db9f19b385b0705ae78b':
pmd
pmd
pmd
pmd
PFC-607 插件安装删除更新不重启支持 移植9.0的加密方式
pmd
pmd
添加Env版本区间判断
fix
|
7 years ago |
juhaoyu
|
c9e30586ec
|
pmd
|
7 years ago |
juhaoyu
|
2a5a2e1005
|
pmd
|
7 years ago |
juhaoyu
|
ba1e541f14
|
pmd
|
7 years ago |
juhaoyu
|
ba2a78b8ae
|
pmd
|
7 years ago |
juhaoyu
|
78f7905015
|
PFC-607 插件安装删除更新不重启支持
移植9.0的加密方式
|
7 years ago |
juhaoyu
|
06fcc30d00
|
pmd
|
7 years ago |
juhaoyu
|
c465dc4b10
|
pmd
|
7 years ago |
juhaoyu
|
5aa527e37e
|
添加Env版本区间判断
|
7 years ago |
juhaoyu
|
1401a6076b
|
Merge remote-tracking branch 'origin/release/8.0' into release/8.0
|
7 years ago |
juhaoyu
|
0356226735
|
fix
|
7 years ago |
superman
|
c0dc625b15
|
Merge pull request #1083 in BA/design from ~JU/ba-release-design:release/8.0 to release/8.0
* commit '3d8723c9fd26d9b2819623368838ad8001f80781':
pmd
插件EnvVersion检测
插件EnvVersion检测
|
7 years ago |
juhaoyu
|
3d8723c9fd
|
pmd
|
7 years ago |
juhaoyu
|
da225f08db
|
插件EnvVersion检测
|
7 years ago |
juhaoyu
|
6ee8026f5a
|
插件EnvVersion检测
|
7 years ago |
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 |
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 |