richie
|
67c1fbb4d3
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
7 years ago |
richie
|
d31774b3d6
|
无JIRA任务 增加设计器的单独的语言等级配置
|
7 years ago |
yaoh.wu
|
2b0e056d57
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit 'f8448b25db0039c07da08cee7f12449a4410461b':
无JIRA任务 调整源码目录结构符合maven默认配置
REPORT-9360【10.0一轮回归】模板名有特殊符号无法预览
REPORT-9512 & REPORT-9297
.
finally
|
7 years ago |
Mata.Li
|
2b954a07c5
|
REPORT-9061 记住历史颜色功能bug
|
7 years ago |
Mata.Li
|
a0b5692c33
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
7 years ago |
Mata.Li
|
44aac62eb8
|
REPORT-9061 记住历史颜色功能bug
|
7 years ago |
vito
|
f8448b25db
|
Merge pull request #204 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '28e57935bcbbcbeb3ccbe58accf84947a2d93d16':
REPORT-9360【10.0一轮回归】模板名有特殊符号无法预览
|
7 years ago |
richie
|
064c3eb614
|
Merge pull request #205 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '753889e8ae408061a2e17300c0300a59d93e78c5':
无JIRA任务 调整源码目录结构符合maven默认配置
|
7 years ago |
richie
|
753889e8ae
|
无JIRA任务 调整源码目录结构符合maven默认配置
|
7 years ago |
vito
|
28e57935bc
|
REPORT-9360【10.0一轮回归】模板名有特殊符号无法预览
|
7 years ago |
plough
|
3befb0d8ea
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into release/10.0
|
7 years ago |
plough
|
ee10465133
|
REPORT-9543 代码质量:将 PrintAttr 合并到 PrintConfig
|
7 years ago |
Hzzz
|
c2bb163bd8
|
Merge pull request #201 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit '8fb34a42631fd39e058793e14020d54a5d4ef5ba':
.
finally
|
7 years ago |
Mata.Li
|
c568c9d917
|
Merge pull request #202 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '2b94751138d810caa781d200c93c397076de8226':
REPORT-9512 & REPORT-9297
|
7 years ago |
Mata.Li
|
2b94751138
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
7 years ago |
Mata.Li
|
34874c6f52
|
REPORT-9512 & REPORT-9297
|
7 years ago |
hzzz
|
8fb34a4263
|
.
|
7 years ago |
hzzz
|
2a7c5c6381
|
finally
|
7 years ago |
yaoh.wu
|
075bfaff61
|
REPORT-8941 【10.0远程设计权限管理】决策系统用户显示不全
|
7 years ago |
kerry
|
159714a838
|
Merge pull request #200 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '36a486428eac7fed438693b57f686066b5444f8c':
REPORT-9437【10.0一轮回归】设计器菜单栏-服务器-服务器配置中去勾选无效
|
7 years ago |
kerry
|
36a486428e
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
7 years ago |
kerry
|
57e5347963
|
REPORT-9437【10.0一轮回归】设计器菜单栏-服务器-服务器配置中去勾选无效
|
7 years ago |
zheng
|
e3d5b6cf7f
|
Merge pull request #199 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'd1890ddeb209c591ad548ecc4c723fd339a9d878':
CHART-2556 地图图层xml 增删改没问题了 默认值还有点问题 明天问下able改好了再放到core里面
CHART-2534 点地图 自定义图片标记点报错
|
7 years ago |
zheng
|
d1890ddeb2
|
CHART-2556 地图图层xml 增删改没问题了 默认值还有点问题 明天问下able改好了再放到core里面
|
7 years ago |
ju
|
d51639ffcd
|
Merge pull request #197 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '9f87c3799a0c2706a54f51a6ed4d559c70d72db1':
REPORT-9423 去掉isLocal判断
|
7 years ago |
ju
|
9f87c3799a
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
7 years ago |
ju
|
dacbab4a25
|
REPORT-9423 去掉isLocal判断
|
7 years ago |
ju
|
b291c3dc56
|
Merge pull request #193 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '279904b60508c99917a249552845324fc5fc8fd1':
REPORT-9423 跟设计器相关的逻辑和信息都移动到设计器里
REPORT-9423
REPORT-9423
|
7 years ago |
Mata.Li
|
d08bc2b530
|
Merge pull request #195 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'f40b9eb1583786e95d5899c3362981facb6ea2ee':
REPORT-9367
REPORT-9367
|
7 years ago |
Mata.Li
|
f40b9eb158
|
REPORT-9367
|
7 years ago |
Mata.Li
|
7869c2610c
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
7 years ago |
Mata.Li
|
e6f3229431
|
REPORT-9367
|
7 years ago |
ju
|
279904b605
|
REPORT-9423 跟设计器相关的逻辑和信息都移动到设计器里
|
7 years ago |
kerry
|
f56138031b
|
Merge pull request #194 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'ea0d12593f8c3316f8a165e232612903ad3325dc':
REPORT-9441【10.0一轮回归】从数据查询界面定义数据连接界面,点击确定没用
|
7 years ago |
ju
|
0236bf4c9d
|
REPORT-9423
|
7 years ago |
kerry
|
ea0d12593f
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
7 years ago |
kerry
|
f86ac7bdc4
|
REPORT-9441【10.0一轮回归】从数据查询界面定义数据连接界面,点击确定没用
|
7 years ago |
ju
|
464498dfa7
|
REPORT-9423
|
7 years ago |
zheng
|
d7a5f722dd
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
7 years ago |
zheng
|
1607d0b034
|
Merge pull request #192 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'd4e37210b7fb5459d8a61c209e4916989e257954':
CHART-2409 地图资源配置界面
update
CHART-2525 词云 形状图片
CHART-2407 图表配色
|
7 years ago |
zheng
|
e65a75cab7
|
CHART-2534 点地图 自定义图片标记点报错
|
7 years ago |
zheng
|
d4e37210b7
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
7 years ago |
zheng
|
a6fed9b4e6
|
CHART-2409 地图资源配置界面
|
7 years ago |
Mata.Li
|
b502f2b1fc
|
Merge pull request #190 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'b3d1faf7e3d25f56a309cf88bdbeeb580b4215f4':
REPORT-9267 REPORT-9391
REPORT-9267 REPORT-9391
|
7 years ago |
Mata.Li
|
b3d1faf7e3
|
REPORT-9267 REPORT-9391
|
7 years ago |
Mata.Li
|
5a9309d6fd
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
7 years ago |
Mata.Li
|
733f7c538b
|
REPORT-9267 REPORT-9391
|
7 years ago |
zheng
|
b59214ff7c
|
update
|
7 years ago |
zheng
|
b8477e1fa5
|
CHART-2525 词云 形状图片
|
7 years ago |
zheng
|
e708fc16a2
|
CHART-2407 图表配色
|
7 years ago |