design

Commit Graph

Author	SHA1	Message	Date
superman	8c5e96aaa3	Merge pull request #818 in BA/design from ~ZACK/design:master to master * commit '08069fbfe0b9d75a73bc51eb4557246368826851': 无JIRA任务解决代码冲突	7 years ago
zack	08069fbfe0	无JIRA任务解决代码冲突	7 years ago
superman	f981f8f59a	Merge pull request #817 in BA/design from ~PAUL/design:master to master * commit '81e1e4ea8fb8f0444c69e188c17e906406e97572': (80 commits) 无JIRA任务屏蔽新翻页 REPORT-2220 数据连接用户名和密码可以传参修改修改代码修改最大最小值值定义，兼容vancharts插件国际化修改部分未翻译字段翻译庄奇 201704130221 REPORT-2344 国际化——繁体设计器少了key report-1945,tab\|自适应,无组件时粘贴问题 report-1945 自适应无组件是粘贴失败修复组件复用层叠顺序新添加的组件在上方无任务代码调整 report-1945frm本地组件复用：1、自适应或者tab布局时，不选中粘贴默认为上下平分左上角的组件；2、tab布局（有无参数面板）粘贴位置问题国际化修改 design部分庄奇 201704110018 REPORT-2334 表单tab布局中图表放大缩小会明显 REPORT-1916 模板耗时=》修复初次保存模板时，没有保存ID的bug report-1945组件复用bug REPORT-1916 模板耗时=》给TemplateInfoCollector加上serialVersionUID 修改国际化调整代码 REPORT-1916 模板耗时=》调整代码；发送数据失败时，输出日志 ...	7 years ago
paul	81e1e4ea8f	Merge branch 'release' # Conflicts: # designer_base/src/com/fr/design/locale/designer.properties # designer_base/src/com/fr/design/locale/designer_en_US.properties # designer_base/src/com/fr/design/locale/designer_ja_JP.properties # designer_base/src/com/fr/design/locale/designer_ko_KR.properties # designer_base/src/com/fr/design/locale/designer_zh_CN.properties # designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java # designer_chart/src/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java # designer_form/src/com/fr/design/designer/beans/adapters/layout/FRAbsoluteLayoutAdapter.java # designer_form/src/com/fr/design/designer/beans/adapters/layout/FRFitLayoutAdapter.java # designer_form/src/com/fr/design/designer/beans/location/AccessDirection.java # designer_form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java	7 years ago
superman	789f00bbb6	Merge pull request #816 in BA/design from ~ZACK/design:release to release * commit 'c247eeac6a60cd0468fb78e451fe307a2feaef50': 无JIRA任务屏蔽新翻页	7 years ago
zack	c247eeac6a	无JIRA任务屏蔽新翻页	7 years ago
superman	5bf72652e4	Merge pull request #815 in BA/design from ~ZHENG/design:dev to dev * commit '711ccb4b7fe483b95424fcee58b5712103094255': 一个小警告	7 years ago
fr_shine	711ccb4b7f	Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev	7 years ago
fr_shine	3471515bdd	一个小警告	7 years ago
superman	6a81ab2bfe	Merge pull request #814 in BA/design from ~KERRY/design:release to release * commit 'eb1e45d12a80607f26384b9c11f89e6ec245b461': REPORT-2220 数据连接用户名和密码可以传参	7 years ago
kerry	eb1e45d12a	Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release	7 years ago
kerry	be48bf4b29	REPORT-2220 数据连接用户名和密码可以传参	7 years ago
superman	da72d3d213	Merge pull request #813 in BA/design from ~MANGO/design:dev to dev * commit '5f68195875d229f011c065c416d618243e60ea41': 加上之前合并冲突被删掉的国际化修改设计器最大最小值，与releas分支同步	7 years ago
superman	264f742f47	Merge pull request #811 in BA/design from ~SYOKI/design:release to release * commit '55ddfd87dcf16703d8326d4ade2a15509f075889': 国际化修改部分未翻译字段翻译庄奇 201704130221	7 years ago
mengao	5f68195875	加上之前合并冲突被删掉的国际化	7 years ago
mengao	333fd83577	修改设计器最大最小值，与releas分支同步	7 years ago
superman	631c3c8e81	Merge pull request #812 in BA/design from ~MANGO/design:release to release * commit '814bea2e11f20cb32f895aa3d9792684fcaf8045': 修改修改代码修改最大最小值值定义，兼容vancharts插件	7 years ago
mengao	814bea2e11	修改	7 years ago
mengao	469bcc513d	修改代码	7 years ago
mengao	3a0894ea9e	Merge remote-tracking branch 'origin/release' into release	7 years ago
mengao	cc43c53143	修改最大最小值值定义，兼容vancharts插件	7 years ago
syoki	55ddfd87dc	国际化修改部分未翻译字段翻译庄奇 201704130221	7 years ago
superman	04f0fb00f2	Merge pull request #810 in BA/design from ~PLOUGH/design:release to release * commit '50dd30c362cd0804b5af586cd8e0362e50980c3a': REPORT-2344 国际化——繁体设计器少了key	7 years ago
plough	50dd30c362	REPORT-2344 国际化——繁体设计器少了key	7 years ago
superman	88bd7eeae5	Merge pull request #809 in BA/design from ~YAOH.WU/design_0407:release to release * commit '76d1d2fc4a7cd5f92868dcd1bbb301aafb30bf6e': report-1945,tab\|自适应,无组件时粘贴问题	7 years ago
yaoh.wu	76d1d2fc4a	Merge branch 'release' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into release	7 years ago
yaoh.wu	25116d6466	report-1945,tab\|自适应,无组件时粘贴问题	7 years ago
superman	ff07cc70aa	Merge pull request #808 in BA/design from ~YAOH.WU/design_0407:release to release * commit '03ae87935a5ce59af7fc70aee38b21d88821ed91': report-1945 自适应无组件是粘贴失败修复	7 years ago
yaoh.wu	03ae87935a	report-1945 自适应无组件是粘贴失败修复	7 years ago
superman	cccc769692	Merge pull request #807 in BA/design from ~ZHENG/design:dev to dev * commit '48723cc22006085f1b100318eeebb1e91f1fd4a4': 合并代码或者修改冲突时 merge错误改回正确的	7 years ago
fr_shine	48723cc220	合并代码或者修改冲突时 merge错误改回正确的	7 years ago
superman	455c766b18	Merge pull request #806 in BA/design from ~YAOH.WU/design_0407:release to release * commit '228d8bb8e8865d78257a6aa825529ce26bdb4fc3': 组件复用层叠顺序新添加的组件在上方无任务代码调整 report-1945frm本地组件复用：1、自适应或者tab布局时，不选中粘贴默认为上下平分左上角的组件；2、tab布局（有无参数面板）粘贴位置问题	7 years ago
yaoh.wu	228d8bb8e8	组件复用层叠顺序新添加的组件在上方	7 years ago
yaoh.wu	cc99e7d54f	无任务代码调整	7 years ago
yaoh.wu	6a9cec9bb3	report-1945frm本地组件复用：1、自适应或者tab布局时，不选中粘贴默认为上下平分左上角的组件；2、tab布局（有无参数面板）粘贴位置问题	7 years ago
yaoh.wu	b67778a4de	无任务代码调整	7 years ago
superman	6190eb5ca7	Merge pull request #805 in BA/design from ~SYOKI/design:release to release * commit '9d5bdf6f595604b4ad0e39772736b1e733b1f313': 国际化修改 design部分庄奇 201704110018	7 years ago
superman	e0849e8a22	Merge pull request #804 in BA/design from ~ZHENG/design:dev to dev * commit '8500d81bb5909bc3fd2eadbabc0b5621a385fb80': font==null 也要注册监听器	7 years ago
syoki	9d5bdf6f59	国际化修改 design部分庄奇 201704110018	7 years ago
fr_shine	8500d81bb5	Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~zheng/design into dev	7 years ago
yaoh.wu	c0b8ac950d	Merging in latest from upstream (BA/design:refs/heads/dev) * commit '79ade6642cb9e90f9ecfb010f11821abc05edf0a': 无JIRA任务，冲突修正	7 years ago
superman	79ade6642c	Merge pull request #803 in BA/design from ~NEIL/design:dev to dev * commit '9dd806a40ff153526e1f6199bfcfd19e050c4127': 无JIRA任务，冲突修正	7 years ago
neil	9dd806a40f	无JIRA任务，冲突修正	7 years ago
yaoh.wu	380465ed6c	Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~yaoh.wu/design_0407 into dev	7 years ago
yaoh.wu	40dbc0272f	report-1945frm本地组件复用：1、自适应或者tab布局时，不选中粘贴默认为上下平分左上角的组件；2、tab布局（有无参数面板）粘贴位置问题	7 years ago
superman	55dc340af3	Merge pull request #801 in BA/design from ~ZHOUPING/design:release to release * commit '5c1674ce9e38bfbe79442cffc4560c62607bab52': REPORT-2334 表单tab布局中图表放大缩小会明显	7 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 漏传 ...	7 years ago
neil	d8daeae404	ct	7 years ago
neil	df4d2f6786	ct	7 years ago
zhouping	5c1674ce9e	Merge branch 'release' of http://www.finedevelop.com:2015/scm/~zhouping/design into release	7 years ago

... 3 4 5 6 7 ...

2740 Commits (89564565cdd5098aa3fc242859a3baed3a9c357d) All Branches Search

2740 Commits (89564565cdd5098aa3fc242859a3baed3a9c357d)

All Branches