hzzz
|
ae2dff9a14
|
resolve conflict
|
8 years ago |
|
hzzz
|
844a9a8669
|
PMD
|
8 years ago |
superman
|
073c3489f0
|
Merge pull request #900 in BA/design from ~NEIL/design:dev to dev
* commit '8a4830d5e2f8144f4b557b6177390defaa177b2b':
1
1
无JIRA任务，国际化冲突修正.
|
8 years ago |
|
superman
|
77bf463196
|
Merge pull request #898 in BA/design from ~NEIL/design:release to dev
* commit '7ea56cd1bca7da405181a56be4f8a33343ebc10c': (22 commits)
ct
【国际化修改】修改部分翻译 庄奇 syoki 20170523
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
REPORT-2675 部分国际化key找不到，加载顺序问题
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
去掉之前接口冗余操作
表单支持背景接口
REPORT-2644 master国际化问题
国际化
无JIRA任务，国际化翻译更新
无JIRA任务，国际化翻译更新
REPORT-2626 移除国际化文件中的无效key
REPORT-2626 移除国际化文件中的无效key
国际化修改 design部分第51-750个key的翻译修改 庄奇syoki 20170509
Signed-off-by: unknown <李晓丽>
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
REPORT-2483 & REPORT-2484 国际化key转移；外文版的国际化文件和中文版不一致
无JIRA任务 新release合并遗漏
无任务，line separator
...
|
8 years ago |
neil
|
8a4830d5e2
|
1
|
8 years ago |
|
neil
|
e2860f3a0a
|
1
|
8 years ago |
|
neil
|
917a793904
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
8 years ago |
|
neil
|
d0b30454fc
|
无JIRA任务，国际化冲突修正.
|
8 years ago |
|
superman
|
a92564857a
|
Merge pull request #899 in BA/design from ~EASON/design:dev to dev
* commit '11be0591cb560dec064642f5d744a158a0df5473':
删除不用的设计器代码
|
8 years ago |
|
superman
|
f6d2ad7ca5
|
Merge pull request #16 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit '452019169e5c15652b6e3fac4c422e0349695340':
直接用IOUtils的工具方法读取Icon
pmd
IOUtils添加资源加载接口，可访问到IOUtils的地方都用IOUtils加载资源，访问不到的话再直接用ResourceLoader
·
·
fix
默认Logger放到StableFactory里
|
8 years ago |
juhaoyu
|
90d92b536a
|
fix
|
8 years ago |
eason-skx
|
11be0591cb
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~eason/design into dev
|
8 years ago |
|
eason-skx
|
c8c861600d
|
删除不用的设计器代码
|
8 years ago |
|
neil
|
7ea56cd1bc
|
ct
|
8 years ago |
|
juhaoyu
|
452019169e
|
直接用IOUtils的工具方法读取Icon
|
8 years ago |
|
juhaoyu
|
628f655e1a
|
pmd
|
8 years ago |
|
hzzz
|
7e2f1a851d
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
71025db06a
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
juhaoyu
|
7ea04c49a5
|
IOUtils添加资源加载接口，可访问到IOUtils的地方都用IOUtils加载资源，访问不到的话再直接用ResourceLoader
|
8 years ago |
|
hzzz
|
abd6f44532
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
6f119a3d21
|
REPORT-2773 mac中复制快捷键的修复
|
8 years ago |
|
hzzz
|
9e216cdc8b
|
fix
|
8 years ago |
|
superman
|
1eff6d8d79
|
Merge pull request #896 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit '64578ebf2cd9c9b0baee2d9332bcc5b6fb41a1b9':
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
bug fix
|
8 years ago |
XiaXiang
|
64578ebf2c
|
bug fix
|
8 years ago |
|
XiaXiang
|
fae529f30b
|
bug fix
|
8 years ago |
|
XiaXiang
|
d91c0002e2
|
bug fix
|
8 years ago |
|
XiaXiang
|
3ed13a85af
|
bug fix
|
8 years ago |
|
XiaXiang
|
9eba157623
|
bug fix
|
8 years ago |
|
XiaXiang
|
0ed921bfd0
|
bug fix
|
8 years ago |
|
XiaXiang
|
71f0274776
|
bug fix
|
8 years ago |
|
juhaoyu
|
2dd7ddb52c
|
·
|
8 years ago |
|
juhaoyu
|
f67996f557
|
·
|
8 years ago |
|
XiaXiang
|
d1494dc20b
|
bug fix
|
8 years ago |
|
juhaoyu
|
03fd581798
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
8 years ago |
sunmondong
|
b57b215682
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/ba/design into 9.0
|
8 years ago |
|
juhaoyu
|
25b825d083
|
fix
|
8 years ago |
|
juhaoyu
|
a6467c01f0
|
默认Logger放到StableFactory里
|
8 years ago |
|
superman
|
7662ce6c2a
|
Merge pull request #14 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit '7a4abc09423148fffd16ba7ec9aa312e5a3741a2':
局部的监听优先级就不放到引擎里了
|
8 years ago |
|
juhaoyu
|
7a4abc0942
|
Merge remote-tracking branch 'origin/9.0' into 9.0
|
8 years ago |
|
juhaoyu
|
6446399146
|
局部的监听优先级就不放到引擎里了
|
8 years ago |
|
superman
|
ab510fa471
|
Merge pull request #13 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit '1f70c2dd16ccc91d46bb150ec7c45deb203f9eb8':
继续移植插件监听
支持War部署
ba-9.0 => pf-9.0 暂时先把war部署下插件相关的部分删了，一会儿尝试写到新的插件加载逻辑里面
|
8 years ago |
|
juhaoyu
|
1f70c2dd16
|
继续移植插件监听
|
8 years ago |
|
hzzz
|
9baf0a4502
|
修logPane的快捷键
|
8 years ago |
ju
|
81637ccebc
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '806732465b3d5a19924c13838d92fc46867183ec': (35 commits)
rt
代码质量
rt
rt
RT
rt
rt
代码质量
代码质量 包名
rt
代码质量
rt
代码质量
代码质量
代码质量
测试下PMD怎么知道我是读json的
代码质量
代码质量
代码质量
rt
...
|
8 years ago |
|
superman
|
806732465b
|
Merge pull request #895 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit '016396ce78c6b1765dce56fcdac3f6855cf45b5c':
rt
代码质量
rt
rt
RT
rt
|
8 years ago |
|
XiaXiang
|
016396ce78
|
rt
|
8 years ago |
|
XiaXiang
|
7f73b92e0a
|
代码质量
|
8 years ago |
|
XiaXiang
|
09fe236ef7
|
rt
|
8 years ago |
|
XiaXiang
|
ce1bccd2ed
|
rt
|
8 years ago |
|
XiaXiang
|
9ac8dfe6af
|
RT
|
8 years ago |
