richie
|
908c0f800f
|
Merge remote-tracking branch 'origin/release/10.0' into feature/10.0
# Conflicts:
# designer-base/pom.xml
# designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
# designer-base/src/main/java/com/fr/start/ServerStarter.java
|
6 years ago |
Harrison
|
e600937167
|
Merge pull request #405 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'b3d91e85688eec34e8c20f5ee9ca0abcc2302d52':
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
Mata.Li
|
273afa6762
|
Merge pull request #406 in DESIGN/design from ~MATA.LI/designfeature10:feature/10.0 to feature/10.0
* commit '433d15906cd0be33c9dea6da825633549bc6ee4d':
REPORT-10562
|
6 years ago |
Mata.Li
|
8241db5760
|
Merge pull request #407 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'd93e7ae57a2394c96115a396fb5426c989862c23':
REPORT-10847
|
6 years ago |
Mata.Li
|
d93e7ae57a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
338137ced4
|
REPORT-10847
|
6 years ago |
Mata.Li
|
a557a6a3da
|
Merge pull request #404 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '9ecc2d669138a3e91127a6920aad717848f3bae9':
无JRA任务 插件内置在release取消
|
6 years ago |
Mata.Li
|
433d15906c
|
REPORT-10562
|
6 years ago |
Harrison
|
b3d91e8568
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
81c0c33369
|
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
Mata.Li
|
9ecc2d6691
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
906961c8b5
|
无JRA任务 插件内置在release取消
|
6 years ago |
Alex.Sung
|
2d9e2f6c82
|
Merge pull request #403 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
REPORT-6453 alphafine整合小帆
* commit 'cb32d0b3ec1137dd5d1470cc580003f0291388bb':
提升代码质量
|
6 years ago |
Harrison
|
1b5ba9c12b
|
Merge pull request #401 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '2a3080183965dac1bce5f61d07f01d3387440e2f':
REPORT-10785 report包下的一百多个国际化规范下 改错了,修复下
REPORT-10785 report包下的一百多个国际化规范下 分出 core-server / core-web
REPORT-10785 report包下的一百多个国际化规范下
|
6 years ago |
alex.sung
|
cb32d0b3ec
|
提升代码质量
|
6 years ago |
plough
|
d810b6a3ad
|
Merge pull request #402 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit 'c51d7d034c27e0a5ca5153b39c745cee7d62172a':
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白=>整理代码
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白
|
6 years ago |
plough
|
c51d7d034c
|
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白=>整理代码
|
6 years ago |
plough
|
8c59530848
|
REPORT-10490 【客户升级10.0】远程连接断开后,提示框显示空白
|
6 years ago |
Mata.Li
|
c27123eedf
|
Merge pull request #399 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '9583cd515166a72eb5e0e2b2c78d56952a5bfc89':
REPORT-10541
REPORT-10541
|
6 years ago |
Harrison
|
2a30801839
|
REPORT-10785 report包下的一百多个国际化规范下
改错了,修复下
|
6 years ago |
Harrison
|
85ebfcc7f4
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
Harrison
|
8794a3282b
|
REPORT-10785 report包下的一百多个国际化规范下
分出 core-server / core-web
|
6 years ago |
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 |
Alex.Sung
|
ec5f1fc7f2
|
Merge pull request #389 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
REPORT-6453 alphafine整合小帆
* commit '6e95b0939a7e07de101db5b25715f3a9a9b2fe1a':
提升代码质量。。
解决冲突,并提升代码质量
解决冲突,并提升代码质量
规范国际化文件及国际化定义。
提升alphafine代码质量
提升alphafine代码质量
提升alphafine代码质量
规范国际化文件及国际化定义。
规范国际化文件及国际化定义。
|
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 |
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 |