Mata.Li
|
9583cd5151
|
REPORT-10541
|
6 years ago |
Mata.Li
|
4b1b435493
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
200e3372ce
|
REPORT-10541
|
6 years ago |
Mata.Li
|
96bdf920da
|
Merge pull request #398 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '024188f04f8f022b725fb0345d31699cc239c32f':
REPORT-10171
REPORT-10171
REPORT-10171
REPORT-10171
|
6 years ago |
Mata.Li
|
024188f04f
|
REPORT-10171
|
6 years ago |
Mata.Li
|
cda92e4891
|
REPORT-10171
|
6 years ago |
kerry
|
f35c0b6526
|
Merge pull request #397 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '4da0d0f0204680de5283f9ab0c50fa0c5fd12923':
REPORT-10812 10.0设计器插件管理界面兼容问题
|
6 years ago |
Mata.Li
|
34709bd740
|
REPORT-10171
|
6 years ago |
Mata.Li
|
049063bffc
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
18ef9e55f5
|
REPORT-10171
|
6 years ago |
Harrison
|
a6d70eed5e
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/env/EnvListPane.java
|
6 years ago |
Harrison
|
eab8d702ec
|
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
kerry
|
4da0d0f020
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
cc1e8931af
|
REPORT-10812 10.0设计器插件管理界面兼容问题
|
6 years ago |
Mata.Li
|
852ef82fe6
|
Merge pull request #396 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '88d5dbbc13d66d524987445e7c6fa0309c0dc690':
REPORT-10780
REPORT-10780
|
6 years ago |
Mata.Li
|
88d5dbbc13
|
REPORT-10780
|
6 years ago |
Mata.Li
|
e012c9d913
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
52e4a734e7
|
REPORT-10780
|
6 years ago |
Mata.Li
|
5c57e22eb8
|
Merge pull request #395 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'aedb9ae71f19cdf1956512f3dbff54b6d9a551a8':
REPORT-10763 & REPORT-10562 & REPORT-10541
REPORT-10763 & REPORT-10562 & REPORT-10541
|
6 years ago |
Mata.Li
|
aedb9ae71f
|
REPORT-10763 & REPORT-10562 & REPORT-10541
|
6 years ago |
Mata.Li
|
20bf555c22
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
4862eacfa5
|
REPORT-10763 & REPORT-10562 & REPORT-10541
|
6 years ago |
Mata.Li
|
a4c36b0e3d
|
Merge pull request #390 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '494816f7f9ddb8eaa9247c3fb3356873bb5ac5b5':
REPORT-10750
|
6 years ago |
Mata.Li
|
494816f7f9
|
REPORT-10750
|
6 years ago |
ju
|
44e218556b
|
Merge pull request #388 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '766cebc7cdf9609dfa427aea019edccd057e3179':
无JIRA任务 所有的代码间依赖全写成 10.0,对jar的依赖全写成#{branch}
无JIRA任务 所有的代码间依赖全写成 10.0,对jar的依赖全写成#{branch}
无JIRA任务 master国际化先屏蔽模块区分
|
6 years ago |
ju
|
766cebc7cd
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/design/design into release/10.0
# Conflicts:
# designer-base/pom.xml
# designer-chart/pom.xml
# designer-form/pom.xml
# designer-realize/pom.xml
|
6 years ago |
ju
|
986f8455a6
|
无JIRA任务 所有的代码间依赖全写成 10.0,对jar的依赖全写成#{branch}
|
6 years ago |
ju
|
5ccaffae5b
|
无JIRA任务 所有的代码间依赖全写成 10.0,对jar的依赖全写成#{branch}
|
6 years ago |
Mata.Li
|
d2382fcca0
|
Merge pull request #387 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '7446cc12fbc9a42d895ea111695803a1603c920b':
REPORT-10572
|
6 years ago |
plough
|
04e8d1d396
|
Merge pull request #386 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '12eeb62f0d97c4956881502c8903451e01137b10':
REPORT-10459 【9.0&10.0】单元格属性-其他,下面的基本和自动调整写反了
|
6 years ago |
Mata.Li
|
7446cc12fb
|
REPORT-10572
|
6 years ago |
plough
|
12eeb62f0d
|
REPORT-10459 【9.0&10.0】单元格属性-其他,下面的基本和自动调整写反了
|
6 years ago |
neil
|
f0550f5872
|
Merge pull request #385 in DESIGN/design from ~NEIL/design-10:release/10.0 to release/10.0
* commit 'efa5f1e2d3032857ff3d8fa05aa7b38ee21b3510':
REPORT-10700 先删掉preload cloudcenter.
|
6 years ago |
neil
|
efa5f1e2d3
|
REPORT-10700 先删掉preload cloudcenter.
|
6 years ago |
ju
|
c4dea2bd97
|
Merge pull request #380 in DESIGN/design from ~HZZZ/design61:release/10.0 to release/10.0
* commit '55e792cedb8818a399c6e7630022d8b666c12841':
REPORT-10489【客户升级10.0】工作目录切换位远程后,第一次预览数据集进度框一直显示
|
6 years ago |
Wim.Zhai
|
88441fa38f
|
Merge pull request #383 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0
修改Chart一处引用,修复饼图浮提示
* commit '8f7d4e479f76874093d872fc8e72ca81060e2bfa':
CHART-2790
|
6 years ago |
Wim.Zhai
|
8f7d4e479f
|
CHART-2790
|
6 years ago |
zheng
|
37cbee672b
|
Merge pull request #381 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'af3abbb485f92689f4c7fc0f53898d6c183e75bd':
CHART-2792 uicontrollistpane
|
6 years ago |
zheng
|
af3abbb485
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
zheng
|
f26245a788
|
CHART-2792 uicontrollistpane
|
6 years ago |
hzzz
|
55e792cedb
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into release/10.0
|
6 years ago |
hzzz
|
f65a025b55
|
REPORT-10489【客户升级10.0】工作目录切换位远程后,第一次预览数据集进度框一直显示
|
6 years ago |
richie
|
8a1396bb53
|
Merge pull request #379 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0
* commit '66ee1e7028eab11c2c6dd34f9f31ef85ab29549c':
提交错了一个类,删掉
无JIRA任务 修改pom版本号规则
|
6 years ago |
kerry
|
dca7961ccb
|
Merge pull request #378 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'f198e57634b24c52f4701028c4dd78d131718dff':
DEC-3945 插件管理页面脚本的国际化独立到scripts里面去
|
6 years ago |
richie
|
66ee1e7028
|
提交错了一个类,删掉
|
6 years ago |
richie
|
db4ced49cb
|
无JIRA任务 修改pom版本号规则
|
6 years ago |
kerry
|
f198e57634
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
6 years ago |
kerry
|
57aa1021eb
|
DEC-3945 插件管理页面脚本的国际化独立到scripts里面去
|
6 years ago |
Harrison
|
d077e23761
|
Merge pull request #377 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'e340cfa40abe825e62ba833c9a70957ed917675b':
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |
Harrison
|
e340cfa40a
|
REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
|
6 years ago |