superman
|
5deeddb813
|
Merge pull request #925 in BA/design from ~PLOUGH/design:dev to dev
* commit 'd70e9db8be9647ffe3fec3266d6ae11191017963':
REPORT-2561 大屏-数字时钟插件，属性表左移，调整
|
7 years ago |
plough
|
d70e9db8be
|
REPORT-2561 大屏-数字时钟插件，属性表左移，调整
|
7 years ago |
daniel
|
7a0b1d9d0a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
7 years ago |
sunmondong
|
447bfbc093
|
更改lib依赖
|
7 years ago |
|
superman
|
e50b8f99f8
|
Merge pull request #923 in BA/design from ~PLOUGH/design:dev to dev
* commit '5dda04e93b7a2e83a057d5abd171a02e18b41316':
REPORT-2561 大屏-数字时钟插件，属性表左移
|
7 years ago |
|
plough
|
5dda04e93b
|
REPORT-2561 大屏-数字时钟插件，属性表左移
|
7 years ago |
|
daniel
|
77fc8abc23
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
7 years ago |
|
superman
|
425cad6636
|
Merge pull request #920 in BA/design from ~SYOKI/design:release to release
* commit '890a2a512e55895734e9efe8349fb5a6344f131c':
【国际化修改】 根据代理商的意见修改design部分的翻译 庄奇20170606
|
7 years ago |
syoki
|
890a2a512e
|
【国际化修改】 根据代理商的意见修改design部分的翻译 庄奇20170606
|
7 years ago |
|
superman
|
b9eeb8996f
|
Merge pull request #919 in BA/design from ~JU/ba-dev-design:dev to dev
* commit 'f18b20cd96bf6cb86ca5e0fc7968eda974949d12':
比较版本号
版本比较： 10.0 > 9.0 1.10 > 1.9 1.1.2 > 1.1.1 1.1.1 > 1.1
|
7 years ago |
juhaoyu
|
f18b20cd96
|
比较版本号
|
7 years ago |
|
juhaoyu
|
e51f528646
|
版本比较：
10.0 > 9.0
1.10 > 1.9
1.1.2 > 1.1.1
1.1.1 > 1.1
|
7 years ago |
mengao
|
ff20b64864
|
删除多余类
|
7 years ago |
|
mengao
|
4c91a0b9c9
|
去掉部分代码
|
7 years ago |
|
mengao
|
30bae7a43f
|
去掉多余代码
|
7 years ago |
|
mengao
|
db283848a0
|
去掉接口代码中instnceof，用泛型代替。
|
7 years ago |
|
superman
|
86fa8414b7
|
Merge pull request #915 in BA/design from ~NEIL/design:release to release
* commit '6774ed2d4f107734b3dbf9bf9dea3fab6851bd8c':
无JIRA任务， 论坛消息屏蔽
|
7 years ago |
|
superman
|
b191a4c69d
|
Merge pull request #916 in BA/design from ~NEIL/design:master to master
* commit '3c0d59b5e406b716f04975bace0cf8860796c81e':
无JIRA任务， 合代码漏了一个.
|
7 years ago |
neil
|
6774ed2d4f
|
无JIRA任务， 论坛消息屏蔽
|
7 years ago |
|
neil
|
3c0d59b5e4
|
无JIRA任务， 合代码漏了一个.
|
7 years ago |
|
superman
|
cb417b9f3d
|
Merge pull request #914 in BA/design from ~PAUL/design:master to master
* commit '96ef39063d5e1fd95392a7228cd446c3e5a504fb':
Signed-off-by: unknown <李晓丽>
无JIRA任务， 屏蔽论坛消息 Patch到release.
【国际化修改】修改部分翻译 庄奇 syoki 20170523
UNDEF-715 统计客户BUG的时候需要正确的区分release版本和stable版本
REPORT-2675 部分国际化key找不到，加载顺序问题
REPORT-2675 release删了fr.properties文件后, 部分文件国际化找不到
国际化修改 design部分 第1-1050个key修改确认 庄奇 20170511
去掉之前接口冗余操作
表单支持背景接口
REPORT-2644 master国际化问题
增加限制，不允许添加同分组名的插件
|
7 years ago |
paul
|
96ef39063d
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/locale/designer_ja_JP.properties
# designer_base/src/com/fr/design/locale/designer_zh_TW.properties
|
7 years ago |
|
superman
|
225ec2de75
|
Merge pull request #913 in BA/design from ~NEIL/design:dev to dev
* commit '59180e23e36ffbfd7978d686b2d31678f66d0f7e':
无JIRA任务， 国际化合并
|
7 years ago |
|
neil
|
59180e23e3
|
无JIRA任务， 国际化合并
|
7 years ago |
|
superman
|
998828b838
|
Merge pull request #912 in BA/design from ~LILY/design:release to release
* commit 'f5a863610c05f20100e8e4e661d7989b9de483dc':
Signed-off-by: unknown <李晓丽>
|
7 years ago |
unknown
|
f5a863610c
|
Signed-off-by: unknown <李晓丽>
|
7 years ago |
|
superman
|
d16e56c7af
|
Merge pull request #910 in BA/design from ~NEIL/design:release to release
* commit '105af44f3db48e773f8f1fab9aa8d466f107bb2d':
无JIRA任务， 屏蔽论坛消息 Patch到release.
|
7 years ago |
|
neil
|
105af44f3d
|
无JIRA任务， 屏蔽论坛消息 Patch到release.
|
7 years ago |
|
superman
|
599423bc16
|
Merge pull request #909 in BA/design from ~HZZZ/design:fix-REPORT-2811 to dev
* commit 'd618b70f1e6a31a2906851af70a3c903bba6eb0d':
fix
use UIPopupMenu
PMD
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
7 years ago |
hzzz
|
d618b70f1e
|
fix
|
7 years ago |
|
hzzz
|
b8fbd2ecc0
|
use UIPopupMenu
|
7 years ago |
|
hzzz
|
9d84491d12
|
PMD
|
7 years ago |
|
hzzz
|
f8932e2f28
|
REPORT-2811 设计器表单，点击控件下方的展开按钮，设计器最小化后，控件界面还在桌面上
|
7 years ago |
|
superman
|
dcf9a44b08
|
Merge pull request #907 in BA/design from ~HZZZ/design:reset-before-2773 to dev
* commit '5b17a17e85a5fdc382644ee7663bd1863cb379e0':
back 2
back 1
|
7 years ago |
|
hzzz
|
5b17a17e85
|
back 2
|
7 years ago |
|
hzzz
|
71b44df358
|
back 1
|
7 years ago |
|
superman
|
fd1d2d76b4
|
Merge pull request #906 in BA/design from ~MANGO/design:dev to dev
* commit 'de88676473718e3791828128c4fc2bd141267485':
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
7 years ago |
|
mengao
|
de88676473
|
Merge remote-tracking branch 'origin/dev' into dev
|
7 years ago |
|
mengao
|
8d64d45fc3
|
在使用form的时候发现form里面的图表编辑面板不能正常加载，重新修改下加载图表编辑面板加载的位置
|
7 years ago |
|
superman
|
d30d8bfc7b
|
Merge pull request #903 in BA/design from ~HZZZ/design:fix-REPORT-2773 to dev
* commit 'ac5976346ac2ce30299cf629d062c78ed029e458':
PMD
PMD
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
REPORT-2773 mac中复制快捷键的修复
|
7 years ago |
|
superman
|
68bbb0927c
|
Merge pull request #904 in BA/design from ~NEIL/design:dev to dev
* commit '8555ab940f5325cb63cd5c0f8d11f57fec2ea364':
无JIRA任务， build failed
|
7 years ago |
|
neil
|
8555ab940f
|
无JIRA任务， build failed
|
7 years ago |
|
hzzz
|
ac5976346a
|
PMD
|
7 years ago |
|
hzzz
|
e784491bdd
|
PMD
|
7 years ago |
|
hzzz
|
d35287a513
|
PMD
|
7 years ago |
|
hzzz
|
500b837aaf
|
PMD
|
7 years ago |
|
hzzz
|
3cf5553cd3
|
REPORT-2773 mac中复制快捷键的修复
|
7 years ago |
|
hzzz
|
dca652ba71
|
PMD
|
7 years ago |
|
hzzz
|
408120739f
|
PMD
|
7 years ago |
|
hzzz
|
e4d9c6b230
|
REPORT-2773 mac中复制快捷键的修复
|
7 years ago |
