superman
|
b0b84cc422
|
Merge pull request #88 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '0c7de5566ec6ca855fe284091830dc5230743f4f':
无JIRA任务 远程设计改善
|
7 years ago |
ju
|
9b8a8df65e
|
冲突
|
7 years ago |
richie
|
0c7de5566e
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
# Conflicts:
# designer-base/src/com/fr/design/mainframe/DesignerFrame.java
|
7 years ago |
richie
|
f0590812c1
|
无JIRA任务 远程设计改善
|
7 years ago |
superman
|
3e320dc79c
|
Merge pull request #85 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0
* commit 'f1dc915f1cf75b9914f8fac2969cce1f07fc0d24':
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
REPORT-6645 参数面板里的bug2
REPORT-6558 & REPORT-6443 & REPORT-6645 组件叠加优化交互验收;控件树消失问题=>减少对其他地方的影响;参数面板里的bug2
REPORT-6626 绝对布局下组件复制粘贴后属性设置有问题
REPORT-6392 决策报表组件重名时数据错乱
REPORT-6245 设计器,悬浮元素,修改悬浮元素名称,点击确定,日志抛错
REPORT-6190 9.0设计器设置了几个超链,编辑几个属性后,设计器整个卡掉了
REPORT-5908 && REPORT-6110 设计器下拉菜单、右击菜单视觉调整缩放弹窗也改成圆角样式;设计器模板内存智能优化优化了一下模板激活时间,去掉激活时刷新右侧面板调用
|
7 years ago |
superman
|
1d4df31825
|
Merge pull request #87 in DESIGN/design from ~HZZZ/design61:feature/10.0 to feature/10.0
* commit '5d0ff4b4f69aff35354879e454c48ceeb09bb0a6':
env
env
env
merge
|
7 years ago |
hzzz
|
5d0ff4b4f6
|
env
|
7 years ago |
plough
|
f1dc915f1c
|
merge
|
7 years ago |
plough
|
e71b1af7fb
|
REPORT-8355 9.0之前开发的功能与bug patch到10.0(部分)
|
7 years ago |
ju
|
bd22e53a8c
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
7 years ago |
ju
|
b5fdc5298f
|
REPORT-8604 启动画面中的“正在启动XXX模块”的监听
|
7 years ago |
superman
|
97f3376637
|
Merge pull request #84 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit '1d4a172a87a34b9b492b1afe6707aabcff912e07':
REPORT-8393 10.0启动动画 1.动图放到designer模块; 2.win下启动画面报错的问题
|
7 years ago |
vito
|
1d4a172a87
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~vito/c-design into feature/10.0
* 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~vito/c-design:
CORE-76 Activator重复启动内置服务器、切换环境的支持 右上角的服务器开启关闭状态
|
7 years ago |
vito
|
819e4b4007
|
REPORT-8393 10.0启动动画
1.动图放到designer模块;
2.win下启动画面报错的问题
|
7 years ago |
superman
|
52cde471ab
|
Merge pull request #83 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '5230b3ff28c2bd6468bf52b6716581b3491a25de':
CORE-76 Activator重复启动内置服务器、切换环境的支持 右上角的服务器开启关闭状态
|
7 years ago |
ju
|
5230b3ff28
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
右上角的服务器开启关闭状态
|
7 years ago |
superman
|
be820787cd
|
Merge pull request #82 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '608dd8a0395c739798d1dad1b393a97da9c89aef':
REPORT-8354 变量名修改
|
7 years ago |
kerry
|
608dd8a039
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0
|
7 years ago |
kerry
|
1ad692f26c
|
REPORT-8354 变量名修改
|
7 years ago |
superman
|
55a2b37ca9
|
Merge pull request #80 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '3d9b545131a5561eb5f92e3525f71c5c591761c8':
REPORT-8354 9.0之前开发的功能与bug patch到10.0
|
7 years ago |
hzzz
|
30924b6551
|
env
|
7 years ago |
kerry
|
3d9b545131
|
REPORT-8354 9.0之前开发的功能与bug patch到10.0
|
7 years ago |
hzzz
|
cad937bf23
|
mereg
|
7 years ago |
superman
|
338dc174c0
|
Merge pull request #79 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '8a1b91e876a5d9fc56b6bde6892273704bed5693':
无JIRA任务 提前加载buildPath
|
7 years ago |
ju
|
8a1b91e876
|
无JIRA任务 提前加载buildPath
|
7 years ago |
hzzz
|
0653833e89
|
env
|
7 years ago |
superman
|
86a3d9c07d
|
Merge pull request #78 in DESIGN/design from ~VITO/c-design:feature/10.0 to feature/10.0
* commit 'db4860bda5dc4281ec81ff10a62ffd4da5e8fa9a':
REPORT-8393 10.0启动动画
|
7 years ago |
superman
|
3e6e124cc2
|
Merge pull request #77 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4df1da8c5226e9d0ef208ef33a00c1ca07c99ab9':
test
CORE-76 Activator重复启动内置服务器、切换环境的支持 1、重写一下之前的内置tomcat启动,直接指定initializer,省的tomcat也要扫描一遍class 2、tomcat关闭时,关闭activator 还有一些待完善,无阻塞,先传代码方便各个模块的Activator调试
CORE-76 Activator重复启动内置服务器、切换环境的支持 1、重写一下之前的内置tomcat启动,直接指定initializer,省的tomcat也要扫描一遍class 2、tomcat关闭时,关闭activator 还有一些待完善,无阻塞,先传代码方便各个模块的Activator调试
|
7 years ago |
ju
|
4df1da8c52
|
test
|
7 years ago |
vito
|
db4860bda5
|
REPORT-8393 10.0启动动画
|
7 years ago |
ju
|
4572645713
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
1、重写一下之前的内置tomcat启动,直接指定initializer,省的tomcat也要扫描一遍class
2、tomcat关闭时,关闭activator
还有一些待完善,无阻塞,先传代码方便各个模块的Activator调试
|
7 years ago |
ju
|
ddc6c6d3a6
|
CORE-76 Activator重复启动内置服务器、切换环境的支持
1、重写一下之前的内置tomcat启动,直接指定initializer,省的tomcat也要扫描一遍class
2、tomcat关闭时,关闭activator
还有一些待完善,无阻塞,先传代码方便各个模块的Activator调试
|
7 years ago |
plough
|
e23eb0e690
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
|
7 years ago |
hzzz
|
4e9978da9d
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design61 into feature/10.0
|
7 years ago |
superman
|
3e6c1abffe
|
Merge pull request #76 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '21976a39fc2b02eab0770f66e67d9a4b0234eadc':
国家化前缀修改
|
7 years ago |
kerry
|
21976a39fc
|
国家化前缀修改
|
7 years ago |
superman
|
4d9e93dcaa
|
Merge pull request #75 in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'c6f0bd7dc1cef40a52dc8fc0f4df51b7e26d8856':
REPORT-8349 返回数据字段名兼容
|
7 years ago |
kerry
|
c6f0bd7dc1
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into feature/10.0
|
7 years ago |
kerry
|
3c902805c1
|
REPORT-8349 返回数据字段名兼容
|
7 years ago |
superman
|
a1fa220847
|
Merge pull request #74 in DESIGN/design from ~NEIL/design-10:feature/10.0 to feature/10.0
* commit '6f98b52383e12824f55628e769d41eba7255d68b':
REPORT-8353 9.0 bug 功能patch到10
|
7 years ago |
plough
|
5898023860
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~plough/10-design into feature/10.0
|
7 years ago |
hzzz
|
8546c4644a
|
rename
|
7 years ago |
hzzz
|
9c81cd7d35
|
merge
|
7 years ago |
neil
|
6f98b52383
|
REPORT-8353 9.0 bug 功能patch到10
|
7 years ago |
plough
|
643a6bb051
|
REPORT-6645 参数面板里的bug2
|
7 years ago |
plough
|
1e05a18b4c
|
REPORT-6558 & REPORT-6443 & REPORT-6645 组件叠加优化交互验收;控件树消失问题=>减少对其他地方的影响;参数面板里的bug2
|
7 years ago |
superman
|
dcdb04cebd
|
Merge pull request #73 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'b56e415f12cbda23e61ccb3dc49302d1707c6ddc':
无JIRA任务 单元测试+env注册优化一次
|
7 years ago |
ju
|
b56e415f12
|
无JIRA任务 单元测试+env注册优化一次
|
7 years ago |
plough
|
24002f13cc
|
REPORT-6626 绝对布局下组件复制粘贴后属性设置有问题
|
7 years ago |
superman
|
cb9bd284aa
|
Merge pull request #72 in DESIGN/design from ~HZZZ/design61:feature/10.0 to feature/10.0
* commit '010699d1cf681e3b738916f66ac187c44dbab7c0':
fix
|
7 years ago |