plough
|
aa379c8994
|
REPORT-2343 [代码质量]=>去掉无用代码
|
8 years ago |
plough
|
4700b3dc89
|
REPORT-2343 [代码质量]=>兼容之前的对象流读写
|
8 years ago |
plough
|
8cafb6397b
|
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取
|
8 years ago |
plough
|
5a05c497c7
|
REPORT-2343 [代码质量] 模板信息收集用xml方式保存与读取, 直接readObject不太好.
|
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
|
a28420f6a5
|
Merge pull request #827 in BA/design from ~YAOH.WU/design_0407:dev to dev
* commit '5f9cf7bb3f52d5c077f8ed48f006a12103e7346e':
无JIRA任务 组件复用之前master合到dev时丢失的代码以及组件复用近期bug修复
无任务 代码调整
report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题
|
8 years ago |
yaoh.wu
|
5f9cf7bb3f
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev
|
8 years ago |
yaoh.wu
|
6e352e28f6
|
无JIRA任务 组件复用之前master合到dev时丢失的代码以及组件复用近期bug修复
|
8 years ago |
superman
|
5bf72652e4
|
Merge pull request #815 in BA/design from ~ZHENG/design:dev to dev
* commit '711ccb4b7fe483b95424fcee58b5712103094255':
一个小警告
|
8 years ago |
fr_shine
|
711ccb4b7f
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev
|
8 years ago |
fr_shine
|
3471515bdd
|
一个小警告
|
8 years ago |
superman
|
da72d3d213
|
Merge pull request #813 in BA/design from ~MANGO/design:dev to dev
* commit '5f68195875d229f011c065c416d618243e60ea41':
加上之前合并冲突被删掉的国际化
修改设计器最大最小值,与releas分支同步
|
8 years ago |
mengao
|
5f68195875
|
加上之前合并冲突被删掉的国际化
|
8 years ago |
mengao
|
333fd83577
|
修改设计器最大最小值,与releas分支同步
|
8 years ago |
superman
|
cccc769692
|
Merge pull request #807 in BA/design from ~ZHENG/design:dev to dev
* commit '48723cc22006085f1b100318eeebb1e91f1fd4a4':
合并代码或者修改冲突时 merge错误 改回正确的
|
8 years ago |
fr_shine
|
48723cc220
|
合并代码或者修改冲突时 merge错误 改回正确的
|
8 years ago |
yaoh.wu
|
b67778a4de
|
无任务 代码调整
|
8 years ago |
superman
|
e0849e8a22
|
Merge pull request #804 in BA/design from ~ZHENG/design:dev to dev
* commit '8500d81bb5909bc3fd2eadbabc0b5621a385fb80':
font==null 也要注册监听器
|
8 years ago |
fr_shine
|
8500d81bb5
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev
|
8 years ago |
yaoh.wu
|
c0b8ac950d
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '79ade6642cb9e90f9ecfb010f11821abc05edf0a':
无JIRA任务, 冲突修正
|
8 years ago |
superman
|
79ade6642c
|
Merge pull request #803 in BA/design from ~NEIL/design:dev to dev
* commit '9dd806a40ff153526e1f6199bfcfd19e050c4127':
无JIRA任务, 冲突修正
|
8 years ago |
neil
|
9dd806a40f
|
无JIRA任务, 冲突修正
|
8 years ago |
yaoh.wu
|
380465ed6c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev
|
8 years ago |
yaoh.wu
|
40dbc0272f
|
report-1945frm本地组件复用:1、自适应或者tab布局时,不选中粘贴默认为上下平分左上角的组件;2、tab布局(有无参数面板)粘贴位置问题
|
8 years ago |
superman
|
75a3186262
|
Merge pull request #802 in BA/design from ~NEIL/design:master to dev
* commit 'd8daeae4047e1639dbf6e6cfbefec3dc6cc16123': (34 commits)
ct
ct
修复不能自定义参数面板控件标签的bug
调整布局
还原代码
调整布局
还原代码
REPORT-2171 表单里嵌套tab后, 滚动条丢失了, 所有自适应都这样
REPORT-2242 填报提交设置的若干问题修改
调整布局
调整布局
更改为aspectJ构建
还原修改
使用aspectJ构建
对import BoundsWidget进行修改以兼容老版本自适应插件和表单导出
REPORT-1858 frm组件隐藏
REPORT-2052 压缩部署加载插件逻辑重构 design 设计器安装的时候实时改变pluginconfig
无jira任务,屏蔽组件隐藏新功能
无JIRA任务, release设计器支持1.7jdk
REPORT-2052 漏传
...
|
8 years ago |
neil
|
d8daeae404
|
ct
|
8 years ago |
neil
|
df4d2f6786
|
ct
|
8 years ago |
fr_shine
|
d9379875b3
|
font==null 也要注册监听器
|
8 years ago |
superman
|
968caed926
|
Merge pull request #795 in BA/design from ~PLOUGH/design:dev to dev
* commit 'a9855863fc572055a4691ea55cb21cbc2b3e1995':
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
|
8 years ago |
superman
|
c63c8d0f91
|
Merge pull request #786 in BA/design from ~MANGO/design:dev to dev
* commit 'c3e8ef59f856ee702c91b98f464ffc600fc7fab0':
优化代码
修改国际化文件
修改国际化
修改国际化
修改国际化
增加国际化
修改国际化
地图添加缩放手势
还原修改部分design代码。
|
8 years ago |
plough
|
a9855863fc
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~plough/design into dev
|
8 years ago |
plough
|
4b04b8e018
|
REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID
|
8 years ago |
superman
|
8b580ae450
|
Merge pull request #794 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'ccc160a2d4fa02db7caf4537235b94e1f119d955':
编译等级为1.7 集合作为参数需指明类型
|
8 years ago |
yaoh.wu
|
ccc160a2d4
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design into dev
|
8 years ago |
yaoh.wu
|
4d9a3f4d8e
|
编译等级为1.7 集合作为参数需指明类型
|
8 years ago |
superman
|
343d75729e
|
Merge pull request #793 in BA/design from ~PLOUGH/design:dev to dev
* commit 'c19c243a73470b5d3298e87f6b122e9fe13ec482':
REPORT-1916 模板耗时=》调整代码
|
8 years ago |
mengao
|
c3e8ef59f8
|
解决冲突代码
|
8 years ago |
superman
|
984d1f62b5
|
Merge pull request #792 in BA/design from ~YAOH.WU/design:dev to dev
* commit 'ae78f289b6c4c4b23c590313e4b9785f77706707':
FRM组件复用自适应布局bug修复,不能粘贴时弹窗提示
report-1945 frm组件复用绝对布局bug处理
|
8 years ago |
mengao
|
d87f31dc18
|
优化代码
|
8 years ago |
plough
|
c19c243a73
|
REPORT-1916 模板耗时=》调整代码
|
8 years ago |
mengao
|
fd561ac02b
|
修改国际化文件
|
8 years ago |
mengao
|
8d16643d87
|
修改国际化
|
8 years ago |
mengao
|
ae6c1291eb
|
修改国际化
|
8 years ago |
mengao
|
7660db78bb
|
修改国际化
|
8 years ago |
mengao
|
c425cf94e5
|
增加国际化
|
8 years ago |
yaoh.wu
|
ae78f289b6
|
FRM组件复用自适应布局bug修复,不能粘贴时弹窗提示
|
8 years ago |
mengao
|
db32155dad
|
修改国际化
|
8 years ago |
mengao
|
fcf2f0884e
|
地图添加缩放手势
|
8 years ago |
mengao
|
552720bc96
|
还原修改部分design代码。
|
8 years ago |