superman
|
20033e0a63
|
Merge pull request #876 in BA/design from ~XIAOXIA/design:9.0 to 9.0
* commit 'd19a408c077812afa707357d2e283b9c1d2fa25b':
rt
rt
|
7 years ago |
xiaoxia
|
d19a408c07
|
rt
|
7 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 插件管理界面以及右上角的登录界面，多次点击后，页面无法关闭
...
|
7 years ago |
|
superman
|
283e484661
|
Merge pull request #875 in BA/design from ~NEIL/design:9.0 to 9.0
* commit '115340ddfacc57329fd6d78a2742b901677d28ff':
2
1
无JIRA任务， 冲突修正
|
7 years ago |
neil
|
115340ddfa
|
2
|
7 years ago |
|
neil
|
5ade61aa4d
|
1
|
7 years ago |
|
neil
|
a834655243
|
无JIRA任务， 冲突修正
|
7 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
...
|
7 years ago |
|
neil
|
b2c4cc8e9d
|
2
|
7 years ago |
|
neil
|
66a51909c0
|
1
|
7 years ago |
|
neil
|
42607bfc29
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~neil/design into dev
|
7 years ago |
|
neil
|
52653d5bc7
|
ct
|
7 years ago |
|
superman
|
da95d1f0f4
|
Merge pull request #873 in BA/design from ~HZZZ/design:dev to dev
* commit 'f0bb46a9cdc0e7addc5206965c0ee70fa458e9dd':
fix
fix
|
7 years ago |
hzzz
|
f0bb46a9cd
|
fix
|
7 years ago |
|
xiaoxia
|
4b1bdbc97c
|
rt
|
7 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
|
7 years ago |
|
hzzz
|
9baa73b95f
|
fix
|
7 years ago |
|
xiaoxia
|
fc3fbcbd37
|
rt
|
7 years ago |
|
xiaoxia
|
cb2d8a6303
|
RT
|
7 years ago |
|
xiaoxia
|
c473346c92
|
rt
|
7 years ago |
|
xiaoxia
|
2475c5e553
|
rt
|
7 years ago |
|
xiaoxia
|
200bedcc9a
|
rt
|
7 years ago |
|
xiaoxia
|
49b96edf8e
|
Merge branch '9.0' of http://www.finedevelop.com:2015/scm/~xiaoxia/design into 9.0
|
7 years ago |
|
xiaoxia
|
5c61c160c4
|
rt
|
7 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
|
7 years ago |
|
xiaoxia
|
3c3145251f
|
rt
|
7 years ago |
|
xiaoxia
|
3955ce43a4
|
rt
|
7 years ago |
|
xiaoxia
|
ceb27fbad1
|
rt
|
7 years ago |
|
xiaoxia
|
6fc4115978
|
rt
|
7 years ago |
|
xiaoxia
|
bdbf6a8d10
|
rt
|
7 years ago |
|
xiaoxia
|
3669c44197
|
rt
|
7 years ago |
|
xiaoxia
|
2b7c7239ca
|
rt
|
7 years ago |
|
xiaoxia
|
f126c0ed85
|
rt
|
7 years ago |
|
xiaoxia
|
3f9f7239e7
|
rt
|
7 years ago |
|
xiaoxia
|
c881e2488e
|
rt
|
7 years ago |
|
xiaoxia
|
96662a2a73
|
rt
|
7 years ago |
|
xiaoxia
|
3b42f73737
|
rt
|
7 years ago |
|
xiaoxia
|
9fad179103
|
rt
|
7 years ago |
|
xiaoxia
|
46d31e9601
|
alphafine 1
|
7 years ago |
|
superman
|
1f72d549e9
|
Merge pull request #861 in BA/design from ~HZZZ/design:fix-REPORT-2600 to dev
* commit '8b8e30196ba1b8e8a7381db9b1b1d694fdef27c0':
remove unused code
fix
|
7 years ago |
|
hzzz
|
8b8e30196b
|
remove unused code
|
7 years ago |
|
hzzz
|
542d6f9980
|
fix
|
7 years ago |
|
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 |
|
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 |
|
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 |
