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 |
neil
|
89240801d5
|
ct
|
8 years ago |
neil
|
22aa93fff2
|
1
|
8 years ago |
neil
|
a4788f9f94
|
ct
|
8 years ago |
superman
|
acc9e2f3e9
|
Merge pull request #840 in BA/design from ~ZHOUPING/design:release to release
* commit '589725a8dd2b624c33cd78fa0fe93c65aab3ede5':
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
|
8 years ago |
zhouping
|
589725a8dd
|
REPORT-2526 tab交互改良后续--tab页签调整的视觉调整
|
8 years ago |
plough
|
a574cb0b6d
|
REPORT-2343 [代码质量]=>去掉多余代码
|
8 years ago |
plough
|
ef7543f1f8
|
REPORT-2343 [代码质量]=>多次出现的字符串改为常量;统一命名
|
8 years ago |
superman
|
b92e73fab5
|
Merge pull request #839 in BA/design from ~XIAOXIA/design:release to release
* commit 'ba60f5ad9a0efa80d8e2d5201ddedd8f634620fd':
框选改错啦。
|
8 years ago |
XiaXiang
|
ba60f5ad9a
|
框选改错啦。
|
8 years ago |
superman
|
164ab84a63
|
Merge pull request #838 in BA/design from ~ZACK/design:release to release
* commit 'f7b05c896eaae670a010e1a471b755d25ad4ef66':
无JIRA任务 master的boundsWidget到release
|
8 years ago |
plough
|
aa379c8994
|
REPORT-2343 [代码质量]=>去掉无用代码
|
8 years ago |
plough
|
4700b3dc89
|
REPORT-2343 [代码质量]=>兼容之前的对象流读写
|
8 years ago |
zack
|
f7b05c896e
|
无JIRA任务 master的boundsWidget到release
|
8 years ago |
plough
|
8cafb6397b
|
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取
|
8 years ago |
superman
|
a3febba2ed
|
Merge pull request #837 in BA/design from ~ZACK/design:9.0 to 9.0
* commit 'd2aeed1f1287138c88b6a77b733300bdd8aae24d':
REPORT-1305 在线导入excel自定义行列design部分
|
8 years ago |
zack
|
d2aeed1f12
|
REPORT-1305 在线导入excel自定义行列design部分
|
8 years ago |
superman
|
68e161a02d
|
Merge pull request #836 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit 'cf4578290587ce36978d813593879f1ba1f4eb7c':
pmd
启动时会将初始化的颜色添加到历史颜色中,不需要这样做
|
8 years ago |
yaoh.wu
|
cf45782905
|
pmd
|
8 years ago |
yaoh.wu
|
37b19cce1d
|
启动时会将初始化的颜色添加到历史颜色中,不需要这样做
|
8 years ago |
superman
|
b4ee0ddb04
|
Merge pull request #835 in BA/design from ~XIAOXIA/design:release to release
* commit 'c96943543ece4080e6294d7847a7c5e325075a2e':
控件的框选问题
|
8 years ago |
XiaXiang
|
c96943543e
|
控件的框选问题
|
8 years ago |
superman
|
248ce0345a
|
Merge pull request #834 in BA/design from ~YAOH.WU/design_0407:release to release
* commit 'c0c2ed2f6033a68d233b0cf4c538a9536396ba17':
REPORT-2381 客户bug历史遗留问题,空指针引发控件属性面板生成失败最终导致报表切换失败
|
8 years ago |
yaoh.wu
|
c0c2ed2f60
|
REPORT-2381 客户bug历史遗留问题,空指针引发控件属性面板生成失败最终导致报表切换失败
|
8 years ago |
plough
|
5a05c497c7
|
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取, 直接readObject不太好.
|
8 years ago |
superman
|
a67717a1ae
|
Merge pull request #832 in BA/design from ~SYOKI/design:release to release
* commit '9a6bc3f93dd325e7c3c46581983f742f26aef02a':
国际化修改 日文 design部分 第1-200个key修改翻译 庄奇 syoki
|
8 years ago |
syoki
|
9a6bc3f93d
|
国际化修改 日文 design部分 第1-200个key修改翻译 庄奇 syoki
|
8 years ago |
superman
|
a41dcf7bee
|
Merge pull request #831 in BA/design from ~YAOH.WU/design_0407:release to release
* commit 'c72bb1de5577f4dc1ba591fed5238d69778e76b6':
组件复用边界粘贴,之前考虑的片面了,修改下
|
8 years ago |
yaoh.wu
|
c72bb1de55
|
组件复用边界粘贴,之前考虑的片面了,修改下
|
8 years ago |
superman
|
ce255bccc8
|
Merge pull request #830 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit 'a5769fe4679a35212ac3235fa8f823bac87a753a':
REPORT-934颜色记住正确但是显示错误修复和部分代码调整
|
8 years ago |
yaoh.wu
|
a5769fe467
|
REPORT-934颜色记住正确但是显示错误修复和部分代码调整
|
8 years ago |
superman
|
2babd72f99
|
Merge pull request #829 in BA/design from ~YAOH.WU/design_0407:release to release
* commit '049e74143bdceb0424daacca62891c528922d085':
组件复用边界复制
REPORT-2273 远程设计数据库连接成功,预览报错,datasourcexml保存失败问题修复
|
8 years ago |
yaoh.wu
|
049e74143b
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into release
|
8 years ago |