richie
|
23bce437ee
|
Merge pull request #301 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '8f3290c1c2d15bbfd10dfd96e72682f0c43a6a39':
CORE-113 执行时间和内存等的测量,需要同时提供给BI使用,因此移动到core里面
|
6 years ago |
Wim.Zhai
|
80c89015d4
|
Merge pull request #299 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
修改了部分design-chart的国际化键名
* commit 'a4cb4da001b23aa3127b20f3bd949a379a98e20e':
相应修改使用的地方
#i18n
修改了部分Java文件中的旧式引用
Merge pull request #283 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
|
6 years ago |
Mata.Li
|
8d29b1a577
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
2412d0d264
|
REPORT-9953 & REPORT-10231
|
6 years ago |
Hzzz
|
28d2a50eb9
|
Merge pull request #300 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit '1ba7d32fbb19152e16f95d6d7348d0b3c4861e92':
REPORT-9221 10.0插件兼容-版本管理
|
6 years ago |
richie
|
8f3290c1c2
|
CORE-113 执行时间和内存等的测量,需要同时提供给BI使用,因此移动到core里面
|
6 years ago |
hzzz
|
1ba7d32fbb
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |
hzzz
|
b657f634d0
|
REPORT-9221 10.0插件兼容-版本管理
|
6 years ago |
Wim.Zhai
|
a4cb4da001
|
相应修改使用的地方
|
6 years ago |
ju
|
2fefb15f4a
|
Merge pull request #297 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '33ecac4fa020e39e597495e9cd33b091ce353b60':
REPORT-10225 【10.0冒烟】设计器界面变成英文的了
REPORT-10225 【10.0冒烟】设计器界面变成英文的了
无JIRA任务 backup
REPORT-10215
|
6 years ago |
ju
|
33ecac4fa0
|
REPORT-10225 【10.0冒烟】设计器界面变成英文的了
|
6 years ago |
ju
|
8dd0d77770
|
REPORT-10225 【10.0冒烟】设计器界面变成英文的了
|
6 years ago |
ju
|
e0ef826de1
|
无JIRA任务 backup
|
6 years ago |
Wim.Zhai
|
b7377949fd
|
#i18n
|
6 years ago |
Wim.Zhai
|
3af45812c3
|
修改了部分Java文件中的旧式引用
|
6 years ago |
ju
|
2df2b0f49d
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
ju
|
1b82e74248
|
Merge pull request #294 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'a087b5561a1d2782faa118dcaae43a6373c36430':
REPORT-10223
|
6 years ago |
Mata.Li
|
a087b5561a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
9bd9006690
|
REPORT-10223
|
6 years ago |
ju
|
e1419e2a3e
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Wim.Zhai
|
4c393bc680
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Wim.Zhai
|
79d212c06a
|
Merge pull request #283 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '8166d5dd409c18c4fe90bc609744cff1801fc161':
无JIRA任务 打包
Signed-off-by: Wim.Zhai <Wim.Zhai@fanruan.com>
|
6 years ago |
Hzzz
|
2acf96ed9b
|
Merge pull request #291 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit 'eca7394dbcbed217ce2ae7d10e59582d3452d95e':
REPORT-9221 10.0插件兼容-版本管理
REPORT-9221 10.0插件兼容-版本管理
REPORT-9221 10.0插件兼容-版本管理
|
6 years ago |
vito
|
311e8d7ae6
|
Merge pull request #292 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '588f9ed08b4448537b72b6a6a2b7df356287a10a':
REPORT-10160 10.0冒烟 Mac设计器启动, 字体糊了
|
6 years ago |
vito
|
588f9ed08b
|
REPORT-10160 10.0冒烟 Mac设计器启动, 字体糊了
|
6 years ago |
ju
|
61717f3ab2
|
REPORT-10215
|
6 years ago |
hzzz
|
eca7394dbc
|
REPORT-9221
10.0插件兼容-版本管理
|
6 years ago |
ju
|
20f439b7f2
|
Merge pull request #289 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit 'f5579ad3a4b53c9bd05b704ff4c398fb1a6bbbec':
REPORT-10202 没用的监听,删了
|
6 years ago |
ju
|
f5579ad3a4
|
冲突
|
6 years ago |
richie
|
3ddc0486d0
|
Merge pull request #288 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '9ab8e82ada52be5efd7c8201399fbdd362e733a9':
CORE-116 继续改国际化规范
|
6 years ago |
ju
|
c80dcdf0e7
|
REPORT-10202 没用的监听,删了
|
6 years ago |
plough
|
25c29fcac7
|
Merge pull request #287 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '2704c0c1350871da8eaeda3ed0a2c0a1f1f9ba3b':
无JIRA任务,表单添加参数面板后,水印错位
|
6 years ago |
ju
|
473ee99e45
|
Merge pull request #286 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '2ae7e2a073619cca9fce3df9eea8eed5c85bd408':
REPORT-9652 优化一下,减少RPC和数据库访问次数 【10.0二轮回归】部署集成-集群-大数据量模板加载时文件夹显示异常
|
6 years ago |
richie
|
9ab8e82ada
|
CORE-116 继续改国际化规范
|
6 years ago |
plough
|
2704c0c135
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into release/10.0
|
6 years ago |
plough
|
3f1cec83e4
|
无JIRA任务,表单添加参数面板后,水印错位
|
6 years ago |
ju
|
2ae7e2a073
|
REPORT-9652 优化一下,减少RPC和数据库访问次数
【10.0二轮回归】部署集成-集群-大数据量模板加载时文件夹显示异常
|
6 years ago |
hzzz
|
048c05bc36
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |
hzzz
|
e8a5d074a4
|
REPORT-9221 10.0插件兼容-版本管理
|
6 years ago |
vito
|
e3d9cd4074
|
Merge pull request #285 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'fc78087cc544a2f55c4661cbdf64a5cff3e7028a':
REPORT-10160 10.0冒烟 Mac设计器启动, 字体糊了
|
6 years ago |
vito
|
fc78087cc5
|
REPORT-10160 10.0冒烟 Mac设计器启动, 字体糊了
|
6 years ago |
kerry
|
fb7c7e7cbe
|
Merge pull request #284 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '1f6eef7719d74bc6d7e8dc6fd16652f4adf89df4':
REPORT-10181【10.0插件】设计器插件管理这里插件的详细信息jar包显示不全
|
6 years ago |
kerry
|
1f6eef7719
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
9e926b954e
|
REPORT-10181【10.0插件】设计器插件管理这里插件的详细信息jar包显示不全
|
6 years ago |
Hzzz
|
867b62ffc4
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit 'ba069aaf14bdadd27bd4899d64dba0caf3b0d841':
无JIRA任务 打包
CHART-2699 类型选择弹出框的图表 用图片
CHART-2699 类型选择弹出框的图表 用图片
|
6 years ago |
zheng
|
ba069aaf14
|
Merge pull request #282 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '39c06853dd8adc0ea4f14c2d893dde7bc4f103b4':
CHART-2699 类型选择弹出框的图表 用图片
CHART-2699 类型选择弹出框的图表 用图片
|
6 years ago |
ju
|
d9ac219d79
|
Merge pull request #283 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '8166d5dd409c18c4fe90bc609744cff1801fc161':
无JIRA任务 打包
|
6 years ago |
juhaoyu
|
8166d5dd40
|
无JIRA任务 打包
|
6 years ago |
zheng
|
39c06853dd
|
CHART-2699 类型选择弹出框的图表 用图片
|
6 years ago |
zheng
|
3ad77e5cc6
|
CHART-2699 类型选择弹出框的图表 用图片
|
6 years ago |