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 |
alex.sung
|
6e95b0939a
|
提升代码质量。。
|
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 |
alex.sung
|
3113347520
|
解决冲突,并提升代码质量
|
6 years ago |
alex.sung
|
614d504347
|
解决冲突,并提升代码质量
|
6 years ago |
alex.sung
|
ef46f377b2
|
解决冲突,并提升代码质量
|
6 years ago |
zack
|
07f037353f
|
Merge pull request #394 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit '33f48cab40a2741d7a97cf688cfbca45ce3def02':
REPORT-10384 设计器预览启动假死问题,本地目录切换也显示启动动画
|
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 |
zack
|
33f48cab40
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~zack/design
|
6 years ago |
zack
|
bcafc5ce1d
|
REPORT-10384 设计器预览启动假死问题,本地目录切换也显示启动动画
|
6 years ago |
alex.sung
|
9804d86b40
|
规范国际化文件及国际化定义。
|
6 years ago |
zack
|
cec9eab9c6
|
Merge pull request #392 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'b798f6112b99bb958a3b9c6804aa90ac8ca98934':
调整一下代码
REPORT-10384 设计器预览启动假死问题,内置服务器提前启动
|
6 years ago |
ju
|
49123e7a54
|
Merge pull request #393 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'a9b74787c158a600289b102553164285ea374809':
DEC-3942 1、添加mutable校验器,用于自定义的mutable检查 2、有很多"ERROR null"的无效错误日志,全部改成打印堆栈
|
6 years ago |
kerry
|
e671e1e2ef
|
Merge pull request #391 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'c04544037683fc516d8e7f808173a7acb05c2a70':
添加注释
无
REPORT-10676 9patch10, FR9.0设计器支持移动端预览效果
|
6 years ago |
ju
|
a9b74787c1
|
DEC-3942
1、添加mutable校验器,用于自定义的mutable检查
2、有很多"ERROR null"的无效错误日志,全部改成打印堆栈
|
6 years ago |
alex.sung
|
f948fa32f0
|
提升alphafine代码质量
|
6 years ago |
zack
|
b798f6112b
|
调整一下代码
|
6 years ago |
zack
|
a92ed2f840
|
REPORT-10384 设计器预览启动假死问题,内置服务器提前启动
|
6 years ago |
kerry
|
c045440376
|
添加注释
|
6 years ago |
alex.sung
|
8548d36a0b
|
提升alphafine代码质量
|
6 years ago |
alex.sung
|
334a62c065
|
提升alphafine代码质量
|
6 years ago |
kerry
|
a0abc164e9
|
无
|
6 years ago |
kerry
|
84931e6733
|
REPORT-10676 9patch10, FR9.0设计器支持移动端预览效果
|
6 years ago |
alex.sung
|
75c6837e35
|
规范国际化文件及国际化定义。
|
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 |
alex.sung
|
b0a9e525c2
|
规范国际化文件及国际化定义。
|
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 |
ju
|
70dfba2d99
|
Merge pull request #384 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '31051df0338b05bc9ec088b66e18ff18827d8368':
无JIRA任务 只有最外层的jar依赖需要分支信息,其他不用
|
6 years ago |
ju
|
31051df033
|
无JIRA任务 只有最外层的jar依赖需要分支信息,其他不用
|
6 years ago |