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 |
|
xiaoxia
|
3b42f73737
|
rt
|
8 years ago |
|
xiaoxia
|
9fad179103
|
rt
|
8 years ago |
|
xiaoxia
|
46d31e9601
|
alphafine 1
|
8 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
|
8 years ago |
hzzz
|
8b8e30196b
|
remove unused code
|
8 years ago |
|
hzzz
|
542d6f9980
|
fix
|
8 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
|
8 years ago |
|
hzzz
|
999d5e2b52
|
fix
|
8 years ago |
|
hzzz
|
87c302e4a5
|
fix
|
8 years ago |
|
hzzz
|
ad1e62a59c
|
..
|
8 years ago |
|
hzzz
|
810686c8a3
|
fix PMD
|
8 years ago |
|
hzzz
|
45adf67ff3
|
fix REPORT-2600
|
8 years ago |
|
superman
|
6f14124119
|
Merge pull request #857 in BA/design from ~VITO/design:dev to dev
* commit '46970b0d890e4e6e46917c1b7bcf432c8bda0ffe':
无jira任务 应用补丁的时候有一个没有删除
|
8 years ago |
vito
|
46970b0d89
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~vito/design into dev
|
8 years ago |
|
vito
|
52ab6e88eb
|
无jira任务 应用补丁的时候有一个没有删除
|
8 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 插件管理界面以及右上角的登录界面，多次点击后，页面无法关闭
|
8 years ago |
|
vito
|
f51dbd6c26
|
移到designer_base
|
8 years ago |
|
vito
|
25521cf932
|
pmd
|
8 years ago |
|
vito
|
33ab06ff91
|
REPORT-2213 设计器右上角使用qq登录后，登录界面关不掉 & 这部分的代码质量
|
8 years ago |
|
vito
|
3b736749f5
|
REPORT-2335 插件管理界面以及右上角的登录界面，多次点击后，页面无法关闭
|
8 years ago |
|
superman
|
43cc133efd
|
Merge pull request #853 in BA/design from ~PLOUGH/design:dev to dev
* commit '4da0c31392e79f93176e17c5514afcbe166006fb':
REPORT-1885 frm跑马灯=>默认字体由textPane确定，不写死
|
8 years ago |
|
superman
|
a1e554787b
|
Merge pull request #854 in BA/design from ~ZACK/design:dev to dev
* commit 'ef2079a7a6ce2ca48eaa5b874af3b1e05857c47c':
无JIRA任务 合并代码时的错误覆盖
|
8 years ago |
zack
|
ef2079a7a6
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zack/design
|
8 years ago |
|
zack
|
534b886a02
|
无JIRA任务 合并代码时的错误覆盖
|
8 years ago |
plough
|
4da0c31392
|
REPORT-1885 frm跑马灯=>默认字体由textPane确定，不写死
|
8 years ago |
|
superman
|
7008f3f381
|
Merge pull request #850 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '8ce956556f22a5fc2390b193beb095a74c6ad4fa':
无任务，pmd
REPORT-2537 多层次部门工具栏权限细粒度设置不生效
|
8 years ago |
 yaoh.wu
|
8ce956556f
|
无任务，pmd
|
8 years ago |
|
yaoh.wu
|
3f32486fd8
|
REPORT-2537 多层次部门工具栏权限细粒度设置不生效
|
8 years ago |
|
superman
|
5fd8b730d6
|
Merge pull request #848 in BA/design from ~PLOUGH/design:dev to dev
* commit 'dcca8399030548c1315abbf7bf88ad54cf0e5120':
REPORT-2483 国际化key转移；去掉空白行
|
8 years ago |
|
plough
|
dcca839903
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
|
plough
|
c7217f2f6a
|
REPORT-2483 国际化key转移；去掉空白行
|
8 years ago |
|
superman
|
5149516688
|
Merge pull request #847 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '329d11029ab8c9dff04a09364255e03b692d6df0':
无任务，冲突调整，release到dev
|
8 years ago |
|
yaoh.wu
|
329d11029a
|
无任务，冲突调整，release到dev
|
8 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任务，解决冲突
|
8 years ago |
|
plough
|
53f18866a2
|
无JIRA任务，国际化，把release、master中的key合并到dev中
|
8 years ago |
|
plough
|
860bfde6bc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
|
plough
|
ee26840e53
|
无JIRA任务，解决冲突
|
8 years ago |
|
superman
|
3cde36a1ad
|
Merge pull request #833 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a574cb0b6de6a0c358581086c4e659707f2f8182':
REPORT-2343 [代码质量]=>去掉多余代码
REPORT-2343 [代码质量]=>多次出现的字符串改为常量；统一命名
REPORT-2343 [代码质量]=>去掉无用代码
REPORT-2343 [代码质量]=>兼容之前的对象流读写
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取, 直接readObject不太好.
|
8 years ago |
|
superman
|
7597e86eba
|
Merge pull request #843 in BA/design from ~NEIL/design:release to dev
* commit '487e1b17c31dec3809a4581d75b439a0043c1774': (60 commits)
ct
ct
ct
ct
1
ct
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
框选改错啦。
无JIRA任务 master的boundsWidget到release
控件的框选问题
REPORT-2381 客户bug历史遗留问题，空指针引发控件属性面板生成失败最终导致报表切换失败
国际化修改 日文 design部分 第1-200个key修改翻译 庄奇 syoki
组件复用边界粘贴，之前考虑的片面了，修改下
组件复用边界复制
REPORT-2273 远程设计数据库连接成功，预览报错，datasourcexml保存失败问题修复
REPORT-2368 修改控件设置界面对“基本属性”面板的初始化
REPORT-2368 预定义控件设置了不可见，在参数面板上还是可见的
REPORT-1344 命名规范
无jira任务，代码被误杀了
report-1945 frm本地组件复用
...
|
8 years ago |
neil
|
487e1b17c3
|
ct
|
8 years ago |
|
neil
|
d0ebad3d07
|
ct
|
8 years ago |
|
neil
|
7801180007
|
Merge pull request #1 in ~NEIL/design from master to release
* commit '89240801d5b1d94e66d95824c6d4499c8143e8fe': (39 commits)
ct
无jira任务，代码被误杀了
report-1945 frm本地组件复用
面板中增加一些接口方法（Vancharts新插件发布需要，eason与FR商讨确认，可以直接修改master）
REPORT-2430 master收集的模板信息日志显示删掉
无JIRA任务 解决代码冲突
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
调整布局
还原代码，修改客户bug
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
更改为aspectJ构建
还原修改
使用aspectJ构建
...
|
8 years ago |
|
neil
|
b828924647
|
ct
|
8 years ago |
