superman
|
10781087a0
|
Merge pull request #956 in BA/design from ~MANGO/design:release to release
* commit 'be01f460dca4daaa5a2c47a46fe353bea8b631fe':
修改pmd错误(国际化命名)
修改pmd错误(国际化命名)
修改国际化问题
|
8 years ago |
daniel
|
a1d1927888
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
superman
|
1cb91330c9
|
Merge pull request #966 in BA/design from ~NEIL/design:release to dev
* commit '2124e5f7abbe112aac4844b9b74ef15e9e940f07':
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
【国际化修改】修改了一处翻译。。。。
无JIRA任务, dev国际化->release
【国际化修改】 根据代理商意见修改翻译 syoki
超链悬浮窗图表,点击确定无效,报null错误
【国际化修改】 修改几处翻译问题
BI-5822 调整接口,使用标准的状态码返回给移动端
更改lib依赖
【国际化修改】 根据代理商的意见修改design部分的翻译 庄奇20170606
去掉部分代码
无JIRA任务, 论坛消息屏蔽
|
8 years ago |
superman
|
2124e5f7ab
|
Merge pull request #964 in BA/design from ~RICHIE/design:release to release
* commit 'fdf468ecf326fd24c86c9a7a530fba853dcf9e87':
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
|
8 years ago |
superman
|
f93d166875
|
Merge pull request #965 in BA/design from ~PAUL/design:master to master
* commit 'e0009962ff797c864454d33a8ff1e794b50071d6':
【国际化修改】修改了一处翻译。。。。
无JIRA任务, dev国际化->release
【国际化修改】 根据代理商意见修改翻译 syoki
超链悬浮窗图表,点击确定无效,报null错误
|
8 years ago |
mengao
|
be01f460dc
|
解决冲突
|
8 years ago |
paul
|
e0009962ff
|
Merge branch 'release'
|
8 years ago |
richie
|
fdf468ecf3
|
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
|
8 years ago |
richie
|
fa223daecf
|
CQ-9 没有装插件的设计打开带有插件控件的表单时,需要能正确的打开并提示
|
8 years ago |
superman
|
52cd4d6a50
|
Merge pull request #961 in BA/design from ~SYOKI/design:release to release
* commit '3f302af3cf6a19e78efda3a071f4d94e7a8b1064':
【国际化修改】修改了一处翻译。。。。
|
8 years ago |
syoki
|
3f302af3cf
|
【国际化修改】修改了一处翻译。。。。
|
8 years ago |
superman
|
08c22194b5
|
Merge pull request #960 in BA/design from ~NEIL/design:release to release
* commit '3d68935ee40d94555e9bc95945bb5addd471b0d9':
无JIRA任务, dev国际化->release
|
8 years ago |
neil
|
3d68935ee4
|
无JIRA任务, dev国际化->release
|
8 years ago |
superman
|
33baca09d7
|
Merge pull request #959 in BA/design from ~SYOKI/design:release to release
* commit '40ab1a467417fbd2ed395fc5b0674a4382635043':
【国际化修改】 根据代理商意见修改翻译 syoki
|
8 years ago |
syoki
|
40ab1a4674
|
【国际化修改】 根据代理商意见修改翻译 syoki
|
8 years ago |
eason
|
343aca3bd5
|
Merging in latest from upstream (BA/design:refs/heads/release)
* commit '5c6b3c1a52b44d7f00603da3a90215f1614946a5':
超链悬浮窗图表,点击确定无效,报null错误
【国际化修改】 修改几处翻译问题
|
8 years ago |
mengao
|
5974527fe4
|
修改pmd错误(国际化命名)
|
8 years ago |
mengao
|
4f91e67e80
|
修改pmd错误(国际化命名)
|
8 years ago |
mengao
|
e2a98f53d8
|
Merge remote-tracking branch 'origin/release' into release
|
8 years ago |
mengao
|
002e0c731c
|
修改国际化问题
|
8 years ago |
superman
|
5c6b3c1a52
|
Merge pull request #954 in BA/design from ~MANGO/design:release to release
* commit '14df7db0a33e0f74562ed13c75ebcabac0a2e21d':
超链悬浮窗图表,点击确定无效,报null错误
|
8 years ago |
mengao
|
14df7db0a3
|
超链悬浮窗图表,点击确定无效,报null错误
|
8 years ago |
mengao
|
58bc5e247e
|
修改pmd错误
|
8 years ago |
mengao
|
382268234d
|
修复pmd错误
|
8 years ago |
mengao
|
c5536e6d61
|
修改pmd问题
|
8 years ago |
mengao
|
b70af41d1b
|
Merge remote-tracking branch 'origin/dev' into dev
|
8 years ago |
mengao
|
5a490cf8dd
|
修复bug:条件显示里设置条件内容为数据列,把对应的数据集删掉后,点击设置的条件属性,页面打不开
|
8 years ago |
superman
|
b852c38225
|
Merge pull request #940 in BA/design from ~PAUL/design:master to master
* commit 'c348d42efc5daf54e6a9b5ecb5d8e17ca2514abb':
build failed
|
8 years ago |
paul
|
c348d42efc
|
build failed
|
8 years ago |
eason
|
cd0440cad3
|
Merge pull request #3 in CHART/design from ~EASON/design:dev to dev
* commit 'de3fbb5cabd0ca2ca9b076b9c06b91e1bc46ad9e':
pmd
删除标签位置
|
8 years ago |
eason-skx
|
de3fbb5cab
|
pmd
|
8 years ago |
eason-skx
|
383431e7dd
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~eason/design into dev
|
8 years ago |
eason-skx
|
6213784e43
|
删除标签位置
|
8 years ago |
superman
|
e7035b8da5
|
Merge pull request #939 in BA/design from ~PAUL/design:master to master
* commit 'afd2840522a4a87d0bcac0b505ee09b1673b82eb': (102 commits)
【国际化修改】 修改几处翻译问题
BI-5822 调整接口,使用标准的状态码返回给移动端
更改lib依赖
【国际化修改】 根据代理商的意见修改design部分的翻译 庄奇20170606
去掉部分代码
无JIRA任务, 论坛消息屏蔽
无JIRA任务, 国际化合并
fix
use UIPopupMenu
PMD
REPORT-2811 设计器表单,点击控件下方的展开按钮,设计器最小化后,控件界面还在桌面上
back 2
back 1
在使用form的时候发现form里面的图表编辑面板不能正常加载,重新修改下加载图表编辑面板加载的位置
无JIRA任务, build failed
PMD
PMD
PMD
PMD
REPORT-2773 mac中复制快捷键的修复
...
|
8 years ago |
paul
|
afd2840522
|
Merge branch 'release'
# Conflicts:
# designer_base/src/com/fr/design/extra/LoginWebBridge.java
|
8 years ago |
superman
|
d9142d1a1d
|
Merge pull request #936 in BA/design from ~SYOKI/design:release to release
* commit '3cefad40a36f2f475172a390608b7da42e2902cf':
【国际化修改】 修改几处翻译问题
|
8 years ago |
syoki
|
3cefad40a3
|
【国际化修改】 修改几处翻译问题
|
8 years ago |
superman
|
9e121eaedd
|
Merge pull request #934 in BA/design from CHART/design:dev to dev
* commit '2dc75dacfb5aa81bc1eb3f627d4cd840f094bd7c':
删除多余类
去掉多余代码
去掉接口代码中instnceof,用泛型代替。
|
8 years ago |
eason-skx
|
0af798e8d2
|
Merge branch 'release' of http://www.finedevelop.com:2015/scm/~eason/design_release into release
|
8 years ago |
eason-skx
|
c2c72ce0d7
|
删import
|
8 years ago |
superman
|
2b7add6ca0
|
Merge pull request #932 in BA/design from ~RICHIE/design:release to release
* commit '783d7c081ca8ee2334991776bc788e5d693b0256':
BI-5822 调整接口,使用标准的状态码返回给移动端
|
8 years ago |
richie
|
783d7c081c
|
BI-5822 调整接口,使用标准的状态码返回给移动端
|
8 years ago |
superman
|
ba967dd4f0
|
Merge pull request #929 in BA/design from ~PLOUGH/design:dev to dev
* commit '3f655e7a0f0aa4d6ffe59e27a285f3bebfb2973a':
REPORT-2561 大屏-数字时钟插件,属性表左移
|
8 years ago |
plough
|
3f655e7a0f
|
REPORT-2561 大屏-数字时钟插件,属性表左移
|
8 years ago |
daniel
|
110cda334a
|
Merge branch 'dev' of http://www.finedevelop.com:2015/scm/pf/design into dev
|
8 years ago |
superman
|
74b035dc94
|
Merge pull request #927 in BA/design from ~MANGO/m_design:release to release
* commit '3f64e917431baf12daad85dd37dc265a297ebb01':
去掉部分代码
|
8 years ago |
eason
|
3f64e91743
|
Merge pull request #2 in CHART/design from ~MANGO/m_design:release to release
* commit '4c91a0b9c9e6b90befab9654232f04546e458536':
去掉部分代码
|
8 years ago |
eason
|
2dc75dacfb
|
Merge pull request #1 in CHART/design from ~MANGO/m_design:dev to dev
* commit 'ff20b64864d8119fddbd548f911c4da5e19db760':
删除多余类
去掉多余代码
去掉接口代码中instnceof,用泛型代替。
|
8 years ago |
superman
|
5deeddb813
|
Merge pull request #925 in BA/design from ~PLOUGH/design:dev to dev
* commit 'd70e9db8be9647ffe3fec3266d6ae11191017963':
REPORT-2561 大屏-数字时钟插件,属性表左移,调整
|
8 years ago |
plough
|
d70e9db8be
|
REPORT-2561 大屏-数字时钟插件,属性表左移,调整
|
8 years ago |