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 |
|
hugh
|
abc43081b6
|
表单支持背景接口
|
8 years ago |
|
hugh
|
3688b4f903
|
Merging in latest from upstream (BA/design:refs/heads/release)
* commit 'ee78c63f92afe56ea6112748becef733305a637b': (343 commits)
国际化
无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
REPORT-2537
无任务，冲突调整，release到dev
无JIRA任务，国际化，把release、master中的key合并到dev中
无JIRA任务，解决冲突
ct
ct
ct
ct
1
...
|
8 years ago |
|
plough
|
f66f6b7fa6
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~plough/design into release
|
8 years ago |
|
plough
|
fe74e83e73
|
REPORT-2644 master国际化问题
|
8 years ago |
|
xiaoxia
|
c473346c92
|
rt
|
8 years ago |
|
plough
|
e10fbeb70d
|
无JIRA任务，国际化
|
8 years ago |
|
plough
|
592ecab810
|
REPORT-2644 master国际化问题
|
8 years ago |
|
mengao
|
316e203c8e
|
去掉不需要的方法，不需要的面板返回null。
|
8 years ago |
|
xiaoxia
|
2475c5e553
|
rt
|
8 years ago |
|
xiaoxia
|
200bedcc9a
|
rt
|
8 years ago |
|
xiaoxia
|
49b96edf8e
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
8 years ago |
|
xiaoxia
|
5c61c160c4
|
rt
|
8 years ago |
|
superman
|
3e6a18c78d
|
Merge pull request #867 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit '3c3145251f1636619604179938776ef6a38893a0':
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
rt
alphafine 1
|
8 years ago |
|
xiaoxia
|
3c3145251f
|
rt
|
8 years ago |
|
xiaoxia
|
3955ce43a4
|
rt
|
8 years ago |
|
xiaoxia
|
ceb27fbad1
|
rt
|
8 years ago |
|
xiaoxia
|
6fc4115978
|
rt
|
8 years ago |
|
xiaoxia
|
bdbf6a8d10
|
rt
|
8 years ago |
|
xiaoxia
|
3669c44197
|
rt
|
8 years ago |
|
xiaoxia
|
2b7c7239ca
|
rt
|
8 years ago |
|
xiaoxia
|
f126c0ed85
|
rt
|
8 years ago |
|
xiaoxia
|
3f9f7239e7
|
rt
|
8 years ago |
|
xiaoxia
|
c881e2488e
|
rt
|
8 years ago |
|
xiaoxia
|
96662a2a73
|
rt
|
8 years ago |
