superman
|
624cf6eebe
|
Merge pull request #12 in PF/design from ~JU/co-pf-9.0-design:9.0 to 9.0
* commit 'bcbb08418f9af62651f938b04f270c04b4e769ee':
fix
fix
|
8 years ago |
juhaoyu
|
bcbb08418f
|
fix
|
8 years ago |
juhaoyu
|
5d264469f7
|
fix
|
8 years ago |
superman
|
a5bc069f99
|
Merge pull request #886 in BA/design from ~MANGO/design:dev to dev
* commit '444dec1dfb80fd1eb0d0c94657dbdfeb896f9a41':
修改类名称,统一将ThirdChart和Chart4Custom修改为Charts(代表第三方所有的图表)
去掉glyph,chart中增加chartData属性,用来保存数据配置中的数据,修改命名。
|
8 years ago |
mengao
|
444dec1dfb
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
mengao
|
69723ae228
|
修改类名称,统一将ThirdChart和Chart4Custom修改为Charts(代表第三方所有的图表)
|
8 years ago |
mengao
|
f3d54815e0
|
去掉glyph,chart中增加chartData属性,用来保存数据配置中的数据,修改命名。
|
8 years ago |
superman
|
9597aa2161
|
Merge pull request #885 in BA/design from ~PLOUGH/design:release to release
* commit 'ab36e7b5bb9a054f5cae40c377dfca513c061470':
REPORT-2675 部分国际化key找不到,加载顺序问题
|
8 years ago |
plough
|
ab36e7b5bb
|
REPORT-2675 部分国际化key找不到,加载顺序问题
|
8 years ago |
XiaXiang
|
2cea885f4b
|
rt
|
8 years ago |
xiaoxia
|
811f042a9a
|
rt
|
8 years ago |
xiaoxia
|
b7e3a23d47
|
加个方法
|
8 years ago |
superman
|
f5dea0c560
|
Merge pull request #883 in BA/design from ~MANGO/design:dev to dev
* commit 'adf904821fbd76a16a09eb6b1e82af7c1d14c2d7':
修改图片,标题等
添加数据配置页面
|
8 years ago |
mengao
|
adf904821f
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
zack
|
432dbb4155
|
Merge pull request #880 in BA/design from ~MANGO/design:dev to dev
* commit 'bf75d4d9b9979ca5aa7a989223bdea870d7eb657': (27 commits)
删除多余实现
修改PMD问题
删除部分多余代码,API等级改为由用户设置
提供需要继承的抽象类
去掉不需要的方法,不需要的面板返回null。
接口代码优化
优化代码
优化代码
优化接口设计代码
优化接口设计代码
优化代码
修改文件换行格式
修改代码中存在的一些问题。 修改文件名,删除多余的类,修改一些方法。
格式化代码
还原多修改的代码
添加一些注释
接口设计
第三方图表接口设计
接口设计
第三方图表接口
...
|
8 years ago |
mengao
|
7f1488f3c6
|
修改图片,标题等
|
8 years ago |
mengao
|
62ac4b8bec
|
添加数据配置页面
|
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
|
d686f00e6f
|
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 |
mengao
|
8f42aecfdf
|
删除部分多余代码,API等级改为由用户设置
|
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 |