daniel
|
fcc61c8db0
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit 'fdfef6ef0a18f049f9fee481c1b432ffd50fa754':
REPORT-1095 超链平台内打开插件卸载后设计这边会看到fs_self这样的字符串,打开方式是枚举的,不需要最后的else的。修改一下
获取plotTypePane标题名
update
在构建下拉框时,就考虑到是否处于切换模式
update
update
模板参数触发界面更新
|
8 years ago |
plough
|
395f78d2e2
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~plough/design
|
8 years ago |
superman
|
fdfef6ef0a
|
Merge pull request #600 in BA/design from ~ZACK/design:dev to dev
* commit '48ce7996135896ae8965a82065b32512ac3e04cc':
REPORT-1095 超链平台内打开插件卸载后设计这边会看到fs_self这样的字符串,打开方式是枚举的,不需要最后的else的。修改一下
|
8 years ago |
superman
|
e6832149ae
|
Merge pull request #599 in BA/design from ~XIAOHU/design:dev to dev
* commit '4bd7111e6c1ac2bb4c080dfa2591560914a6827f':
获取plotTypePane标题名
|
8 years ago |
rinoux
|
7482b3f9e6
|
加入设计器启动打开文件的接口
|
8 years ago |
zack
|
48ce799613
|
REPORT-1095 超链平台内打开插件卸载后设计这边会看到fs_self这样的字符串,打开方式是枚举的,不需要最后的else的。修改一下
|
8 years ago |
Fangjie Hu
|
4bd7111e6c
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
Fangjie Hu
|
dcc4c63bdf
|
获取plotTypePane标题名
|
8 years ago |
superman
|
e225c155d0
|
Merge pull request #598 in BA/design from ~VITO/design:master to master
* commit '96f01dc0b733ad07d973d921d26824730bffc573':
REPORT-1222 - 表单界面图表浮动面板不随主窗口变化位置
|
8 years ago |
vito
|
96f01dc0b7
|
REPORT-1222 - 表单界面图表浮动面板不随主窗口变化位置
|
8 years ago |
superman
|
965da42791
|
Merge pull request #597 in BA/design from ~VITO/design:master to master
* commit '51c7715dc123f523f4ba1822d96ff1262018960c':
pmd
REPORT-1220 修复表单界面的图表和控件悬浮面板点击其他位置不消失的问题
|
8 years ago |
vito
|
51c7715dc1
|
pmd
|
8 years ago |
vito
|
2a79bb30da
|
REPORT-1220 修复表单界面的图表和控件悬浮面板点击其他位置不消失的问题
|
8 years ago |
plough
|
df55f1e33f
|
REPORT-1178 英文国际化——1/23
|
8 years ago |
superman
|
b6ff009675
|
Merge pull request #596 in BA/design from ~XIAOHU/design:dev to dev
* commit '2ec2f5617da1ce6695cad8bdaee7b6253706dae8':
update
在构建下拉框时,就考虑到是否处于切换模式
update
update
模板参数触发界面更新
|
8 years ago |
Fangjie Hu
|
2ec2f5617d
|
update
|
8 years ago |
Fangjie Hu
|
cb55c20c56
|
在构建下拉框时,就考虑到是否处于切换模式
|
8 years ago |
superman
|
f0eaec514b
|
Merge pull request #4 in PF/design from ~JU/pr-design:dev to dev
* commit '8974e4eb3121aa2e0344a7bb33a81e5a2893d41a':
国际化位置
国际化位置
|
8 years ago |
juhaoyu
|
8974e4eb31
|
国际化位置
|
8 years ago |
juhaoyu
|
c612982ac4
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
juhaoyu
|
618303fd74
|
国际化位置
|
8 years ago |
daniel
|
27b1ba148e
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '63e9c83c8dd0f7202f3fbeb5f048b4b92c83e4de':
无JIRA任务, master到dev的几个冲突.
|
8 years ago |
superman
|
63e9c83c8d
|
Merge pull request #595 in BA/design from ~NEIL/design:dev to dev
* commit '3275137a96c52ed15c6af220ca7d150e5ad01b40':
无JIRA任务, master到dev的几个冲突.
|
8 years ago |
neil
|
3275137a96
|
无JIRA任务, master到dev的几个冲突.
|
8 years ago |
superman
|
f7010cceb6
|
Merge pull request #594 in BA/design from ~ZHENG/design:master to master
* commit '4491ba813d030f06ad52c17d1403503d92c29372':
国际化
|
8 years ago |
superman
|
fd71b753ae
|
Merge pull request #593 in BA/design from ~NEIL/design:master to master
* commit '2c371d74c40cf79e6ab2bd308ff7067a9ee9d9c5':
无JIRA任务, 不兼容的API
|
8 years ago |
fr_shine
|
4491ba813d
|
国际化
|
8 years ago |
neil
|
2c371d74c4
|
无JIRA任务, 不兼容的API
|
8 years ago |
daniel
|
51f0649c13
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
daniel
|
f4e1482b2c
|
Merging in latest from upstream (BA/design:refs/heads/dev)
* commit '4352586e6b17d902164b060f78e1287629efe8f8': (149 commits)
无JIRA任务, build failed
无JIRA任务, build failed
pmd
pmd
ct
无JIRA任务, 修复合并冲突
REPORT-1097 pmd
REPORT-1097 超链支持在平台内标签打开
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
REPORT-884 绝对布局,参数面板控件可以拖到下面与组件重叠
rt
rt
rt
1
1
REPORT-912 单元格数据进度条
REPORT-1147 脚本更新问题
REPORT-1147 脚本更新问题
test
测试
...
|
8 years ago |
Fangjie Hu
|
eb66d714bb
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
superman
|
4352586e6b
|
Merge pull request #592 in BA/design from ~NEIL/design:dev to dev
* commit '46e1e1f0452346401f3690539ffbe9eb3e89df4c':
无JIRA任务, build failed
无JIRA任务, build failed
|
8 years ago |
neil
|
46e1e1f045
|
无JIRA任务, build failed
|
8 years ago |
neil
|
11d2469cc5
|
无JIRA任务, build failed
|
8 years ago |
superman
|
e32b9f3ca5
|
Merge pull request #591 in BA/design from ~NEIL/design:release to dev
* commit 'e36b2fdbf903fc674d2281c3c46a223588b17c13': (135 commits)
pmd
pmd
ct
无JIRA任务, 修复合并冲突
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
rt
rt
rt
1
REPORT-1147 脚本更新问题
test
测试
调试
调试
1
无JIRA任务, build failed
REPORT-1092 两个一样的表单demo,预览的效果不一样 pmd
无JIRA任务, 国际化
pmd
REPORT-1092 两个一样的表单demo,预览的效果不一样 dev上测试验收过了,同步到master
...
|
8 years ago |
neil
|
e36b2fdbf9
|
pmd
|
8 years ago |
neil
|
717ce11090
|
pmd
|
8 years ago |
superman
|
2dd43cd67d
|
Merge pull request #588 in BA/design from ~ZACK/design:dev to dev
* commit '3ae0adb1c0e8c54e9b3f0750acb208e204f47421':
REPORT-1097 pmd
REPORT-1097 超链支持在平台内标签打开
|
8 years ago |
neil
|
72cb528a77
|
ct
|
8 years ago |
superman
|
99e0497e43
|
Merge pull request #589 in BA/design from ~NEIL/design:master to master
* commit '805fe40f14451f4d5d1b6ed7943cc55ce61bd098':
无JIRA任务, 修复合并冲突
|
8 years ago |
neil
|
805fe40f14
|
无JIRA任务, 修复合并冲突
|
8 years ago |
zack
|
3ae0adb1c0
|
REPORT-1097 pmd
|
8 years ago |
zack
|
779b71ee28
|
REPORT-1097 超链支持在平台内标签打开
|
8 years ago |
superman
|
2d164d9a82
|
Merge pull request #587 in BA/design from ~VITO/design:master to master
* commit '86bea80f192d53f286b25b423a78d8c350a72565':
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
|
8 years ago |
vito
|
86bea80f19
|
REPORT-1181 mac10.12和javafx弹出框初始化时会有大几率卡死在native方法,这里先屏蔽一下。
|
8 years ago |
daniel
|
48ecf5af59
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/ba/design into dev
|
8 years ago |
superman
|
c443d01021
|
Merge pull request #586 in BA/design from ~ZHOUPING/design:dev to dev
* commit 'f28682f0865bdec3aca99919455d069d09db73e2':
REPORT-884 绝对布局,参数面板控件可以拖到下面与组件重叠
|
8 years ago |
zhouping
|
f28682f086
|
REPORT-884 绝对布局,参数面板控件可以拖到下面与组件重叠
|
8 years ago |
superman
|
a29d48940a
|
Merge pull request #585 in BA/design from ~XIAOXIA/design:master to master
* commit '043fa45d59115656a4615ed1babbd096c4491577':
rt
rt
rt
|
8 years ago |
xiaoxia
|
043fa45d59
|
rt
|
8 years ago |