superman
|
e3aacd2a5d
|
Merge pull request #882 in BA/design from ~PLOUGH/design:master to master
* commit '5bedbdc937cbf2b673c4e4c9f571eef6795eb0bb':
国际化,同步
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
superman
|
6f651d744e
|
Merge pull request #881 in BA/design from ~PLOUGH/design:release to release
* commit 'd686f00e6f753efb602d2ff6eaae2b86b722224c':
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
plough
|
5bedbdc937
|
国际化,同步
|
8 years ago |
plough
|
d686f00e6f
|
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
plough
|
ccf9f6ea32
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~plough/design
|
8 years ago |
plough
|
ef0f5f8a13
|
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
|
8 years ago |
xiaoxia
|
fecd0deb7d
|
rt
|
8 years ago |
xiaoxia
|
e5d066a6b1
|
rt
|
8 years ago |
xiaoxia
|
7a187cd182
|
rt
|
8 years ago |
xiaoxia
|
fee19f5913
|
rt
|
8 years ago |
xiaoxia
|
a7befe9e36
|
rt
|
8 years ago |
mengao
|
bf75d4d9b9
|
删除多余实现
|
8 years ago |
mengao
|
0c07bf40b8
|
修改PMD问题
|
8 years ago |
superman
|
b070501e4e
|
Merge pull request #879 in BA/design from ~NEIL/design:master to master
* commit 'f0fcb3fc95becbcaa447aaf0e15a3940e8d50970':
1
无JIRA任务, 合代码漏了个NPE
|
8 years ago |
mengao
|
8f42aecfdf
|
删除部分多余代码,API等级改为由用户设置
|
8 years ago |
neil
|
f0fcb3fc95
|
1
|
8 years ago |
neil
|
d9f7bf50f4
|
无JIRA任务, 合代码漏了个NPE
|
8 years ago |
superman
|
60f29431b7
|
Merge pull request #878 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'c7d016b7f458a2c75d2e29ca231c9e0a76d5beb8':
final language level
|
8 years ago |
xiaoxia
|
c7d016b7f4
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
8 years ago |
xiaoxia
|
57f656c7d3
|
final language level
|
8 years ago |
superman
|
5b02acd048
|
Merge pull request #877 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'b136776b59f73abaa5e81b1c0632da370fc834f7':
rt
增加键盘事件
|
8 years ago |
xiaoxia
|
b136776b59
|
rt
|
8 years ago |
xiaoxia
|
b3d5868b42
|
增加键盘事件
|
8 years ago |
superman
|
20033e0a63
|
Merge pull request #876 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'd19a408c077812afa707357d2e283b9c1d2fa25b':
rt
rt
|
8 years ago |
xiaoxia
|
d19a408c07
|
rt
|
8 years ago |
xiaoxia
|
325163b49f
|
Merging in latest from upstream (BA/design:refs/heads/9.0)
* commit '283e484661b4d2fc81b8a324f35aa76f57916905': (346 commits)
2
1
无JIRA任务, 冲突修正
2
1
ct
fix
fix
remove unused code
fix
fix
fix
..
fix PMD
fix REPORT-2600
无jira任务 应用补丁的时候有一个没有删除
移到designer_base
pmd
REPORT-2213 设计器右上角使用qq登录后,登录界面关不掉 & 这部分的代码质量
REPORT-2335 插件管理界面以及右上角的登录界面,多次点击后,页面无法关闭
...
|
8 years ago |
superman
|
283e484661
|
Merge pull request #875 in BA/design from ~NEIL/design:9.0 to 9.0
* commit '115340ddfacc57329fd6d78a2742b901677d28ff':
2
1
无JIRA任务, 冲突修正
|
8 years ago |
neil
|
115340ddfa
|
2
|
8 years ago |
neil
|
5ade61aa4d
|
1
|
8 years ago |
neil
|
a834655243
|
无JIRA任务, 冲突修正
|
8 years ago |
superman
|
a68922298b
|
Merge pull request #874 in BA/design from ~NEIL/design:dev to 9.0
* commit 'b2c4cc8e9dead31b31180d996c16802aa8b4b76e': (343 commits)
2
1
ct
fix
fix
remove unused code
fix
fix
fix
..
fix PMD
fix REPORT-2600
无jira任务 应用补丁的时候有一个没有删除
移到designer_base
pmd
REPORT-2213 设计器右上角使用qq登录后,登录界面关不掉 & 这部分的代码质量
REPORT-2335 插件管理界面以及右上角的登录界面,多次点击后,页面无法关闭
无JIRA任务 合并代码时的错误覆盖
REPORT-1885 frm跑马灯=>默认字体由textPane确定,不写死
无任务,pmd
...
|
8 years ago |
neil
|
b2c4cc8e9d
|
2
|
8 years ago |
neil
|
66a51909c0
|
1
|
8 years ago |
neil
|
42607bfc29
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
8 years ago |
neil
|
52653d5bc7
|
ct
|
8 years ago |
superman
|
da95d1f0f4
|
Merge pull request #873 in BA/design from ~HZZZ/design:dev to dev
* commit 'f0bb46a9cdc0e7addc5206965c0ee70fa458e9dd':
fix
fix
|
8 years ago |
hzzz
|
f0bb46a9cd
|
fix
|
8 years ago |
xiaoxia
|
4b1bdbc97c
|
rt
|
8 years ago |
superman
|
1e55080808
|
Merge pull request #870 in BA/design from ~PLOUGH/design:release to release
* commit '77ccca677c51611cd7d4c769ec94103e8f3a5733':
REPORT-2644 master国际化问题
|
8 years ago |
superman
|
5d9372e4ff
|
Merge pull request #868 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'fc3fbcbd37c9f912a76f7a3f599c510908475358':
rt
RT
rt
rt
rt
rt
|
8 years ago |
hzzz
|
9baa73b95f
|
fix
|
8 years ago |
xiaoxia
|
fc3fbcbd37
|
rt
|
8 years ago |
xiaoxia
|
cb2d8a6303
|
RT
|
8 years ago |
plough
|
77ccca677c
|
merge
|
8 years ago |
mengao
|
e0231440f2
|
提供需要继承的抽象类
|
8 years ago |
superman
|
b75425f52a
|
Merge pull request #871 in BA/design from ~HUGH/design:release to release
* commit 'cc4994a9eb6feea66425bd927d98322045ac9a58':
去掉之前接口冗余操作
表单支持背景接口
增加限制,不允许添加同分组名的插件
|
8 years ago |
superman
|
8519363d7d
|
Merge pull request #869 in BA/design from ~PLOUGH/design:master to master
* commit 'e10fbeb70d1bb10ad8c87c104d58c45805c4ed37':
无JIRA任务,国际化
REPORT-2644 master国际化问题
|
8 years ago |
superman
|
dbdbeadae7
|
Merge pull request #872 in BA/design from ~SYOKI/design:release to release
* commit 'a1a46908205ad1eadadcad95e67eb650330a3a1e':
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
|
8 years ago |
syoki
|
a1a4690820
|
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
|
8 years ago |
hugh
|
cc4994a9eb
|
去掉之前接口冗余操作
|
8 years ago |