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 |
|
xiaoxia
|
806642fddb
|
rt
|
8 years ago |
|
xiaoxia
|
29043be8ee
|
rt
|
8 years ago |
sunmondong
|
0a1e4b4cf6
|
构建文件添加src
|
8 years ago |
|
superman
|
d78ac7f529
|
Merge pull request #579 in BA/design from ~LEE/design_master:master to master
* commit '38a3b913430d64358c9e55e5cded3132debaee5c':
1
REPORT-1147 脚本更新问题
|
8 years ago |
|
superman
|
cef905b84d
|
Merge pull request #584 in BA/design from ~LEE/design_master:dev to dev
* commit 'e6bc21d46b0e38501341f0ddd40642ea866b62b4':
1
REPORT-1147 脚本更新问题
|
8 years ago |
PanLi320
|
e6bc21d46b
|
1
1
|
8 years ago |
|
PanLi320
|
38a3b91343
|
1
1
|
8 years ago |
|
superman
|
e6adcb52ae
|
Merge pull request #582 in BA/design from ~ZHOUPING/design:dev to dev
* commit '75eb75123acef6bdc7827556eb063a49567e065a':
REPORT-912 单元格数据进度条
|
8 years ago |
|
sunmondong
|
0d6e14c271
|
applet去除performance工程
|
8 years ago |
|
sunmondong
|
5d381d4fd5
|
no message
|
8 years ago |
|
zhouping
|
75eb75123a
|
REPORT-912 单元格数据进度条
|
8 years ago |
|
Fangjie Hu
|
d4e041f4f6
|
update
|
8 years ago |
|
Fangjie Hu
|
04839878cb
|
update
|
8 years ago |
|
Fangjie Hu
|
ac2cfb0111
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~xiaohu/design into dev
|
8 years ago |
|
Fangjie Hu
|
065ba517f0
|
模板参数触发界面更新
|
8 years ago |
|
PanLi320
|
9d239159e9
|
REPORT-1147 脚本更新问题
最初是为了解决，插件更新和安装下会出现plugin的数组读取两遍的问题，所以在哪个地方加个强制的判断，当时的解决方案是可为两个，还有一个是在脚本
中加入sort处理。后来vito那边找到出现问题的核心点，在于pane部分加载两次，导致脚本数组加载两次，那这边的就去掉这边的判断，因为会导致脚
本更新问题。
|
8 years ago |
|
PanLi320
|
7a1ba002e3
|
REPORT-1147 脚本更新问题
最初是为了解决，插件更新和安装下会出现plugin的数组读取两遍的问题，所以在哪个地方加个强制的判断，当时的解决方案是可为两个，还有一个是在脚本
中加入sort处理。后来vito那边找到出现问题的核心点，在于pane部分加载两次，导致脚本数组加载两次，那这边的就去掉这边的判断，因为会导致脚
本更新问题。
|
8 years ago |
|
sunmondong
|
b0791ddf83
|
test
|
8 years ago |
|
sunmondong
|
9a5fdfcfb6
|
测试
|
8 years ago |
|
sunmondong
|
7dc4888d11
|
调试
|
8 years ago |
|
sunmondong
|
0dec03fb65
|
调试
|
8 years ago |
|
superman
|
6331508015
|
Merge pull request #576 in BA/design from ~ZHOUPING/design:dev to dev
* commit '63c4ca272cd745a548f84da6dc7a222db787f4fc':
无JIRA任务 修复绝对布局嵌套的问题
|
8 years ago |
|
superman
|
4a072c3e7e
|
Merge pull request #577 in BA/design from ~NEIL/design:master to master
* commit '2c96734c35c3ec6174a7f4e959e59a40997c1a82':
1
无JIRA任务， build failed
|
8 years ago |
|
neil
|
2c96734c35
|
1
|
8 years ago |
|
neil
|
77f07e99c9
|
Merge branch 'master' of http://www.finedevelop.com:2015/scm/~neil/design
|
8 years ago |
|
neil
|
68a3ecdfa9
|
无JIRA任务， build failed
|
8 years ago |
