superman
|
877b0d77d7
|
Merge pull request #859 in BA/design from ~HZZZ/design:fix-REPORT-2600 to dev
* commit '999d5e2b52be7cd07b0597aa607cd0c431183b99':
fix
fix
..
fix PMD
fix REPORT-2600
|
7 years ago |
hzzz
|
999d5e2b52
|
fix
|
7 years ago |
superman
|
9d59d65b2c
|
Merge pull request #860 in BA/design from ~SYOKI/design:release to release
* commit '5a1c073c5adbb71830928ba49fa780c25602d987':
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
|
7 years ago |
syoki
|
5a1c073c5a
|
国际化修改 design部分 1-50个 1901-结束部分key的翻译修改 20170508 庄奇syoki
|
7 years ago |
hzzz
|
87c302e4a5
|
fix
|
7 years ago |
hzzz
|
ad1e62a59c
|
..
|
7 years ago |
hzzz
|
810686c8a3
|
fix PMD
|
7 years ago |
hzzz
|
45adf67ff3
|
fix REPORT-2600
|
7 years ago |
mengao
|
a869bef323
|
优化代码
|
7 years ago |
mengao
|
b0185ea9b7
|
修改文件换行格式
|
7 years ago |
mengao
|
b306c9d5fe
|
修改代码中存在的一些问题。
修改文件名,删除多余的类,修改一些方法。
|
7 years ago |
mengao
|
21a0ac10fc
|
格式化代码
|
7 years ago |
Mango
|
e23eaf5d4d
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '6f14124119d627cdaa8cf7b49a60fde878f8bd4a': (85 commits)
无jira任务 应用补丁的时候有一个没有删除
移到designer_base
pmd
REPORT-2213 设计器右上角使用qq登录后,登录界面关不掉 & 这部分的代码质量
REPORT-2335 插件管理界面以及右上角的登录界面,多次点击后,页面无法关闭
无JIRA任务 合并代码时的错误覆盖
REPORT-1885 frm跑马灯=>默认字体由textPane确定,不写死
无任务,pmd
REPORT-2537 多层次部门工具栏权限细粒度设置不生效
REPORT-2483 国际化key转移;去掉空白行
无任务,冲突调整,release到dev
无JIRA任务,国际化,把release、master中的key合并到dev中
无JIRA任务,解决冲突
ct
ct
ct
ct
1
ct
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
...
|
7 years ago |
mengao
|
1642c8ad2a
|
还原多修改的代码
|
7 years ago |
mengao
|
d037450fa2
|
添加一些注释
|
7 years ago |
superman
|
6f14124119
|
Merge pull request #857 in BA/design from ~VITO/design:dev to dev
* commit '46970b0d890e4e6e46917c1b7bcf432c8bda0ffe':
无jira任务 应用补丁的时候有一个没有删除
|
7 years ago |
vito
|
46970b0d89
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~vito/design into dev
|
7 years ago |
vito
|
52ab6e88eb
|
无jira任务 应用补丁的时候有一个没有删除
|
7 years ago |
superman
|
da25a615de
|
Merge pull request #856 in BA/design from ~VITO/design:dev to dev
* commit 'f51dbd6c26425c4a9f7f05fefc9b8e373d0e16b3':
移到designer_base
pmd
REPORT-2213 设计器右上角使用qq登录后,登录界面关不掉 & 这部分的代码质量
REPORT-2335 插件管理界面以及右上角的登录界面,多次点击后,页面无法关闭
|
7 years ago |
vito
|
f51dbd6c26
|
移到designer_base
|
7 years ago |
vito
|
25521cf932
|
pmd
|
7 years ago |
vito
|
33ab06ff91
|
REPORT-2213 设计器右上角使用qq登录后,登录界面关不掉 & 这部分的代码质量
|
7 years ago |
vito
|
3b736749f5
|
REPORT-2335 插件管理界面以及右上角的登录界面,多次点击后,页面无法关闭
|
7 years ago |
mengao
|
a42c7b00fb
|
接口设计
|
7 years ago |
mengao
|
b50179be25
|
第三方图表接口设计
|
7 years ago |
mengao
|
cb009a0fbe
|
接口设计
|
7 years ago |
superman
|
32d1e9198e
|
Merge pull request #855 in BA/design from ~PLOUGH/design:release to release
* commit '1bf142a0f61136fe01b8cffb1bf801c5b8b46b9e':
REPORT-2483 & REPORT-2484 国际化key转移;外文版的国际化文件和中文版不一致
|
7 years ago |
plough
|
1bf142a0f6
|
REPORT-2483 & REPORT-2484 国际化key转移;外文版的国际化文件和中文版不一致
|
7 years ago |
superman
|
43cc133efd
|
Merge pull request #853 in BA/design from ~PLOUGH/design:dev to dev
* commit '4da0c31392e79f93176e17c5514afcbe166006fb':
REPORT-1885 frm跑马灯=>默认字体由textPane确定,不写死
|
7 years ago |
superman
|
a1e554787b
|
Merge pull request #854 in BA/design from ~ZACK/design:dev to dev
* commit 'ef2079a7a6ce2ca48eaa5b874af3b1e05857c47c':
无JIRA任务 合并代码时的错误覆盖
|
7 years ago |
superman
|
813a4ca769
|
Merge pull request #852 in BA/design from ~ZACK/design:release to release
* commit '123a421b435cb713900bd8bebfabcbdcd58aea49':
无JIRA任务 新release合并遗漏
|
7 years ago |
superman
|
29351a19a1
|
Merge pull request #851 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '1f9e12a5e6f8c58eb2fd1e0cf0c551a78cf51d4e':
无任务,line separator
REPORT-2537
|
7 years ago |
zack
|
ef2079a7a6
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design
|
7 years ago |
zack
|
534b886a02
|
无JIRA任务 合并代码时的错误覆盖
|
7 years ago |
zack
|
123a421b43
|
无JIRA任务 新release合并遗漏
|
7 years ago |
plough
|
4da0c31392
|
REPORT-1885 frm跑马灯=>默认字体由textPane确定,不写死
|
7 years ago |
yaoh.wu
|
1f9e12a5e6
|
无任务,line separator
|
7 years ago |
yaoh.wu
|
d618c242ac
|
REPORT-2537
|
7 years ago |
superman
|
7008f3f381
|
Merge pull request #850 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '8ce956556f22a5fc2390b193beb095a74c6ad4fa':
无任务,pmd
REPORT-2537 多层次部门工具栏权限细粒度设置不生效
|
7 years ago |
yaoh.wu
|
8ce956556f
|
无任务,pmd
|
7 years ago |
yaoh.wu
|
3f32486fd8
|
REPORT-2537 多层次部门工具栏权限细粒度设置不生效
|
7 years ago |
mengao
|
14a57b92e6
|
第三方图表接口
|
7 years ago |
superman
|
5fd8b730d6
|
Merge pull request #848 in BA/design from ~PLOUGH/design:dev to dev
* commit 'dcca8399030548c1315abbf7bf88ad54cf0e5120':
REPORT-2483 国际化key转移;去掉空白行
|
7 years ago |
plough
|
dcca839903
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
7 years ago |
plough
|
c7217f2f6a
|
REPORT-2483 国际化key转移;去掉空白行
|
7 years ago |
superman
|
5149516688
|
Merge pull request #847 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '329d11029ab8c9dff04a09364255e03b692d6df0':
无任务,冲突调整,release到dev
|
7 years ago |
yaoh.wu
|
329d11029a
|
无任务,冲突调整,release到dev
|
7 years ago |
superman
|
a43cb7488a
|
Merge pull request #846 in BA/design from ~PLOUGH/design:dev to dev
* commit '53f18866a267b3a97979306dc3dc73948089792d':
无JIRA任务,国际化,把release、master中的key合并到dev中
无JIRA任务,解决冲突
|
7 years ago |
plough
|
53f18866a2
|
无JIRA任务,国际化,把release、master中的key合并到dev中
|
7 years ago |
plough
|
860bfde6bc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
7 years ago |